]> git.proxmox.com Git - mirror_frr.git/commitdiff
pim6d: Adjust mrib_nexthop_addr igmp_mtrace code
authorsarita patra <saritap@vmware.com>
Thu, 7 Apr 2022 05:37:12 +0000 (22:37 -0700)
committersarita patra <saritap@vmware.com>
Thu, 7 Apr 2022 05:37:12 +0000 (22:37 -0700)
In this PR, we are handling the igmp_mtrace code
after mrib_nexthop_addr modified from prefix
to pim_addr.

Signed-off-by: sarita patra <saritap@vmware.com>
pimd/pim_igmp_mtrace.c

index 11bb2db7eba019e8328da90ebcc71da7f7fd3c81..9148d1050a27832473ab444bd704b696d9b9a75a 100644 (file)
@@ -81,11 +81,9 @@ static bool mtrace_fwd_info_weak(struct pim_instance *pim,
                zlog_debug("mtrace pim_nexthop_lookup OK");
 
        if (PIM_DEBUG_MTRACE)
-               zlog_debug("mtrace next_hop=%pI4",
-                          &nexthop.mrib_nexthop_addr.u.prefix4);
+               zlog_debug("mtrace next_hop=%pPAs", &nexthop.mrib_nexthop_addr);
 
-       if (nexthop.mrib_nexthop_addr.family == AF_INET)
-               nh_addr = nexthop.mrib_nexthop_addr.u.prefix4;
+       nh_addr = nexthop.mrib_nexthop_addr;
 
        ifp_in = nexthop.interface;
 
@@ -134,7 +132,7 @@ static bool mtrace_fwd_info(struct pim_instance *pim,
        }
 
        ifp_in = up->rpf.source_nexthop.interface;
-       nh_addr = up->rpf.source_nexthop.mrib_nexthop_addr.u.prefix4;
+       nh_addr = up->rpf.source_nexthop.mrib_nexthop_addr;
        total = htonl(MTRACE_UNKNOWN_COUNT);
 
        if (PIM_DEBUG_MTRACE)