From a12afd5e8e57c95505d4d0166af234c7f19e9fe1 Mon Sep 17 00:00:00 2001
From: Christian Franke <chris@opensourcerouting.org>
Date: Sat, 25 May 2013 14:01:36 +0000
Subject: 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>
---
bgpd/bgp_nexthop.c | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
(limited to 'bgpd')
diff --git a/bgpd/bgp_nexthop.c b/bgpd/bgp_nexthop.c
index 7d8d8665..e23155c7 100644
--- a/bgpd/bgp_nexthop.c
+++ b/bgpd/bgp_nexthop.c
@@ -1093,14 +1093,20 @@ bgp_import_check (struct prefix *p, u_int32_t *igpmetric,
{
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;
}
--
cgit v1.2.1