lib, zebra: Encode nexthop vrf in nht updates

The nexthop vrf was not being encoded in nht updates.
Add it in.

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

diff --git a/lib/zclient.c b/lib/zclient.c
index 08831ace6afc3f99426f85c9e4f39c688fb78b07..45a9f7be9e5ba392c23a9f61c56c35d7df728018 100644 (file)
--- a/lib/zclient.c
+++ b/lib/zclient.c
@@ -1217,6 +1217,7 @@ bool zapi_nexthop_update_decode(struct stream *s, struct zapi_route *nhr)
        STREAM_GETC(s, nhr->nexthop_num);
 
        for (i = 0; i < nhr->nexthop_num; i++) {
+               STREAM_GETL(s, nhr->nexthops[i].vrf_id);
                STREAM_GETC(s, nhr->nexthops[i].type);
                switch (nhr->nexthops[i].type) {
                case NEXTHOP_TYPE_IPV4:

diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c
index b9d25a9d9ba066c45f34b6339597444b4503f70f..f57bf7984a54d4b2ddc182a4c024d24b105d924c 100644 (file)
--- a/zebra/zebra_rnh.c
+++ b/zebra/zebra_rnh.c
@@ -913,6 +913,7 @@ static int send_client(struct rnh *rnh, struct zserv *client, rnh_type_t type,
                stream_putc(s, 0);
                for (nh = re->ng.nexthop; nh; nh = nh->next)
                        if (rnh_nexthop_valid(nh)) {
+                               stream_putl(s, nh->vrf_id);
                                stream_putc(s, nh->type);
                                switch (nh->type) {
                                case NEXTHOP_TYPE_IPV4: