zebra: consolidate connected_implicit_withdraw

connected_implicit_withdraw is used at two places and followed by exactly
the same code. Move that code into connected_implicit_withdraw and give
that function a more descriptive name.

Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>

diff --git a/zebra/connected.c b/zebra/connected.c
index 3db1271d01cfd71518d72bdc4d2ce3af84e3bdc7..38ab37d59e0c88724095212edad9af8d5a59ad04 100644 (file)
--- a/zebra/connected.c
+++ b/zebra/connected.c
@@ -137,14 +137,10 @@ connected_same (struct connected *ifc1, struct connected *ifc2)
   return 1;
 }
 
-/* Handle implicit withdrawals of addresses, where a system ADDs an address
- * to an interface which already has the same address configured.
- *
- * Returns the struct connected which must be announced to clients,
- * or NULL if nothing to do.
- */
-static struct connected *
-connected_implicit_withdraw (struct interface *ifp, struct connected *ifc)
+/* Handle changes to addresses and send the neccesary announcements
+ * to clients. */
+static void
+connected_update(struct interface *ifp, struct connected *ifc)
 {
   struct connected *current;
   
@@ -161,13 +157,17 @@ connected_implicit_withdraw (struct interface *ifp, struct connected *ifc)
         {
           /* nothing to do */
           connected_free (ifc);
-          return NULL;
+          return;
         }
-      
+
+      /* Clear the configured flag on the old ifc, so it will be freed by
+       * connected withdraw. */
       UNSET_FLAG(current->conf, ZEBRA_IFC_CONFIGURED);
       connected_withdraw (current); /* implicit withdraw - freebsd does this */
     }
-  return ifc;
+
+  /* If the connected is new or has changed, announce it */
+  connected_announce(ifp, ifc);
 }
 
 /* Called from if_up(). */
@@ -273,11 +273,7 @@ connected_add_ipv4 (struct interface *ifp, int flags, struct in_addr *addr,
   if (label)
     ifc->label = XSTRDUP (MTYPE_CONNECTED_LABEL, label);
 
-  /* nothing to do? */
-  if ((ifc = connected_implicit_withdraw (ifp, ifc)) == NULL)
-    return;
-  
-  connected_announce (ifp, ifc);
+  connected_update(ifp, ifc);
 }
 
 void
@@ -401,11 +397,8 @@ connected_add_ipv6 (struct interface *ifp, int flags, struct in6_addr *addr,
   /* Label of this address. */
   if (label)
     ifc->label = XSTRDUP (MTYPE_CONNECTED_LABEL, label);
-  
-  if ((ifc = connected_implicit_withdraw (ifp, ifc)) == NULL)
-    return;
-  
-  connected_announce (ifp, ifc);
+
+  connected_update(ifp, ifc);
 }
 
 void