emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Cleanup error messages

Browse Source
This commit is contained in:
Glenn L McGrath 2002-11-28 12:35:46 +00:00
parent 8b6024449f
commit d4de975cd2
1 changed files with 65 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
networking/libiproute/libnetlink.c
View File

@ -24,6 +24,7 @@
#include <sys/uio.h> #include <sys/uio.h>
#include "libnetlink.h" #include "libnetlink.h"
#include "libbb.h"
void rtnl_close(struct rtnl_handle *rth) void rtnl_close(struct rtnl_handle *rth)
{ {
@ -38,7 +39,7 @@ int rtnl_open(struct rtnl_handle *rth, unsigned subscriptions)
rth->fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE); rth->fd = socket(AF_NETLINK, SOCK_RAW, NETLINK_ROUTE);
if (rth->fd < 0) { if (rth->fd < 0) {
perror("Cannot open netlink socket"); perror_msg("Cannot open netlink socket");
return -1; return -1;
} }
@ -47,20 +48,20 @@ int rtnl_open(struct rtnl_handle *rth, unsigned subscriptions)
rth->local.nl_groups = subscriptions; rth->local.nl_groups = subscriptions;
if (bind(rth->fd, (struct sockaddr*)&rth->local, sizeof(rth->local)) < 0) { if (bind(rth->fd, (struct sockaddr*)&rth->local, sizeof(rth->local)) < 0) {
perror("Cannot bind netlink socket"); perror_msg("Cannot bind netlink socket");
return -1; return -1;
} }
addr_len = sizeof(rth->local); addr_len = sizeof(rth->local);
if (getsockname(rth->fd, (struct sockaddr*)&rth->local, &addr_len) < 0) { if (getsockname(rth->fd, (struct sockaddr*)&rth->local, &addr_len) < 0) {
perror("Cannot getsockname"); perror_msg("Cannot getsockname");
return -1; return -1;
} }
if (addr_len != sizeof(rth->local)) { if (addr_len != sizeof(rth->local)) {
fprintf(stderr, "Wrong address length %d\n", addr_len); error_msg("Wrong address length %d", addr_len);
return -1; return -1;
} }
if (rth->local.nl_family != AF_NETLINK) { if (rth->local.nl_family != AF_NETLINK) {
fprintf(stderr, "Wrong address family %d\n", rth->local.nl_family); error_msg("Wrong address family %d", rth->local.nl_family);
return -1; return -1;
} }
rth->seq = time(NULL); rth->seq = time(NULL);
@ -148,16 +149,15 @@ int rtnl_dump_filter(struct rtnl_handle *rth,
if (status < 0) { if (status < 0) {
if (errno == EINTR) if (errno == EINTR)
continue; continue;
perror("OVERRUN"); perror_msg("OVERRUN");
continue; continue;
} }
if (status == 0) { if (status == 0) {
fprintf(stderr, "EOF on netlink\n"); error_msg("EOF on netlink");
return -1; return -1;
} }
if (msg.msg_namelen != sizeof(nladdr)) { if (msg.msg_namelen != sizeof(nladdr)) {
fprintf(stderr, "sender address length == %d\n", msg.msg_namelen); error_msg_and_die("sender address length == %d", msg.msg_namelen);
exit(1);
} }
h = (struct nlmsghdr*)buf; h = (struct nlmsghdr*)buf;
@ -168,38 +168,40 @@ int rtnl_dump_filter(struct rtnl_handle *rth,
h->nlmsg_seq != rth->dump) { h->nlmsg_seq != rth->dump) {
if (junk) { if (junk) {
err = junk(&nladdr, h, arg2); err = junk(&nladdr, h, arg2);
if (err < 0) if (err < 0) {
return err; return err;
}
} }
goto skip_it; goto skip_it;
} }
if (h->nlmsg_type == NLMSG_DONE) if (h->nlmsg_type == NLMSG_DONE) {
return 0; return 0;
}
if (h->nlmsg_type == NLMSG_ERROR) { if (h->nlmsg_type == NLMSG_ERROR) {
struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h); struct nlmsgerr *l_err = (struct nlmsgerr*)NLMSG_DATA(h);
if (h->nlmsg_len < NLMSG_LENGTH(sizeof(struct nlmsgerr))) { if (h->nlmsg_len < NLMSG_LENGTH(sizeof(struct nlmsgerr))) {
fprintf(stderr, "ERROR truncated\n"); error_msg("ERROR truncated");
} else { } else {
errno = -err->error; errno = -l_err->error;
perror("RTNETLINK answers"); perror_msg("RTNETLINK answers");
} }
return -1; return -1;
} }
err = filter(&nladdr, h, arg1); err = filter(&nladdr, h, arg1);
if (err < 0) if (err < 0) {
return err; return err;
}
skip_it: skip_it:
h = NLMSG_NEXT(h, status); h = NLMSG_NEXT(h, status);
} }
if (msg.msg_flags & MSG_TRUNC) { if (msg.msg_flags & MSG_TRUNC) {
fprintf(stderr, "Message truncated\n"); error_msg("Message truncated");
continue; continue;
} }
if (status) { if (status) {
fprintf(stderr, "!!!Remnant of size %d\n", status); error_msg_and_die("!!!Remnant of size %d", status);
exit(1);
} }
} }
} }
@ -228,13 +230,13 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
nladdr.nl_groups = groups; nladdr.nl_groups = groups;
n->nlmsg_seq = seq = ++rtnl->seq; n->nlmsg_seq = seq = ++rtnl->seq;
if (answer == NULL) if (answer == NULL) {
n->nlmsg_flags |= NLM_F_ACK; n->nlmsg_flags |= NLM_F_ACK;
}
status = sendmsg(rtnl->fd, &msg, 0); status = sendmsg(rtnl->fd, &msg, 0);
if (status < 0) { if (status < 0) {
perror("Cannot talk to rtnetlink"); perror_msg("Cannot talk to rtnetlink");
return -1; return -1;
} }
@ -245,39 +247,39 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
status = recvmsg(rtnl->fd, &msg, 0); status = recvmsg(rtnl->fd, &msg, 0);
if (status < 0) { if (status < 0) {
if (errno == EINTR) if (errno == EINTR) {
continue; continue;
perror("OVERRUN"); }
perror_msg("OVERRUN");
continue; continue;
} }
if (status == 0) { if (status == 0) {
fprintf(stderr, "EOF on netlink\n"); error_msg("EOF on netlink");
return -1; return -1;
} }
if (msg.msg_namelen != sizeof(nladdr)) { if (msg.msg_namelen != sizeof(nladdr)) {
fprintf(stderr, "sender address length == %d\n", msg.msg_namelen); error_msg_and_die("sender address length == %d", msg.msg_namelen);
exit(1);
} }
for (h = (struct nlmsghdr*)buf; status >= sizeof(*h); ) { for (h = (struct nlmsghdr*)buf; status >= sizeof(*h); ) {
int err; int l_err;
int len = h->nlmsg_len; int len = h->nlmsg_len;
int l = len - sizeof(*h); int l = len - sizeof(*h);
if (l<0 || len>status) { if (l<0 || len>status) {
if (msg.msg_flags & MSG_TRUNC) { if (msg.msg_flags & MSG_TRUNC) {
fprintf(stderr, "Truncated message\n"); error_msg("Truncated message");
return -1; return -1;
} }
fprintf(stderr, "!!!malformed message: len=%d\n", len); error_msg_and_die("!!!malformed message: len=%d", len);
exit(1);
} }
if (h->nlmsg_pid != rtnl->local.nl_pid || if (h->nlmsg_pid != rtnl->local.nl_pid ||
h->nlmsg_seq != seq) { h->nlmsg_seq != seq) {
if (junk) { if (junk) {
err = junk(&nladdr, h, jarg); l_err = junk(&nladdr, h, jarg);
if (err < 0) if (l_err < 0) {
return err; return l_err;
}
} }
continue; continue;
} }
@ -285,15 +287,16 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
if (h->nlmsg_type == NLMSG_ERROR) { if (h->nlmsg_type == NLMSG_ERROR) {
struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h); struct nlmsgerr *err = (struct nlmsgerr*)NLMSG_DATA(h);
if (l < sizeof(struct nlmsgerr)) { if (l < sizeof(struct nlmsgerr)) {
fprintf(stderr, "ERROR truncated\n"); error_msg("ERROR truncated");
} else { } else {
errno = -err->error; errno = -err->error;
if (errno == 0) { if (errno == 0) {
if (answer) if (answer) {
memcpy(answer, h, h->nlmsg_len); memcpy(answer, h, h->nlmsg_len);
}
return 0; return 0;
} }
perror("RTNETLINK answers"); perror_msg("RTNETLINK answers");
} }
return -1; return -1;
} }
@ -302,18 +305,17 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer,
return 0; return 0;
} }
fprintf(stderr, "Unexpected reply!!!\n"); error_msg("Unexpected reply!!!");
status -= NLMSG_ALIGN(len); status -= NLMSG_ALIGN(len);
h = (struct nlmsghdr*)((char*)h + NLMSG_ALIGN(len)); h = (struct nlmsghdr*)((char*)h + NLMSG_ALIGN(len));
} }
if (msg.msg_flags & MSG_TRUNC) { if (msg.msg_flags & MSG_TRUNC) {
fprintf(stderr, "Message truncated\n"); error_msg("Message truncated");
continue; continue;
} }
if (status) { if (status) {
fprintf(stderr, "!!!Remnant of size %d\n", status); error_msg_and_die("!!!Remnant of size %d", status);
exit(1);
} }
} }
} }
@ -349,16 +351,15 @@ int rtnl_listen(struct rtnl_handle *rtnl,
if (status < 0) { if (status < 0) {
if (errno == EINTR) if (errno == EINTR)
continue; continue;
perror("OVERRUN"); perror_msg("OVERRUN");
continue; continue;
} }
if (status == 0) { if (status == 0) {
fprintf(stderr, "EOF on netlink\n"); error_msg("EOF on netlink");
return -1; return -1;
} }
if (msg.msg_namelen != sizeof(nladdr)) { if (msg.msg_namelen != sizeof(nladdr)) {
fprintf(stderr, "Sender address length == %d\n", msg.msg_namelen); error_msg_and_die("Sender address length == %d", msg.msg_namelen);
exit(1);
} }
for (h = (struct nlmsghdr*)buf; status >= sizeof(*h); ) { for (h = (struct nlmsghdr*)buf; status >= sizeof(*h); ) {
int err; int err;
@ -367,27 +368,26 @@ int rtnl_listen(struct rtnl_handle *rtnl,
if (l<0 || len>status) { if (l<0 || len>status) {
if (msg.msg_flags & MSG_TRUNC) { if (msg.msg_flags & MSG_TRUNC) {
fprintf(stderr, "Truncated message\n"); error_msg("Truncated message");
return -1; return -1;
} }
fprintf(stderr, "!!!malformed message: len=%d\n", len); error_msg_and_die("!!!malformed message: len=%d", len);
exit(1);
} }
err = handler(&nladdr, h, jarg); err = handler(&nladdr, h, jarg);
if (err < 0) if (err < 0) {
return err; return err;
}
status -= NLMSG_ALIGN(len); status -= NLMSG_ALIGN(len);
h = (struct nlmsghdr*)((char*)h + NLMSG_ALIGN(len)); h = (struct nlmsghdr*)((char*)h + NLMSG_ALIGN(len));
} }
if (msg.msg_flags & MSG_TRUNC) { if (msg.msg_flags & MSG_TRUNC) {
fprintf(stderr, "Message truncated\n"); error_msg("Message truncated");
continue; continue;
} }
if (status) { if (status) {
fprintf(stderr, "!!!Remnant of size %d\n", status); error_msg_and_die("!!!Remnant of size %d", status);
exit(1);
} }
} }
} }
@ -415,7 +415,7 @@ int rtnl_from_file(FILE *rtnl,
if (status < 0) { if (status < 0) {
if (errno == EINTR) if (errno == EINTR)
continue; continue;
perror("rtnl_from_file: fread"); perror_msg("rtnl_from_file: fread");
return -1; return -1;
} }
if (status == 0) if (status == 0)
@ -426,7 +426,7 @@ int rtnl_from_file(FILE *rtnl,
l = len - sizeof(*h); l = len - sizeof(*h);
if (l<0 || len>sizeof(buf)) { if (l<0 || len>sizeof(buf)) {
fprintf(stderr, "!!!malformed message: len=%d @%lu\n", error_msg("!!!malformed message: len=%d @%lu",
len, ftell(rtnl)); len, ftell(rtnl));
return -1; return -1;
} }
@ -434,11 +434,11 @@ int rtnl_from_file(FILE *rtnl,
status = fread(NLMSG_DATA(h), 1, NLMSG_ALIGN(l), rtnl); status = fread(NLMSG_DATA(h), 1, NLMSG_ALIGN(l), rtnl);
if (status < 0) { if (status < 0) {
perror("rtnl_from_file: fread"); perror_msg("rtnl_from_file: fread");
return -1; return -1;
} }
if (status < l) { if (status < l) {
fprintf(stderr, "rtnl-from_file: truncated message\n"); error_msg("rtnl-from_file: truncated message");
return -1; return -1;
} }
@ -482,8 +482,9 @@ int rta_addattr32(struct rtattr *rta, int maxlen, int type, __u32 data)
int len = RTA_LENGTH(4); int len = RTA_LENGTH(4);
struct rtattr *subrta; struct rtattr *subrta;
if (RTA_ALIGN(rta->rta_len) + len > maxlen) if (RTA_ALIGN(rta->rta_len) + len > maxlen) {
return -1; return -1;
}
subrta = (struct rtattr*)(((char*)rta) + RTA_ALIGN(rta->rta_len)); subrta = (struct rtattr*)(((char*)rta) + RTA_ALIGN(rta->rta_len));
subrta->rta_type = type; subrta->rta_type = type;
subrta->rta_len = len; subrta->rta_len = len;
@ -497,8 +498,9 @@ int rta_addattr_l(struct rtattr *rta, int maxlen, int type, void *data, int alen
struct rtattr *subrta; struct rtattr *subrta;
int len = RTA_LENGTH(alen); int len = RTA_LENGTH(alen);
if (RTA_ALIGN(rta->rta_len) + len > maxlen) if (RTA_ALIGN(rta->rta_len) + len > maxlen) {
return -1; return -1;
}
subrta = (struct rtattr*)(((char*)rta) + RTA_ALIGN(rta->rta_len)); subrta = (struct rtattr*)(((char*)rta) + RTA_ALIGN(rta->rta_len));
subrta->rta_type = type; subrta->rta_type = type;
subrta->rta_len = len; subrta->rta_len = len;
@ -511,11 +513,13 @@ int rta_addattr_l(struct rtattr *rta, int maxlen, int type, void *data, int alen
int parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len) int parse_rtattr(struct rtattr *tb[], int max, struct rtattr *rta, int len)
{ {
while (RTA_OK(rta, len)) { while (RTA_OK(rta, len)) {
if (rta->rta_type <= max) if (rta->rta_type <= max) {
tb[rta->rta_type] = rta; tb[rta->rta_type] = rta;
}
rta = RTA_NEXT(rta,len); rta = RTA_NEXT(rta,len);
} }
if (len) if (len) {
fprintf(stderr, "!!!Deficit %d, rta_len=%d\n", len, rta->rta_len); error_msg("!!!Deficit %d, rta_len=%d", len, rta->rta_len);
}
return 0; return 0;
} }