zebra: Allow deletions from arbitrary tables

When a route_delete is received allow the deletion
to occur in the passed in tableid if the vrf is VRF_DEFAULT.

This now matches route_add behavior in rib_add_multipath

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>

diff --git a/zebra/zserv.c b/zebra/zserv.c
index 2d68fcde8702003c5345914bc78b2c0a8faa4d84..f11c0dd2fd47a9cca8274a02c30db2362c7e030b 100644 (file)
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -1387,6 +1387,7 @@ static void zread_route_del(ZAPI_HANDLER_ARGS)
        struct zapi_route api;
        afi_t afi;
        struct prefix_ipv6 *src_p = NULL;
+       uint32_t table_id;
 
        s = msg;
        if (zapi_route_decode(s, &api) < 0)
@@ -1401,8 +1402,13 @@ static void zread_route_del(ZAPI_HANDLER_ARGS)
        if (CHECK_FLAG(api.message, ZAPI_MESSAGE_SRCPFX))
                src_p = &api.src_prefix;
 
+       if (api.vrf_id == VRF_DEFAULT && api.tableid != 0)
+               table_id = api.tableid;
+       else
+               table_id = zvrf->table_id;
+
        rib_delete(afi, api.safi, zvrf_id(zvrf), api.type, api.instance,
-                  api.flags, &api.prefix, src_p, NULL, zvrf->table_id,
+                  api.flags, &api.prefix, src_p, NULL, table_id,
                   api.metric, false, &api.rmac);
 
        /* Stats */