matthias
/
iproute2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

libnetlink: don't spin forever on receive error 

If there is a problem talking to kernel, don't retry except in the
special case of signal or -EAGAIN

Signed-off-by: Stephen Hemminger <stephen.hemminger@vyatta.com>
This commit is contained in:
Stephen Hemminger 2008-01-25 15:39:09 -08:00
parent 8055063afe
commit aa8032e628
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
lib/libnetlink.c
View File

@ -173,10 +173,11 @@ int rtnl_dump_filter(struct rtnl_handle *rth,
status = recvmsg(rth->fd, &msg, 0); status = recvmsg(rth->fd, &msg, 0);
if (status < 0) { if (status < 0) {
if (errno == EINTR) if (errno == EINTR || errno == EAGAIN)
continue; continue;
perror("OVERRUN"); fprintf(stderr, "netlink receive error %s (%d)\n",
continue; strerror(errno), errno);
return -1;
} }
if (status == 0) { if (status == 0) {
@ -276,10 +277,11 @@ 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 || errno == EAGAIN)
continue; continue;
perror("OVERRUN"); fprintf(stderr, "netlink receive error %s (%d)\n",
continue; strerror(errno), errno);
return -1;
} }
if (status == 0) { if (status == 0) {
fprintf(stderr, "EOF on netlink\n"); fprintf(stderr, "EOF on netlink\n");
@ -380,10 +382,11 @@ int rtnl_listen(struct rtnl_handle *rtnl,
status = recvmsg(rtnl->fd, &msg, 0); status = recvmsg(rtnl->fd, &msg, 0);
if (status < 0) { if (status < 0) {
if (errno == EINTR) if (errno == EINTR || errno == EAGAIN)
continue; continue;
perror("OVERRUN"); fprintf(stderr, "netlink receive error %s (%d)\n",
continue; strerror(errno), errno);
return -1;
} }
if (status == 0) { if (status == 0) {
fprintf(stderr, "EOF on netlink\n"); fprintf(stderr, "EOF on netlink\n");