diff options
Diffstat (limited to 'networking')
| -rw-r--r-- | networking/libiproute/libnetlink.c | 28 | ||||
| -rw-r--r-- | networking/libiproute/ll_addr.c | 6 |
2 files changed, 17 insertions, 17 deletions
diff --git a/networking/libiproute/libnetlink.c b/networking/libiproute/libnetlink.c index a595e967f..ec52cff73 100644 --- a/networking/libiproute/libnetlink.c +++ b/networking/libiproute/libnetlink.c @@ -36,7 +36,7 @@ int rtnl_open(struct rtnl_handle *rth, unsigned subscriptions) rth->fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE); if (rth->fd < 0) { - bb_perror_msg("Cannot open netlink socket"); + bb_perror_msg("cannot open netlink socket"); return -1; } @@ -45,20 +45,20 @@ int rtnl_open(struct rtnl_handle *rth, unsigned subscriptions) rth->local.nl_groups = subscriptions; if (bind(rth->fd, (struct sockaddr*)&rth->local, sizeof(rth->local)) < 0) { - bb_perror_msg("Cannot bind netlink socket"); + bb_perror_msg("cannot bind netlink socket"); return -1; } addr_len = sizeof(rth->local); if (getsockname(rth->fd, (struct sockaddr*)&rth->local, &addr_len) < 0) { - bb_perror_msg("Cannot getsockname"); + bb_perror_msg("cannot getsockname"); return -1; } if (addr_len != sizeof(rth->local)) { - bb_error_msg("Wrong address length %d", addr_len); + bb_error_msg("wrong address length %d", addr_len); return -1; } if (rth->local.nl_family != AF_NETLINK) { - bb_error_msg("Wrong address family %d", rth->local.nl_family); + bb_error_msg("wrong address family %d", rth->local.nl_family); return -1; } rth->seq = time(NULL); @@ -195,11 +195,11 @@ skip_it: h = NLMSG_NEXT(h, status); } if (msg.msg_flags & MSG_TRUNC) { - bb_error_msg("Message truncated"); + bb_error_msg("message truncated"); continue; } if (status) { - bb_error_msg_and_die("!!!Remnant of size %d", status); + bb_error_msg_and_die("remnant of size %d!", status); } } } @@ -234,7 +234,7 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer, status = sendmsg(rtnl->fd, &msg, 0); if (status < 0) { - bb_perror_msg("Cannot talk to rtnetlink"); + bb_perror_msg("cannot talk to rtnetlink"); return -1; } @@ -265,10 +265,10 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer, if (l<0 || len>status) { if (msg.msg_flags & MSG_TRUNC) { - bb_error_msg("Truncated message"); + bb_error_msg("truncated message"); return -1; } - bb_error_msg_and_die("!!!malformed message: len=%d", len); + bb_error_msg_and_die("malformed message: len=%d!", len); } if (nladdr.nl_pid != peer || @@ -304,17 +304,17 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer, return 0; } - bb_error_msg("Unexpected reply!!!"); + bb_error_msg("unexpected reply!"); status -= NLMSG_ALIGN(len); h = (struct nlmsghdr*)((char*)h + NLMSG_ALIGN(len)); } if (msg.msg_flags & MSG_TRUNC) { - bb_error_msg("Message truncated"); + bb_error_msg("message truncated"); continue; } if (status) { - bb_error_msg_and_die("!!!Remnant of size %d", status); + bb_error_msg_and_die("remnant of size %d!", status); } } } @@ -390,7 +390,7 @@ int parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len) rta = RTA_NEXT(rta,len); } if (len) { - bb_error_msg("!!!Deficit %d, rta_len=%d", len, rta->rta_len); + bb_error_msg("deficit %d, rta_len=%d!", len, rta->rta_len); } return 0; } diff --git a/networking/libiproute/ll_addr.c b/networking/libiproute/ll_addr.c index 6c147deca..ba0a65a18 100644 --- a/networking/libiproute/ll_addr.c +++ b/networking/libiproute/ll_addr.c @@ -48,7 +48,7 @@ int ll_addr_a2n(unsigned char *lladdr, int len, char *arg) if (strchr(arg, '.')) { inet_prefix pfx; if (get_addr_1(&pfx, arg, AF_INET)) { - bb_error_msg("\"%s\" is invalid lladdr.", arg); + bb_error_msg("\"%s\" is invalid lladdr", arg); return -1; } if (len < 4) { @@ -67,11 +67,11 @@ int ll_addr_a2n(unsigned char *lladdr, int len, char *arg) cp++; } if (sscanf(arg, "%x", &temp) != 1) { - bb_error_msg("\"%s\" is invalid lladdr.", arg); + bb_error_msg("\"%s\" is invalid lladdr", arg); return -1; } if (temp < 0 || temp > 255) { - bb_error_msg("\"%s\" is invalid lladdr.", arg); + bb_error_msg("\"%s\" is invalid lladdr", arg); return -1; } lladdr[i] = temp; |