bgpd, zebra: support NEXTHOP_IPV4_IFINDEX in bgp import check
Signed-off-by: Christian Franke <chris@opensourcerouting.org>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c
index 7d8d866..e23155c 100644
--- a/bgpd/bgp_nexthop.c
+++ b/bgpd/bgp_nexthop.c
@@ -1093,14 +1093,20 @@
{
nexthop.s_addr = 0;
nexthop_type = stream_getc (s);
- if (nexthop_type == ZEBRA_NEXTHOP_IPV4)
+ switch (nexthop_type)
{
+ case ZEBRA_NEXTHOP_IPV4:
nexthop.s_addr = stream_get_ipv4 (s);
- if (igpnexthop)
- *igpnexthop = nexthop;
+ break;
+ case ZEBRA_NEXTHOP_IPV4_IFINDEX:
+ nexthop.s_addr = stream_get_ipv4 (s);
+ /* ifindex */ (void)stream_getl (s);
+ break;
+ default:
+ /* do nothing */
+ break;
}
- else
- *igpnexthop = nexthop;
+ *igpnexthop = nexthop;
return 1;
}
diff --git a/zebra/zserv.c b/zebra/zserv.c
index f792c83..1182937 100644
--- a/zebra/zserv.c
+++ b/zebra/zserv.c
@@ -627,6 +627,10 @@
case ZEBRA_NEXTHOP_IPV4:
stream_put_in_addr (s, &nexthop->gate.ipv4);
break;
+ case ZEBRA_NEXTHOP_IPV4_IFINDEX:
+ stream_put_in_addr (s, &nexthop->gate.ipv4);
+ stream_putl (s, nexthop->ifindex);
+ break;
case ZEBRA_NEXTHOP_IFINDEX:
case ZEBRA_NEXTHOP_IFNAME:
stream_putl (s, nexthop->ifindex);