From 8e581e39196b938364b9dae06eeb9e846c2943ee Mon Sep 17 00:00:00 2001 From: Donald Sharp Date: Mon, 6 Mar 2017 11:05:42 -0500 Subject: [PATCH] bgpd, zebra: Add ifindex to NEXTHOP_TYPE_IPV6 In the future we plan to update Nexthop tracking to better handle ipv6 lla. This commit will set this up for that. Signed-off-by: Donald Sharp --- bgpd/bgp_nht.c | 1 + zebra/zebra_rnh.c | 1 + 2 files changed, 2 insertions(+) diff --git a/bgpd/bgp_nht.c b/bgpd/bgp_nht.c index 6bc69f6542..b0362b5537 100644 --- a/bgpd/bgp_nht.c +++ b/bgpd/bgp_nht.c @@ -443,6 +443,7 @@ bgp_parse_nexthop_update (int command, vrf_id_t vrf_id) break; case NEXTHOP_TYPE_IPV6: stream_get (&nexthop->gate.ipv6, s, 16); + nexthop->ifindex = stream_getl (s); break; case NEXTHOP_TYPE_IPV6_IFINDEX: stream_get (&nexthop->gate.ipv6, s, 16); diff --git a/zebra/zebra_rnh.c b/zebra/zebra_rnh.c index 527125ca53..f42354b6e6 100644 --- a/zebra/zebra_rnh.c +++ b/zebra/zebra_rnh.c @@ -904,6 +904,7 @@ send_client (struct rnh *rnh, struct zserv *client, rnh_type_t type, vrf_id_t vr break; case NEXTHOP_TYPE_IPV6: stream_put (s, &nexthop->gate.ipv6, 16); + stream_putl (s, nexthop->ifindex); break; case NEXTHOP_TYPE_IPV6_IFINDEX: stream_put (s, &nexthop->gate.ipv6, 16); -- 2.39.5