lib, zebra: Allow zapi to send down the tableid

[mirror_frr.git] / zebra / zserv.c

diff --git a/zebra/zserv.c b/zebra/zserv.c
index 8275ee1a3c1ea451a5866a14f9c5d70c49908821..d245e097244a1ae14d19b3d6a30bda58815302d5 100644 (file)
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -1164,7 +1164,10 @@ static int zread_route_add(struct zserv *client, u_short length,
        re->flags = api.flags;
        re->uptime = time(NULL);
        re->vrf_id = vrf_id;
-       re->table = zvrf->table_id;
+       if (api.tableid && vrf_id == VRF_DEFAULT)
+               re->table = api.tableid;
+       else
+               re->table = zvrf->table_id;
 
        if (CHECK_FLAG(api.message, ZAPI_MESSAGE_NEXTHOP)) {
                for (i = 0; i < api.nexthop_num; i++) {