commit 5d162f20a95fc4216cb07906ed2f73fc7829ede0
author Simon Kelley <simon@thekelleys.org.uk> Thu Dec 20 14:55:46 2012 +0000
committer Simon Kelley <simon@thekelleys.org.uk> Thu Dec 20 14:55:46 2012 +0000
tree 33ea44c3b510b2f5e84481774ee8e2d78546792d
parent 9d2994944018d428a9881dd2da8f46bc94842bae

Rationalise join_multicast()

src/dnsmasq.c

diff --git a/src/dnsmasq.c b/src/dnsmasq.c
index 4c7cd39..17dffa4 100644
--- a/src/dnsmasq.c
+++ b/src/dnsmasq.c
@@ -220,12 +220,6 @@
     die(_("cannot set --bind-interfaces and --bind-dynamic"), NULL, EC_BADCONF);
 #endif
 
-#ifdef HAVE_DHCP6
-  /* after netlink_init */
-  if (daemon->doing_dhcp6 || daemon->doing_ra)
-    join_multicast();
-#endif
-  
   if (!enumerate_interfaces())
     die(_("failed to find list of interfaces: %s"), NULL, EC_MISC);
   
@@ -255,6 +249,12 @@
     }
   else 
     create_wildcard_listeners();
+ 
+#ifdef HAVE_DHCP6
+  /* after enumerate_interfaces() */
+  if (daemon->doing_dhcp6 || daemon->doing_ra)
+    join_multicast(1);
+#endif
   
   if (daemon->port != 0)
     cache_init();