From b6c9de3bd3eb750a0ce1fcca66a38416a8d767d0 Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Thu, 1 Nov 2018 18:33:54 -0400 Subject: [PATCH] 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 --- lib/zclient.c | 1 + zebra/zebra_rnh.c | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/zclient.c b/lib/zclient.c index 08831ace6a..45a9f7be9e 100644 --- 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 b9d25a9d9b..f57bf7984a 100644 --- 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: -- 2.39.5