| Message ID | 5031F088.1030404@parallels.com |
|---|---|
| State | Accepted, archived |
| Delegated to: | stephen hemminger |
| Headers | show |
On Mon, 20 Aug 2012 12:08:40 +0400 Pavel Emelyanov <xemul@parallels.com> wrote: > Callers of rtnl_talk check errno value for their needs. In particular, the addrs > and routes restoring code validly reports success if the EEXISTS is in there. > > However, the errno value can be sometimes screwed up by the perror call. Thus > we should only set it _after_ the message was emitted. > > Signed-off-by: Pavel Emelyanov <xemul@parallels.com> > > --- > > diff --git a/lib/libnetlink.c b/lib/libnetlink.c > index 878911e..8e8c8b9 100644 > --- a/lib/libnetlink.c > +++ b/lib/libnetlink.c > @@ -360,13 +360,14 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer, > if (l < sizeof(struct nlmsgerr)) { > fprintf(stderr, "ERROR truncated\n"); > } else { > - errno = -err->error; > - if (errno == 0) { > + if (!err->error) { > if (answer) > memcpy(answer, h, h->nlmsg_len); > return 0; > } > - perror("RTNETLINK answers"); > + > + fprintf(stderr, "RTNETLINK answers: %s\n", strerror(-err->error)); > + errno = -err->error; > } > return -1; > } Applied -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/lib/libnetlink.c b/lib/libnetlink.c index 878911e..8e8c8b9 100644 --- a/lib/libnetlink.c +++ b/lib/libnetlink.c @@ -360,13 +360,14 @@ int rtnl_talk(struct rtnl_handle *rtnl, struct nlmsghdr *n, pid_t peer, if (l < sizeof(struct nlmsgerr)) { fprintf(stderr, "ERROR truncated\n"); } else { - errno = -err->error; - if (errno == 0) { + if (!err->error) { if (answer) memcpy(answer, h, h->nlmsg_len); return 0; } - perror("RTNETLINK answers"); + + fprintf(stderr, "RTNETLINK answers: %s\n", strerror(-err->error)); + errno = -err->error; } return -1; }
Callers of rtnl_talk check errno value for their needs. In particular, the addrs and routes restoring code validly reports success if the EEXISTS is in there. However, the errno value can be sometimes screwed up by the perror call. Thus we should only set it _after_ the message was emitted. Signed-off-by: Pavel Emelyanov <xemul@parallels.com> --- -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html