netlink: make the netlink socket totally non blocking

See #333.

diff --git a/src/daemon/event.c b/src/daemon/event.c
index a82c19e8e6776bf0e19d930b21e87693391bf049..0963c1ef35b3693bbff121830ddb2b0b1c59b527 100644 (file)
--- a/src/daemon/event.c
+++ b/src/daemon/event.c
@@ -756,8 +756,7 @@ levent_iface_subscribe(struct lldpd *cfg, int socket)
 {
        log_debug("event", "subscribe to interface changes from socket %d",
            socket);
-       if (cfg->g_iface_cb == NULL)
-               levent_make_socket_nonblocking(socket);
+       levent_make_socket_nonblocking(socket);
        cfg->g_iface_event = event_new(cfg->g_base, socket,
            EV_READ | EV_PERSIST, levent_iface_recv, cfg);
        if (cfg->g_iface_event == NULL) {

diff --git a/src/daemon/netlink.c b/src/daemon/netlink.c
index d3e26dec67db524f67f37fb8b5853a69d5f7cb22..c89e14902768fd3d7bb8d22811eff4ccfbdd840a 100644 (file)
--- a/src/daemon/netlink.c
+++ b/src/daemon/netlink.c
@@ -472,7 +472,7 @@ netlink_recv(struct lldpd *cfg,
                };
                flags = MSG_PEEK | MSG_TRUNC;
 retry:
-               len = recvmsg(s, &rtnl_reply, flags | MSG_DONTWAIT);
+               len = recvmsg(s, &rtnl_reply, flags);
                if (len == -1) {
                        if (errno == EAGAIN || errno == EWOULDBLOCK) {
                                if (retry++ == 0) {