pim6d: Pass pim_addr for pim_nht callbacks.

For pim callbacks, we pass pim_addr as value, not pointer.
So making it consistent for pim_nht callbacks.

Signed-off-by: sarita patra <saritap@vmware.com>

diff --git a/pimd/pim_bsm.c b/pimd/pim_bsm.c
index bd5b1a2cdf245cd8eebc074784559bc00f8c6e93..e5e621de0d7d4fafd31ad797d12b4f58739ea1e7 100644 (file)
--- a/pimd/pim_bsm.c
+++ b/pimd/pim_bsm.c
@@ -624,7 +624,7 @@ void pim_bsm_clear(struct pim_instance *pim)
                                   __func__, &nht_p);
                }
 
-               pim_delete_tracked_nexthop(pim, &nht_p, NULL, rp_info);
+               pim_delete_tracked_nexthop(pim, nht_p, NULL, rp_info);
 
                if (!pim_get_all_mcast_group(&g_all))
                        return;

diff --git a/pimd/pim_nht.c b/pimd/pim_nht.c
index 95ed09d227512f1eb164d93a567dde07c5377917..94906d34267f709de3d946505190922e2a65fdb7 100644 (file)
--- a/pimd/pim_nht.c
+++ b/pimd/pim_nht.c
@@ -107,7 +107,7 @@ static struct pim_nexthop_cache *pim_nexthop_cache_add(struct pim_instance *pim,
 }
 
 static struct pim_nexthop_cache *pim_nht_get(struct pim_instance *pim,
-                                            pim_addr *addr)
+                                            pim_addr addr)
 {
        struct pim_nexthop_cache *pnc = NULL;
        struct pim_rpf rpf;
@@ -115,7 +115,7 @@ static struct pim_nexthop_cache *pim_nht_get(struct pim_instance *pim,
 
        zclient = pim_zebra_zclient_get();
        memset(&rpf, 0, sizeof(rpf));
-       rpf.rpf_addr = *addr;
+       rpf.rpf_addr = addr;
 
        pnc = pim_nexthop_cache_find(pim, &rpf);
        if (!pnc) {
@@ -125,7 +125,7 @@ static struct pim_nexthop_cache *pim_nht_get(struct pim_instance *pim,
                if (PIM_DEBUG_PIM_NHT_DETAIL)
                        zlog_debug(
                                "%s: NHT cache and zebra notification added for %pPA(%s)",
-                               __func__, addr, pim->vrf->name);
+                               __func__, &addr, pim->vrf->name);
        }
 
        return pnc;
@@ -134,7 +134,7 @@ static struct pim_nexthop_cache *pim_nht_get(struct pim_instance *pim,
 /* TBD: this does several distinct things and should probably be split up.
  * (checking state vs. returning pnc vs. adding upstream vs. adding rp)
  */
-int pim_find_or_track_nexthop(struct pim_instance *pim, pim_addr *addr,
+int pim_find_or_track_nexthop(struct pim_instance *pim, pim_addr addr,
                              struct pim_upstream *up, struct rp_info *rp,
                              struct pim_nexthop_cache *out_pnc)
 {
@@ -143,7 +143,7 @@ int pim_find_or_track_nexthop(struct pim_instance *pim, pim_addr *addr,
 
        pnc = pim_nht_get(pim, addr);
 
-       assertf(up || rp, "addr=%pPA", addr);
+       assertf(up || rp, "addr=%pPA", &addr);
 
        if (rp != NULL) {
                ch_node = listnode_lookup(pnc->rp_list, rp);
@@ -167,11 +167,8 @@ int pim_find_or_track_nexthop(struct pim_instance *pim, pim_addr *addr,
 void pim_nht_bsr_add(struct pim_instance *pim, struct in_addr addr)
 {
        struct pim_nexthop_cache *pnc;
-       pim_addr rpf_addr;
 
-       rpf_addr = addr;
-
-       pnc = pim_nht_get(pim, &rpf_addr);
+       pnc = pim_nht_get(pim, addr);
 
        pnc->bsr_count++;
 }
@@ -204,7 +201,7 @@ static void pim_nht_drop_maybe(struct pim_instance *pim,
        }
 }
 
-void pim_delete_tracked_nexthop(struct pim_instance *pim, pim_addr *addr,
+void pim_delete_tracked_nexthop(struct pim_instance *pim, pim_addr addr,
                                struct pim_upstream *up, struct rp_info *rp)
 {
        struct pim_nexthop_cache *pnc = NULL;
@@ -212,11 +209,11 @@ void pim_delete_tracked_nexthop(struct pim_instance *pim, pim_addr *addr,
        struct pim_upstream *upstream = NULL;
 
        /* Remove from RPF hash if it is the last entry */
-       lookup.rpf.rpf_addr = *addr;
+       lookup.rpf.rpf_addr = addr;
        pnc = hash_lookup(pim->rpf_hash, &lookup);
        if (!pnc) {
                zlog_warn("attempting to delete nonexistent NHT entry %pPA",
-                         addr);
+                         &addr);
                return;
        }
 
@@ -390,8 +387,8 @@ bool pim_nht_bsr_rpf_check(struct pim_instance *pim, struct in_addr bsr_addr,
                if (!nbr)
                        continue;
 
-               return nh->ifindex == src_ifp->ifindex
-                      && nhaddr.s_addr == src_ip.s_addr;
+               return nh->ifindex == src_ifp->ifindex &&
+                      (!pim_addr_cmp(nhaddr, src_ip));
        }
        return false;
 }
@@ -421,7 +418,7 @@ static void pim_update_rp_nh(struct pim_instance *pim,
 
                // Compute PIM RPF using cached nexthop
                if (!pim_ecmp_nexthop_lookup(pim, &rp_info->rp.source_nexthop,
-                                            &rp_info->rp.rpf_addr,
+                                            rp_info->rp.rpf_addr,
                                             &rp_info->group, 1))
                        pim_rp_nexthop_del(rp_info);
        }
@@ -491,7 +488,7 @@ uint32_t pim_compute_ecmp_hash(struct prefix *src, struct prefix *grp)
 
 static int pim_ecmp_nexthop_search(struct pim_instance *pim,
                                   struct pim_nexthop_cache *pnc,
-                                  struct pim_nexthop *nexthop, pim_addr *src,
+                                  struct pim_nexthop *nexthop, pim_addr src,
                                   struct prefix *grp, int neighbor_needed)
 {
        struct pim_neighbor *nbrs[router->multipath], *nbr = NULL;
@@ -536,7 +533,7 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim,
 
                        if (curr_route_valid &&
                            !pim_if_connected_to_source(nexthop->interface,
-                                                       *src)) {
+                                                       src)) {
                                nbr = pim_neighbor_find(
                                        nexthop->interface,
                                        nexthop->mrib_nexthop_addr);
@@ -557,7 +554,7 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim,
                                        if (PIM_DEBUG_PIM_NHT)
                                                zlog_debug(
                                                        "%s: (%pPA,%pPA)(%s) current nexthop %s is valid, skipping new path selection",
-                                                       __func__, src,
+                                                       __func__, &src,
                                                        &grp_addr,
                                                        pim->vrf->name,
                                                        nexthop->interface->name);
@@ -582,8 +579,7 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim,
                        pim_addr nhaddr = nh_node->gate.ipv6;
 #endif
                        nbrs[i] = pim_neighbor_find(ifps[i], nhaddr);
-                       if (nbrs[i] ||
-                           pim_if_connected_to_source(ifps[i], *src))
+                       if (nbrs[i] || pim_if_connected_to_source(ifps[i], src))
                                num_nbrs++;
                }
        }
@@ -598,7 +594,7 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim,
                        return 0;
 
                // PIM ECMP flag is enable then choose ECMP path.
-               pim_addr_to_prefix(&src_pfx, *src);
+               pim_addr_to_prefix(&src_pfx, src);
                hash_val = pim_compute_ecmp_hash(&src_pfx, grp);
                mod_val = hash_val % consider;
        }
@@ -611,7 +607,7 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim,
                        if (PIM_DEBUG_PIM_NHT)
                                zlog_debug(
                                        "%s %s: could not find interface for ifindex %d (address %pPA(%s))",
-                                       __FILE__, __func__, first_ifindex, src,
+                                       __FILE__, __func__, first_ifindex, &src,
                                        pim->vrf->name);
                        if (nh_iter == mod_val)
                                mod_val++; // Select nexthpath
@@ -623,14 +619,14 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim,
                                zlog_debug(
                                        "%s: multicast not enabled on input interface %s(%s) (ifindex=%d, RPF for source %pPA)",
                                        __func__, ifp->name, pim->vrf->name,
-                                       first_ifindex, src);
+                                       first_ifindex, &src);
                        if (nh_iter == mod_val)
                                mod_val++; // Select nexthpath
                        nh_iter++;
                        continue;
                }
 
-               if (neighbor_needed && !pim_if_connected_to_source(ifp, *src)) {
+               if (neighbor_needed && !pim_if_connected_to_source(ifp, src)) {
                        nbr = nbrs[nh_iter];
                        if (!nbr && !if_is_loopback(ifp)) {
                                if (PIM_DEBUG_PIM_NHT)
@@ -654,14 +650,14 @@ static int pim_ecmp_nexthop_search(struct pim_instance *pim,
 #endif
                        nexthop->mrib_metric_preference = pnc->distance;
                        nexthop->mrib_route_metric = pnc->metric;
-                       nexthop->last_lookup = *src;
+                       nexthop->last_lookup = src;
                        nexthop->last_lookup_time = pim_time_monotonic_usec();
                        nexthop->nbr = nbr;
                        found = 1;
                        if (PIM_DEBUG_PIM_NHT)
                                zlog_debug(
                                        "%s: (%pPA,%pPA)(%s) selected nhop interface %s addr %pPAs mod_val %u iter %d ecmp %d",
-                                       __func__, src, &grp_addr,
+                                       __func__, &src, &grp_addr,
                                        pim->vrf->name, ifp->name, &nh_addr,
                                        mod_val, nh_iter, pim->ecmp_enable);
                }
@@ -875,7 +871,7 @@ int pim_parse_nexthop_update(ZAPI_CALLBACK_ARGS)
 }
 
 int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
-                           struct pim_nexthop *nexthop, pim_addr *src,
+                           struct pim_nexthop *nexthop, pim_addr src,
                            struct prefix *grp, int neighbor_needed)
 {
        struct pim_nexthop_cache *pnc;
@@ -892,10 +888,10 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
 
        if (PIM_DEBUG_PIM_NHT_DETAIL)
                zlog_debug("%s: Looking up: %pPA(%s), last lookup time: %lld",
-                          __func__, src, pim->vrf->name,
+                          __func__, &src, pim->vrf->name,
                           nexthop->last_lookup_time);
 
-       rpf.rpf_addr = *src;
+       rpf.rpf_addr = src;
 
        pnc = pim_nexthop_cache_find(pim, &rpf);
        if (pnc) {
@@ -913,7 +909,7 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
                if (PIM_DEBUG_PIM_NHT)
                        zlog_warn(
                                "%s: could not find nexthop ifindex for address %pPA(%s)",
-                               __func__, src, pim->vrf->name);
+                               __func__, &src, pim->vrf->name);
                return 0;
        }
 
@@ -930,8 +926,7 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
                if (ifps[i]) {
                        nbrs[i] = pim_neighbor_find(
                                ifps[i], nexthop_tab[i].nexthop_addr);
-                       if (nbrs[i] ||
-                           pim_if_connected_to_source(ifps[i], *src))
+                       if (nbrs[i] || pim_if_connected_to_source(ifps[i], src))
                                num_nbrs++;
                }
        }
@@ -947,7 +942,7 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
                if (consider == 0)
                        return 0;
 
-               pim_addr_to_prefix(&src_pfx, *src);
+               pim_addr_to_prefix(&src_pfx, src);
                hash_val = pim_compute_ecmp_hash(&src_pfx, grp);
                mod_val = hash_val % consider;
                if (PIM_DEBUG_PIM_NHT_DETAIL)
@@ -964,7 +959,7 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
                        if (PIM_DEBUG_PIM_NHT)
                                zlog_debug(
                                        "%s %s: could not find interface for ifindex %d (address %pPA(%s))",
-                                       __FILE__, __func__, first_ifindex, src,
+                                       __FILE__, __func__, first_ifindex, &src,
                                        pim->vrf->name);
                        if (i == mod_val)
                                mod_val++;
@@ -977,13 +972,13 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
                                zlog_debug(
                                        "%s: multicast not enabled on input interface %s(%s) (ifindex=%d, RPF for source %pPA)",
                                        __func__, ifp->name, pim->vrf->name,
-                                       first_ifindex, src);
+                                       first_ifindex, &src);
                        if (i == mod_val)
                                mod_val++;
                        i++;
                        continue;
                }
-               if (neighbor_needed && !pim_if_connected_to_source(ifp, *src)) {
+               if (neighbor_needed && !pim_if_connected_to_source(ifp, src)) {
                        nbr = nbrs[i];
                        if (PIM_DEBUG_PIM_NHT_DETAIL)
                                zlog_debug("ifp name: %s(%s), pim nbr: %p",
@@ -996,7 +991,8 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
                                                "%s: NBR (%pPA) not found on input interface %s(%s) (RPF for source %pPA)",
                                                __func__,
                                                &nexthop_tab[i].nexthop_addr,
-                                               ifp->name, pim->vrf->name, src);
+                                               ifp->name, pim->vrf->name,
+                                               &src);
                                i++;
                                continue;
                        }
@@ -1007,7 +1003,7 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
                                zlog_debug(
                                        "%s: found nhop %pPA for addr %pPA interface %s(%s) metric %d dist %d",
                                        __func__, &nexthop_tab[i].nexthop_addr,
-                                       src, ifp->name, pim->vrf->name,
+                                       &src, ifp->name, pim->vrf->name,
                                        nexthop_tab[i].route_metric,
                                        nexthop_tab[i].protocol_distance);
                        /* update nexthop data */
@@ -1018,7 +1014,7 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
                                nexthop_tab[i].protocol_distance;
                        nexthop->mrib_route_metric =
                                nexthop_tab[i].route_metric;
-                       nexthop->last_lookup = *src;
+                       nexthop->last_lookup = src;
                        nexthop->last_lookup_time = pim_time_monotonic_usec();
                        nexthop->nbr = nbr;
                        found = 1;
@@ -1032,7 +1028,7 @@ int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
                return 0;
 }
 
-int pim_ecmp_fib_lookup_if_vif_index(struct pim_instance *pim, pim_addr *src,
+int pim_ecmp_fib_lookup_if_vif_index(struct pim_instance *pim, pim_addr src,
                                     struct prefix *grp)
 {
        struct pim_nexthop nhop;
@@ -1044,7 +1040,7 @@ int pim_ecmp_fib_lookup_if_vif_index(struct pim_instance *pim, pim_addr *src,
                if (PIM_DEBUG_PIM_NHT)
                        zlog_debug(
                                "%s: could not find nexthop ifindex for address %pPA(%s)",
-                               __func__, src, pim->vrf->name);
+                               __func__, &src, pim->vrf->name);
                return -1;
        }
 
@@ -1054,7 +1050,7 @@ int pim_ecmp_fib_lookup_if_vif_index(struct pim_instance *pim, pim_addr *src,
                        "%s: found nexthop ifindex=%d (interface %s(%s)) for address %pPA",
                        __func__, ifindex,
                        ifindex2ifname(ifindex, pim->vrf->vrf_id),
-                       pim->vrf->name, src);
+                       pim->vrf->name, &src);
 
        vif_index = pim_if_find_vifindex_by_ifindex(pim, ifindex);
 
@@ -1062,7 +1058,7 @@ int pim_ecmp_fib_lookup_if_vif_index(struct pim_instance *pim, pim_addr *src,
                if (PIM_DEBUG_PIM_NHT) {
                        zlog_debug(
                                "%s: low vif_index=%d(%s) < 1 nexthop for address %pPA",
-                               __func__, vif_index, pim->vrf->name, src);
+                               __func__, vif_index, pim->vrf->name, &src);
                }
                return -2;
        }

diff --git a/pimd/pim_nht.h b/pimd/pim_nht.h
index 65cffdb595c35f2bfb3e4d672ec428fd303a16b4..c5c607e5abfe8c9f7940f3ba3ed625da2fd2311f 100644 (file)
--- a/pimd/pim_nht.h
+++ b/pimd/pim_nht.h
@@ -54,20 +54,20 @@ struct pim_nexthop_cache {
 };
 
 int pim_parse_nexthop_update(ZAPI_CALLBACK_ARGS);
-int pim_find_or_track_nexthop(struct pim_instance *pim, pim_addr *addr,
+int pim_find_or_track_nexthop(struct pim_instance *pim, pim_addr addr,
                              struct pim_upstream *up, struct rp_info *rp,
                              struct pim_nexthop_cache *out_pnc);
-void pim_delete_tracked_nexthop(struct pim_instance *pim, pim_addr *addr,
+void pim_delete_tracked_nexthop(struct pim_instance *pim, pim_addr addr,
                                struct pim_upstream *up, struct rp_info *rp);
 struct pim_nexthop_cache *pim_nexthop_cache_find(struct pim_instance *pim,
                                                 struct pim_rpf *rpf);
 uint32_t pim_compute_ecmp_hash(struct prefix *src, struct prefix *grp);
 int pim_ecmp_nexthop_lookup(struct pim_instance *pim,
-                           struct pim_nexthop *nexthop, pim_addr *src,
+                           struct pim_nexthop *nexthop, pim_addr src,
                            struct prefix *grp, int neighbor_needed);
 void pim_sendmsg_zebra_rnh(struct pim_instance *pim, struct zclient *zclient,
                           struct pim_nexthop_cache *pnc, int command);
-int pim_ecmp_fib_lookup_if_vif_index(struct pim_instance *pim, pim_addr *src,
+int pim_ecmp_fib_lookup_if_vif_index(struct pim_instance *pim, pim_addr src,
                                     struct prefix *grp);
 void pim_rp_nexthop_del(struct rp_info *rp_info);
 

diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c
index 657e776c7f826f97f0e8fa00232b340b39671e01..aa31a67036430f363ccf3ce292a1b4d8c9bbc92b 100644 (file)
--- a/pimd/pim_rp.c
+++ b/pimd/pim_rp.c
@@ -406,7 +406,7 @@ void pim_upstream_update(struct pim_instance *pim, struct pim_upstream *up)
                        zlog_debug(
                                "%s: Deregister upstream %s addr %pPA with Zebra NHT",
                                __func__, up->sg_str, &old_upstream_addr);
-               pim_delete_tracked_nexthop(pim, &old_upstream_addr, up, NULL);
+               pim_delete_tracked_nexthop(pim, old_upstream_addr, up, NULL);
        }
 
        /* Update the upstream address */
@@ -558,12 +558,12 @@ int pim_rp_new(struct pim_instance *pim, pim_addr rp_addr, struct prefix group,
 
                        pim_rp_check_interfaces(pim, rp_all);
                        pim_rp_refresh_group_to_rp_mapping(pim);
-                       pim_find_or_track_nexthop(pim, &nht_p, NULL, rp_all,
+                       pim_find_or_track_nexthop(pim, nht_p, NULL, rp_all,
                                                  NULL);
 
                        if (!pim_ecmp_nexthop_lookup(pim,
                                                     &rp_all->rp.source_nexthop,
-                                                    &nht_p, &rp_all->group, 1))
+                                                    nht_p, &rp_all->group, 1))
                                return PIM_RP_NO_PATH;
                        return PIM_SUCCESS;
                }
@@ -655,8 +655,8 @@ int pim_rp_new(struct pim_instance *pim, pim_addr rp_addr, struct prefix group,
        if (PIM_DEBUG_PIM_NHT_RP)
                zlog_debug("%s: NHT Register RP addr %pPA grp %pFX with Zebra ",
                           __func__, &nht_p, &rp_info->group);
-       pim_find_or_track_nexthop(pim, &nht_p, NULL, rp_info, NULL);
-       if (!pim_ecmp_nexthop_lookup(pim, &rp_info->rp.source_nexthop, &nht_p,
+       pim_find_or_track_nexthop(pim, nht_p, NULL, rp_info, NULL);
+       if (!pim_ecmp_nexthop_lookup(pim, &rp_info->rp.source_nexthop, nht_p,
                                     &rp_info->group, 1))
                return PIM_RP_NO_PATH;
 
@@ -748,7 +748,7 @@ int pim_rp_del(struct pim_instance *pim, pim_addr rp_addr, struct prefix group,
        if (PIM_DEBUG_PIM_NHT_RP)
                zlog_debug("%s: Deregister RP addr %pPA with Zebra ", __func__,
                           &nht_p);
-       pim_delete_tracked_nexthop(pim, &nht_p, NULL, rp_info);
+       pim_delete_tracked_nexthop(pim, nht_p, NULL, rp_info);
 
        if (!pim_get_all_mcast_group(&g_all))
                return PIM_RP_BAD_ADDRESS;
@@ -882,7 +882,7 @@ int pim_rp_change(struct pim_instance *pim, pim_addr new_rp_addr,
                if (PIM_DEBUG_PIM_NHT_RP)
                        zlog_debug("%s: Deregister RP addr %pPA with Zebra ",
                                   __func__, &nht_p);
-               pim_delete_tracked_nexthop(pim, &nht_p, NULL, rp_info);
+               pim_delete_tracked_nexthop(pim, nht_p, NULL, rp_info);
        }
 
        pim_rp_nexthop_del(rp_info);
@@ -919,8 +919,8 @@ int pim_rp_change(struct pim_instance *pim, pim_addr new_rp_addr,
                zlog_debug("%s: NHT Register RP addr %pPA grp %pFX with Zebra ",
                           __func__, &nht_p, &rp_info->group);
 
-       pim_find_or_track_nexthop(pim, &nht_p, NULL, rp_info, NULL);
-       if (!pim_ecmp_nexthop_lookup(pim, &rp_info->rp.source_nexthop, &nht_p,
+       pim_find_or_track_nexthop(pim, nht_p, NULL, rp_info, NULL);
+       if (!pim_ecmp_nexthop_lookup(pim, &rp_info->rp.source_nexthop, nht_p,
                                     &rp_info->group, 1)) {
                route_unlock_node(rn);
                return PIM_RP_NO_PATH;
@@ -947,9 +947,9 @@ void pim_rp_setup(struct pim_instance *pim)
 
                nht_p = rp_info->rp.rpf_addr;
 
-               pim_find_or_track_nexthop(pim, &nht_p, NULL, rp_info, NULL);
+               pim_find_or_track_nexthop(pim, nht_p, NULL, rp_info, NULL);
                if (!pim_ecmp_nexthop_lookup(pim, &rp_info->rp.source_nexthop,
-                                            &nht_p, &rp_info->group, 1))
+                                            nht_p, &rp_info->group, 1))
                        if (PIM_DEBUG_PIM_NHT_RP)
                                zlog_debug(
                                        "Unable to lookup nexthop for rp specified");
@@ -1024,9 +1024,10 @@ void pim_i_am_rp_re_evaluate(struct pim_instance *pim)
                                                   __func__,
                                                   &rp_info->rp.rpf_addr);
                                else
-                                       zlog_debug("%s: %pPA: i am no longer rp",
-                                                  __func__,
-                                                  &rp_info->rp.rpf_addr);
+                                       zlog_debug(
+                                               "%s: %pPA: i am no longer rp",
+                                               __func__,
+                                               &rp_info->rp.rpf_addr);
                        }
                }
        }
@@ -1081,10 +1082,10 @@ struct pim_rpf *pim_rp_g(struct pim_instance *pim, pim_addr group)
                        zlog_debug(
                                "%s: NHT Register RP addr %pPA grp %pFX with Zebra",
                                __func__, &nht_p, &rp_info->group);
-               pim_find_or_track_nexthop(pim, &nht_p, NULL, rp_info, NULL);
+               pim_find_or_track_nexthop(pim, nht_p, NULL, rp_info, NULL);
                pim_rpf_set_refresh_time(pim);
                (void)pim_ecmp_nexthop_lookup(pim, &rp_info->rp.source_nexthop,
-                                             &nht_p, &rp_info->group, 1);
+                                             nht_p, &rp_info->group, 1);
                return (&rp_info->rp);
        }
 
@@ -1288,8 +1289,7 @@ void pim_resolve_rp_nh(struct pim_instance *pim, struct pim_neighbor *nbr)
 
                nht_p = rp_info->rp.rpf_addr;
                memset(&pnc, 0, sizeof(struct pim_nexthop_cache));
-               if (!pim_find_or_track_nexthop(pim, &nht_p, NULL, rp_info,
-                                              &pnc))
+               if (!pim_find_or_track_nexthop(pim, nht_p, NULL, rp_info, &pnc))
                        continue;
 
                for (nh_node = pnc.nexthop; nh_node; nh_node = nh_node->next) {

diff --git a/pimd/pim_rpf.c b/pimd/pim_rpf.c
index 13a7c12dd30561118f8a599b0bf609e09c5a024b..a28278c5812634ca33cc06abf309bb06964270ba 100644 (file)
--- a/pimd/pim_rpf.c
+++ b/pimd/pim_rpf.c
@@ -231,9 +231,9 @@ enum pim_rpf_result pim_rpf_update(struct pim_instance *pim,
        if ((pim_addr_is_any(up->sg.src) && I_am_RP(pim, up->sg.grp)) ||
            PIM_UPSTREAM_FLAG_TEST_FHR(up->flags))
                neigh_needed = false;
-       pim_find_or_track_nexthop(pim, &up->upstream_addr, up, NULL, NULL);
-       if (!pim_ecmp_nexthop_lookup(pim, &rpf->source_nexthop, &src, &grp,
-                               neigh_needed)) {
+       pim_find_or_track_nexthop(pim, up->upstream_addr, up, NULL, NULL);
+       if (!pim_ecmp_nexthop_lookup(pim, &rpf->source_nexthop, src, &grp,
+                                    neigh_needed)) {
                /* Route is Deleted in Zebra, reset the stored NH data */
                pim_upstream_rpf_clear(pim, up);
                pim_rpf_cost_change(pim, up, saved_mrib_route_metric);

diff --git a/pimd/pim_tib.c b/pimd/pim_tib.c
index 81dcfc9269ceb1e7f2f14cc56d1ee8d52e1c5361..3b73c430b03336d24945ca271a5ad28679942a90 100644 (file)
--- a/pimd/pim_tib.c
+++ b/pimd/pim_tib.c
@@ -49,13 +49,13 @@ tib_sg_oil_setup(struct pim_instance *pim, pim_sgaddr sg, struct interface *oif)
        if (up) {
                memcpy(&nexthop, &up->rpf.source_nexthop,
                       sizeof(struct pim_nexthop));
-               pim_ecmp_nexthop_lookup(pim, &nexthop, &vif_source, &grp, 0);
+               pim_ecmp_nexthop_lookup(pim, &nexthop, vif_source, &grp, 0);
                if (nexthop.interface)
                        input_iface_vif_index = pim_if_find_vifindex_by_ifindex(
                                pim, nexthop.interface->ifindex);
        } else
-               input_iface_vif_index = pim_ecmp_fib_lookup_if_vif_index(
-                       pim, &vif_source, &grp);
+               input_iface_vif_index =
+                       pim_ecmp_fib_lookup_if_vif_index(pim, vif_source, &grp);
 
        if (PIM_DEBUG_ZEBRA)
                zlog_debug("%s: NHT %pSG vif_source %pPAs vif_index:%d",

diff --git a/pimd/pim_upstream.c b/pimd/pim_upstream.c
index 8190162a2a44027ee230ec0f2f722acd89397990..4dcdee34f0fd9ad8d60b75d96fb2e81e8ae48d69 100644 (file)
--- a/pimd/pim_upstream.c
+++ b/pimd/pim_upstream.c
@@ -270,7 +270,7 @@ struct pim_upstream *pim_upstream_del(struct pim_instance *pim,
                        zlog_debug(
                                "%s: Deregister upstream %s addr %pPA with Zebra NHT",
                                __func__, up->sg_str, &up->upstream_addr);
-               pim_delete_tracked_nexthop(pim, &up->upstream_addr, up, NULL);
+               pim_delete_tracked_nexthop(pim, up->upstream_addr, up, NULL);
        }
 
        XFREE(MTYPE_PIM_UPSTREAM, up);

diff --git a/pimd/pim_vxlan.c b/pimd/pim_vxlan.c
index d6bfc0a256f5b56bea3871d8c95c834d9d33f655..5b63d0493694ef738eecc925d09122c2170f44f8 100644 (file)
--- a/pimd/pim_vxlan.c
+++ b/pimd/pim_vxlan.c
@@ -352,8 +352,8 @@ static void pim_vxlan_orig_mr_up_add(struct pim_vxlan_sg *vxlan_sg)
                 * iif
                 */
                if (!PIM_UPSTREAM_FLAG_TEST_STATIC_IIF(up->flags)) {
-                       pim_delete_tracked_nexthop(
-                               vxlan_sg->pim, &up->upstream_addr, up, NULL);
+                       pim_delete_tracked_nexthop(vxlan_sg->pim,
+                                                  up->upstream_addr, up, NULL);
                }
                /* We are acting FHR; clear out use_rpt setting if any */
                pim_upstream_update_use_rpt(up, false /*update_mroute*/);