commit bad7b875eb4e3a8f69b08eab84602257eb51455c
author Simon Kelley <simon@thekelleys.org.uk> Thu Dec 20 22:00:39 2012 +0000
committer Simon Kelley <simon@thekelleys.org.uk> Thu Dec 20 22:00:39 2012 +0000
tree 5430af23383aed493be5272c0605f38ca318a3d2
parent 5d162f20a95fc4216cb07906ed2f73fc7829ede0

add general flag param to iface_enumerate IPv6 callback

src/radv.c

diff --git a/src/radv.c b/src/radv.c
index 2cce57e..debccb2 100644
--- a/src/radv.c
+++ b/src/radv.c
@@ -40,10 +40,10 @@
 
 static void send_ra(time_t now, int iface, char *iface_name, struct in6_addr *dest);
 static int add_prefixes(struct in6_addr *local,  int prefix,
-			int scope, int if_index, int dad, 
+			int scope, int if_index, int flags, 
 			int preferred, int valid, void *vparam);
 static int iface_search(struct in6_addr *local,  int prefix,
-			int scope, int if_index, int dad, 
+			int scope, int if_index, int flags, 
 			int prefered, int valid, void *vparam);
 static int add_lla(int index, unsigned int type, char *mac, size_t maclen, void *parm);
 
@@ -325,13 +325,13 @@
 }
 
 static int add_prefixes(struct in6_addr *local,  int prefix,
-			int scope, int if_index, int dad, 
+			int scope, int if_index, int flags, 
 			int preferred, int valid, void *vparam)
 {
   struct ra_param *param = vparam;
 
   (void)scope; /* warning */
-  (void)dad;
+  (void)flags;
   (void)preferred;
   (void)valid;
 
@@ -526,14 +526,13 @@
 }
   
 static int iface_search(struct in6_addr *local,  int prefix,
-			int scope, int if_index, int dad, 
+			int scope, int if_index, int flags, 
 			int preferred, int valid, void *vparam)
 {
   struct search_param *param = vparam;
   struct dhcp_context *context;
 
   (void)scope;
-  (void)dad;
   (void)preferred;
   (void)valid;
  
@@ -549,7 +548,7 @@
 	   timeout value and arrange for RA to be sent unless interface is
 	   still doing DAD.*/
 	
-	if (!dad)
+	if (!(flags & IFACE_TENTATIVE))
 	  param->iface = if_index;
 	
 	if (difftime(param->now, context->ra_short_period_start) < 60.0)