diff options
| author | Russ White <russ@riw.us> | 2023-02-21 17:40:36 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-02-21 17:40:36 +0100 |
| commit | 12906cb1c84b4de54874365d4a02a040ed9632d1 (patch) | |
| tree | 2976dc2439fda3eb0e9379a5e99422d1df0c6262 /zebra/zapi_msg.c | |
| parent | Merge pull request #12818 from imzyxwvu/fix/other-table-inactive (diff) | |
| parent | doc: Add `show ipv6 rpf X:X::X:X` command to docs (diff) | |
| download | frr-12906cb1c84b4de54874365d4a02a040ed9632d1.tar.xz frr-12906cb1c84b4de54874365d4a02a040ed9632d1.zip | |
Merge pull request #12798 from donaldsharp/rib_match_multicast
Rib match multicast
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 b7344d7cc..59152df2f 100644 --- a/zebra/zapi_msg.c +++ b/zebra/zapi_msg.c @@ -2236,17 +2236,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: /* ??? */ |