diff options
| author | Donald Sharp <sharpd@nvidia.com> | 2023-02-13 12:13:42 -0500 |
|---|---|---|
| committer | Donald Sharp <sharpd@nvidia.com> | 2023-02-16 07:52:35 -0500 |
| commit | 312e29b0607f688ed30ba64d8a1fea7600967a72 (patch) | |
| tree | cf29143b72041c474698435a609c59a32e3b8338 /zebra/zapi_msg.c | |
| parent | bf9bc2e5f2213069801dd1445abc2bfa95214fdf (diff) | |
zebra: Remove code duplication for v4 and v6 versions of rib_match_multicast
a) Consolidate v4 and v6 versions of rib_match_multicast
b) Improve debug to show what we matched against as well.
Signed-off-by: Donald Sharp <sharpd@nvidia.com>
Diffstat (limited to 'zebra/zapi_msg.c')
| -rw-r--r-- | zebra/zapi_msg.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c index 15b5790923..8f0c055f5c 100644 --- a/zebra/zapi_msg.c +++ b/zebra/zapi_msg.c @@ -2249,17 +2249,18 @@ static void zread_nexthop_lookup_mrib(ZAPI_HANDLER_ARGS) { struct ipaddr addr; struct route_entry *re = NULL; + union g_addr gaddr; STREAM_GET_IPADDR(msg, &addr); switch (addr.ipa_type) { case IPADDR_V4: - re = rib_match_ipv4_multicast(zvrf_id(zvrf), addr.ipaddr_v4, - NULL); + gaddr.ipv4 = addr.ipaddr_v4; + re = rib_match_multicast(AFI_IP, zvrf_id(zvrf), &gaddr, NULL); break; case IPADDR_V6: - re = rib_match_ipv6_multicast(zvrf_id(zvrf), addr.ipaddr_v6, - NULL); + gaddr.ipv6 = addr.ipaddr_v6; + re = rib_match_multicast(AFI_IP6, zvrf_id(zvrf), &gaddr, NULL); break; case IPADDR_NONE: /* ??? */ |