diff options
| author | Simon Kelley <simon@thekelleys.org.uk> | 2013-12-09 16:50:19 +0000 |
|---|---|---|
| committer | Simon Kelley <simon@thekelleys.org.uk> | 2013-12-09 16:50:19 +0000 |
| commit | 1ee9be4c3f60e16b6815699ba95d67d29beaf015 (patch) | |
| tree | 7fb4d0b9d0ea99735122465c09f0cb684bd165f6 /src/netlink.c | |
| parent | 56ad6c9be1b48791edfb140f87c3738dd723d116 (diff) | |
| download | dnsmasq-1ee9be4c3f60e16b6815699ba95d67d29beaf015.tar.gz | |
Implement dynamic interface discovery on *BSDv2.69test1
Diffstat (limited to 'src/netlink.c')
| -rw-r--r-- | src/netlink.c | 29 |
1 files changed, 2 insertions, 27 deletions
diff --git a/src/netlink.c b/src/netlink.c index d093988..3be94ee 100644 --- a/src/netlink.c +++ b/src/netlink.c @@ -39,7 +39,6 @@ static struct iovec iov; static u32 netlink_pid; static int nl_async(struct nlmsghdr *h); -static void nl_newaddress(time_t now); void netlink_init(void) { @@ -203,7 +202,7 @@ int iface_enumerate(int family, void *parm, int (*callback)()) /* handle async new interface address arrivals, these have to be done after we complete as we're not re-entrant */ if (newaddr) - nl_newaddress(dnsmasq_time()); + newaddress(dnsmasq_time()); return callback_ok; } @@ -351,7 +350,7 @@ void netlink_multicast(time_t now) fcntl(daemon->netlinkfd, F_SETFL, flags); if (newaddr) - nl_newaddress(now); + newaddress(now); } static int nl_async(struct nlmsghdr *h) @@ -399,30 +398,6 @@ static int nl_async(struct nlmsghdr *h) return 0; } - -static void nl_newaddress(time_t now) -{ - (void)now; - - if (option_bool(OPT_CLEVERBIND) || daemon->doing_dhcp6 || daemon->relay6 || daemon->doing_ra) - enumerate_interfaces(0); - - if (option_bool(OPT_CLEVERBIND)) - create_bound_listeners(0); - -#ifdef HAVE_DHCP6 - if (daemon->doing_dhcp6 || daemon->relay6 || daemon->doing_ra) - join_multicast(0); - - if (daemon->doing_dhcp6 || daemon->doing_ra) - dhcp_construct_contexts(now); - - if (daemon->doing_dhcp6) - lease_find_interfaces(now); -#endif -} - - #endif |