diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-08-24 00:48:37 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-09-01 07:20:18 -0400 |
| commit | 14364a318097a49062f545a255e4e6a306e7b2fe (patch) | |
| tree | fe23c33b6be2d3fe69950dc5764fdbe9c29113bd /zebra/zserv.c | |
| parent | 3a3d00f1bd3b82a9b1f2bca5485c578773c403b7 (diff) | |
zebra: Refactor rib_match_ipv[4|6]
the rib_match_ipv4 and rib_match_ipv6 functions were
the same. Refactor to 1 function.
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'zebra/zserv.c')
| -rw-r--r-- | zebra/zserv.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/zebra/zserv.c b/zebra/zserv.c index 84881e14a4..73e84faca2 100644 --- a/zebra/zserv.c +++ b/zebra/zserv.c @@ -722,9 +722,10 @@ zsend_ipv6_nexthop_lookup (struct zserv *client, struct in6_addr *addr, unsigned long nump; u_char num; struct nexthop *nexthop; + union g_addr gaddr = { .ipv6 = *addr }; /* Lookup nexthop. */ - rib = rib_match_ipv6 (addr, vrf_id); + rib = rib_match (AFI_IP6, SAFI_UNICAST, vrf_id, &gaddr, NULL); /* Get output stream. */ s = client->obuf; @@ -788,9 +789,10 @@ zsend_ipv4_nexthop_lookup (struct zserv *client, struct in_addr addr, unsigned long nump; u_char num; struct nexthop *nexthop; + union g_addr gaddr = { .ipv4 = addr }; /* Lookup nexthop. */ - rib = rib_match_ipv4 (addr, SAFI_UNICAST, vrf_id, NULL); + rib = rib_match (AFI_IP, SAFI_UNICAST, vrf_id, &gaddr, NULL); /* Get output stream. */ s = client->obuf; |