flushing neighbours associated with flushed interface.

Author: tinselcity

interface.c

@@ -101,6 +101,7 @@ int
 flush_interface(char *ifname)
 {
     struct interface *ifp, *prev;
+    struct neighbour *neigh;
 
     prev = NULL;
     ifp = interfaces;
@@ -114,6 +115,18 @@ flush_interface(char *ifname)
     if(ifp == NULL)
         return 0;
 
+    /* flush any neighbours associated with interface */
+    neigh = neighs;
+    while(neigh) {
+        if(neigh->ifp == ifp) {
+            struct neighbour *old = neigh;
+            neigh = neigh->next;
+            flush_neighbour(old);
+            continue;
+        }
+        neigh = neigh->next;
+    }
+
     interface_updown(ifp, 0);
     if(prev)
         prev->next = ifp->next;
@@ -512,14 +525,6 @@ interface_updown(struct interface *ifp, int up)
             free(ifp->ll);
         ifp->ll = NULL;
         ifp->numll = 0;
-
-        /* unset ifp for any neighbors -prevents neighbor from referencing free'd ifp */
-        struct neighbour *neigh;
-        FOR_ALL_NEIGHBOURS(neigh) {
-            if (ifp && neigh && neigh->ifp && (neigh->ifp == ifp)) {
-                neigh->ifp = NULL;
-            }
-        }
     }
 
     local_notify_interface(ifp, LOCAL_CHANGE);

local.c

@@ -145,10 +145,6 @@ local_notify_neighbour_1(struct local_socket *s,
     char buf[512], rttbuf[64];
     int rc;
 
-    if (neigh->ifp == NULL) {
-        return;
-    }
-
     rttbuf[0] = '\0';
     if(valid_rtt(neigh)) {
         rc = snprintf(rttbuf, 64, " rtt %s rttcost %u",
@@ -240,10 +236,6 @@ local_notify_route_1(struct local_socket *s, struct babel_route *route, int kind
     char buf[512];
     int rc;
 
-    if (route->neigh->ifp == NULL) {
-        return;
-    }
-
     const char *dst_prefix = format_prefix(route->src->prefix,
                                            route->src->plen);
     const char *src_prefix = format_prefix(route->src->src_prefix,

neighbour.c

@@ -54,7 +54,7 @@ find_neighbour_nocreate(const unsigned char *address, struct interface *ifp)
     return NULL;
 }
 
-static void
+void
 flush_neighbour(struct neighbour *neigh)
 {
     flush_neighbour_routes(neigh);

neighbour.h

@@ -68,6 +68,7 @@ struct neighbour *find_neighbour(const unsigned char *address,
 int update_neighbour(struct neighbour *neigh, struct hello_history *hist,
                      int unicast, int hello, int hello_interval);
 unsigned check_neighbours(void);
+void flush_neighbour(struct neighbour *neigh);
 unsigned neighbour_txcost(struct neighbour *neigh);
 unsigned neighbour_rxcost(struct neighbour *neigh);
 unsigned neighbour_rttcost(struct neighbour *neigh);