Since this function is internal to zebra, there is no reason to keep this one-line indirect wrapper to rib_match_ipv4_safi() around.
Cc: Everton Marques <[email protected]> Cc: Balaji G <[email protected]> Signed-off-by: David Lamparter <[email protected]> --- zebra/rib.h | 1 - zebra/zebra_rib.c | 6 ------ zebra/zserv.c | 4 ++-- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/zebra/rib.h b/zebra/rib.h index aef7150..d40b17e 100644 --- a/zebra/rib.h +++ b/zebra/rib.h @@ -418,7 +418,6 @@ extern int rib_delete_ipv4 (int type, int flags, struct prefix_ipv4 *p, struct in_addr *gate, unsigned int ifindex, u_int32_t, safi_t safi); -extern struct rib *rib_match_ipv4 (struct in_addr); extern struct rib *rib_match_ipv4_safi (struct in_addr addr, safi_t safi, int skip_bgp); extern struct rib *rib_lookup_ipv4 (struct prefix_ipv4 *); diff --git a/zebra/zebra_rib.c b/zebra/zebra_rib.c index f4a9155..08ce964 100644 --- a/zebra/zebra_rib.c +++ b/zebra/zebra_rib.c @@ -719,12 +719,6 @@ nexthop_active_ipv6 (struct rib *rib, struct nexthop *nexthop, int set, #endif /* HAVE_IPV6 */ struct rib * -rib_match_ipv4 (struct in_addr addr) -{ - return rib_match_ipv4_safi (addr, SAFI_UNICAST, 1); -} - -struct rib * rib_match_ipv4_safi (struct in_addr addr, safi_t safi, int skip_bgp) { struct route_table *table; diff --git a/zebra/zserv.c b/zebra/zserv.c index 1b69315..e9236de 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -539,8 +539,8 @@ zsend_ipv4_nexthop_lookup (struct zserv *client, struct in_addr addr) u_char num; struct nexthop *nexthop; - /* Lookup nexthop. */ - rib = rib_match_ipv4 (addr); + /* Lookup nexthop - eBGP excluded */ + rib = rib_match_ipv4_safi (addr, SAFI_UNICAST, 1); /* Get output stream. */ s = client->obuf; -- 2.0.4 _______________________________________________ Quagga-dev mailing list [email protected] https://lists.quagga.net/mailman/listinfo/quagga-dev
