zebra: Allow ns delete to happen after under/over flow checks

[mirror_frr.git] / eigrpd / eigrp_zebra.c

diff --git a/eigrpd/eigrp_zebra.c b/eigrpd/eigrp_zebra.c
index 00438f2f47c0c2f7d69e19b4ac84a2b9ce75d853..29bd23b5141dc4212e7587fe63c3f793e814ea57 100644 (file)
--- a/eigrpd/eigrp_zebra.c
+++ b/eigrpd/eigrp_zebra.c
@@ -94,13 +94,14 @@ static int eigrp_router_id_update_zebra(int command, struct zclient *zclient,
        return 0;
 }
 
-static int eigrp_zebra_notify_owner(int command, struct zclient *zclient,
-                                   zebra_size_t length, vrf_id_t vrf_id)
+static int eigrp_zebra_route_notify_owner(int command, struct zclient *zclient,
+                                         zebra_size_t length, vrf_id_t vrf_id)
 {
        struct prefix p;
        enum zapi_route_notify_owner note;
+       uint32_t table;
 
-       if (!zapi_route_notify_decode(zclient->ibuf, &p, &note))
+       if (!zapi_route_notify_decode(zclient->ibuf, &p, &table, &note))
                return -1;
 
        return 0;
@@ -113,9 +114,9 @@ static void eigrp_zebra_connected(struct zclient *zclient)
 
 void eigrp_zebra_init(void)
 {
-       struct zclient_options opt = { .receive_notify = false };
+       struct zclient_options opt = {.receive_notify = false};
 
-       zclient = zclient_new_notify(master, &opt);
+       zclient = zclient_new(master, &opt);
 
        zclient_init(zclient, ZEBRA_ROUTE_EIGRP, 0, &eigrpd_privs);
        zclient->zebra_connected = eigrp_zebra_connected;
@@ -128,7 +129,7 @@ void eigrp_zebra_init(void)
        zclient->interface_address_delete = eigrp_interface_address_delete;
        zclient->redistribute_route_add = eigrp_zebra_read_route;
        zclient->redistribute_route_del = eigrp_zebra_read_route;
-       zclient->notify_owner = eigrp_zebra_notify_owner;
+       zclient->route_notify_owner = eigrp_zebra_route_notify_owner;
 }
 
 
@@ -204,8 +205,7 @@ static int eigrp_interface_delete(int command, struct zclient *zclient,
                        ifp->metric, ifp->mtu);
 
        if (ifp->info)
-               eigrp_if_free(ifp->info,
-                             INTERFACE_DOWN_BY_ZEBRA);
+               eigrp_if_free(ifp->info, INTERFACE_DOWN_BY_ZEBRA);
 
        if_set_index(ifp, IFINDEX_INTERNAL);
        return 0;
@@ -377,6 +377,7 @@ void eigrp_zebra_route_add(struct prefix *p, struct list *successors)
                if (count >= MULTIPATH_NUM)
                        break;
                api_nh = &api.nexthops[count];
+               api_nh->vrf_id = VRF_DEFAULT;
                if (te->adv_router->src.s_addr) {
                        api_nh->gate.ipv4 = te->adv_router->src;
                        api_nh->type = NEXTHOP_TYPE_IPV4_IFINDEX;