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 <sharpd@cumulusnetworks.com>

diff --git a/bgpd/bgp_nht.c b/bgpd/bgp_nht.c
index 6bc69f65421916622cd0c9a6ef3386a1fe4620d3..b0362b5537dfb280c2e1a284d3f5bd4012e98475 100644 (file)
--- 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 527125ca53c3951d823e080246b001ac6913d038..f42354b6e61feb12101d65531aca9861162363e0 100644 (file)
--- 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);