zebra: check other SAFIs when removing gone client

When a client disconnects, we need to check & remove NHT entries for
other SAFIs too.  Otherwise we crash later trying to access stale data.

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

diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c
index 4d5336120d6273d6a32c28be3426f65dc05f6984..f3f48b52ae21b9e4092003e83eb0d520e4a6f6b1 100644 (file)
--- a/zebra/zebra_rnh.c
+++ b/zebra/zebra_rnh.c
@@ -1337,7 +1337,7 @@ static void print_rnh(struct route_node *rn, struct vty *vty)
        vty_out(vty, "\n");
 }
 
-static int zebra_cleanup_rnh_client(vrf_id_t vrf_id, afi_t afi,
+static int zebra_cleanup_rnh_client(vrf_id_t vrf_id, afi_t afi, safi_t safi,
                                    struct zserv *client)
 {
        struct route_table *ntable;
@@ -1352,7 +1352,7 @@ static int zebra_cleanup_rnh_client(vrf_id_t vrf_id, afi_t afi,
                           zebra_route_string(client->proto), afi2str(afi));
        }
 
-       ntable = get_rnh_table(vrf_id, afi, SAFI_UNICAST);
+       ntable = get_rnh_table(vrf_id, afi, safi);
        if (!ntable) {
                zlog_debug("cleanup_rnh_client: rnh table not found");
                return -1;
@@ -1377,9 +1377,14 @@ static int zebra_client_cleanup_rnh(struct zserv *client)
        RB_FOREACH (vrf, vrf_id_head, &vrfs_by_id) {
                zvrf = vrf->info;
                if (zvrf) {
-                       zebra_cleanup_rnh_client(zvrf_id(zvrf), AFI_IP, client);
+                       zebra_cleanup_rnh_client(zvrf_id(zvrf), AFI_IP,
+                                                SAFI_UNICAST, client);
+                       zebra_cleanup_rnh_client(zvrf_id(zvrf), AFI_IP,
+                                                SAFI_MULTICAST, client);
                        zebra_cleanup_rnh_client(zvrf_id(zvrf), AFI_IP6,
-                                                client);
+                                                SAFI_UNICAST, client);
+                       zebra_cleanup_rnh_client(zvrf_id(zvrf), AFI_IP6,
+                                                SAFI_MULTICAST, client);
                }
        }