Merge pull request #12798 from donaldsharp/rib_match_multicast

[mirror_frr.git] / zebra / zapi_msg.c

diff --git a/zebra/zapi_msg.c b/zebra/zapi_msg.c
index b7344d7cc1668652e86d04e858d99effa5160561..59152df2f151f2b28baa330eee182c943fec72de 100644 (file)
--- 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:
                /* ??? */