From 7b94245256bbd327a72f3fc5dc3ccfcefe79ba78 Mon Sep 17 00:00:00 2001 From: sarita patra Date: Wed, 6 Apr 2022 22:37:12 -0700 Subject: [PATCH] pim6d: Adjust mrib_nexthop_addr igmp_mtrace code 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 --- pimd/pim_igmp_mtrace.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pimd/pim_igmp_mtrace.c b/pimd/pim_igmp_mtrace.c index 11bb2db7eb..9148d1050a 100644 --- a/pimd/pim_igmp_mtrace.c +++ b/pimd/pim_igmp_mtrace.c @@ -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)