summaryrefslogtreecommitdiff
path: root/src/netlink.c
diff options
context:
space:
mode:
authorSimon Kelley <simon@thekelleys.org.uk>2012-06-20 14:17:04 +0100
committerSimon Kelley <simon@thekelleys.org.uk>2012-06-20 14:17:04 +0100
commitaf576b56c29d2550ec4ea4467685407626edaa65 (patch)
treec5f1a100b293ce14584c87d496f902f6825cddb5 /src/netlink.c
parent54dd393f3938fc0c19088fbd319b95e37d81a2b0 (diff)
downloaddnsmasq-af576b56c29d2550ec4ea4467685407626edaa65.tar.gz
Tidy up - no functional change.
Diffstat (limited to 'src/netlink.c')
-rw-r--r--src/netlink.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/netlink.c b/src/netlink.c
index 3659222..c047d9b 100644
--- a/src/netlink.c
+++ b/src/netlink.c
@@ -188,7 +188,7 @@ int iface_enumerate(int family, void *parm, int (*callback)())
if (h->nlmsg_seq != seq || h->nlmsg_pid != netlink_pid || h->nlmsg_type == NLMSG_ERROR)
{
/* May be multicast arriving async */
- if (nl_async(h))
+ if (nl_async(h) && option_bool(OPT_CLEVERBIND))
newaddr = 1;
}
else if (h->nlmsg_type == NLMSG_DONE)
@@ -319,7 +319,7 @@ void netlink_multicast(void)
if ((len = netlink_recv()) != -1)
for (h = (struct nlmsghdr *)iov.iov_base; NLMSG_OK(h, (size_t)len); h = NLMSG_NEXT(h, len))
- if (nl_async(h))
+ if (nl_async(h) && option_bool(OPT_CLEVERBIND))
newaddr = 1;
/* restore non-blocking status */
@@ -357,7 +357,7 @@ static int nl_async(struct nlmsghdr *h)
iface_enumerate and can't re-enter it now */
send_alarm(0, 0);
}
- return !!option_bool(OPT_CLEVERBIND); /* clever bind mode - rescan */
+ return 1; /* clever bind mode - rescan */
}
#endif