zebra: kill rib_match_ipv4()
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 <everton.marques@gmail.com>
Cc: Balaji G <balajig81@gmail.com>
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
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 @@
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 @@
#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 @@
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;