pim6d: Modify pim_rp_change api for pimv6

Signed-off-by: Mobashshera Rasool <mrasool@vmware.com>

diff --git a/pimd/pim_bsm.c b/pimd/pim_bsm.c
index c45823cb8799aa6e8c2e949780cc7b61f74ea706..61e51c01704ba205ccb194aab486566d76a99003 100644 (file)
--- a/pimd/pim_bsm.c
+++ b/pimd/pim_bsm.c
@@ -324,10 +324,9 @@ static void pim_on_g2rp_timer(struct thread *t)
        if (rp_info->rp_src != RP_SRC_STATIC) {
                /* If new rp available, change it else delete the existing */
                if (bsrp) {
-                       bsrp_addr = bsrp->rp_address;
                        pim_g2rp_timer_start(
                                bsrp, (bsrp->rp_holdtime - bsrp->elapse_time));
-                       pim_rp_change(pim, bsrp_addr, bsgrp_node->group,
+                       pim_rp_change(pim, bsrp->rp_address, bsgrp_node->group,
                                      RP_SRC_BSR);
                } else {
                        pim_rp_del(pim, bsrp_addr, bsgrp_node->group, NULL,

diff --git a/pimd/pim_rp.c b/pimd/pim_rp.c
index 88e824225b021d468c06fa3b06349ce58eba3744..7368723e8a44666fc6daca1c7766f046661f4a69 100644 (file)
--- a/pimd/pim_rp.c
+++ b/pimd/pim_rp.c
@@ -592,8 +592,7 @@ int pim_rp_new(struct pim_instance *pim, pim_addr rp_addr, struct prefix group,
                                        }
 
                                        result = pim_rp_change(
-                                               pim,
-                                               rp_info->rp.rpf_addr.u.prefix4,
+                                               pim, rp_addr,
                                                tmp_rp_info->group,
                                                rp_src_flag);
                                        XFREE(MTYPE_PIM_RP, rp_info);
@@ -839,7 +838,7 @@ int pim_rp_del(struct pim_instance *pim, struct in_addr rp_addr,
        return PIM_SUCCESS;
 }
 
-int pim_rp_change(struct pim_instance *pim, struct in_addr new_rp_addr,
+int pim_rp_change(struct pim_instance *pim, pim_addr new_rp_addr,
                  struct prefix group, enum rp_source rp_src_flag)
 {
        struct prefix nht_p;
@@ -848,6 +847,7 @@ int pim_rp_change(struct pim_instance *pim, struct in_addr new_rp_addr,
        struct rp_info *rp_info = NULL;
        struct pim_upstream *up;
        bool upstream_updated = false;
+       pim_addr old_rp_addr;
 
        rn = route_node_lookup(pim->rp_table, &group);
        if (!rn) {
@@ -863,7 +863,8 @@ int pim_rp_change(struct pim_instance *pim, struct in_addr new_rp_addr,
                return result;
        }
 
-       if (rp_info->rp.rpf_addr.u.prefix4.s_addr == new_rp_addr.s_addr) {
+       old_rp_addr = pim_addr_from_prefix(&rp_info->rp.rpf_addr);
+       if (!pim_addr_cmp(new_rp_addr, old_rp_addr)) {
                if (rp_info->rp_src != rp_src_flag) {
                        rp_info->rp_src = rp_src_flag;
                        route_unlock_node(rn);
@@ -871,12 +872,13 @@ int pim_rp_change(struct pim_instance *pim, struct in_addr new_rp_addr,
                }
        }
 
-       nht_p.family = AF_INET;
-       nht_p.prefixlen = IPV4_MAX_BITLEN;
+       nht_p.family = PIM_AF;
+       nht_p.prefixlen = PIM_MAX_BITLEN;
 
        /* Deregister old RP addr with Zebra NHT */
-       if (rp_info->rp.rpf_addr.u.prefix4.s_addr != INADDR_ANY) {
-               nht_p.u.prefix4 = rp_info->rp.rpf_addr.u.prefix4;
+
+       if (!pim_addr_is_any(old_rp_addr)) {
+               nht_p = rp_info->rp.rpf_addr;
                if (PIM_DEBUG_PIM_NHT_RP)
                        zlog_debug("%s: Deregister RP addr %pFX with Zebra ",
                                   __func__, &nht_p);
@@ -886,7 +888,8 @@ int pim_rp_change(struct pim_instance *pim, struct in_addr new_rp_addr,
        pim_rp_nexthop_del(rp_info);
        listnode_delete(pim->rp_list, rp_info);
        /* Update the new RP address*/
-       rp_info->rp.rpf_addr.u.prefix4 = new_rp_addr;
+
+       pim_addr_to_prefix(&rp_info->rp.rpf_addr, new_rp_addr);
        rp_info->rp_src = rp_src_flag;
        rp_info->i_am_rp = 0;
 
@@ -911,7 +914,7 @@ int pim_rp_change(struct pim_instance *pim, struct in_addr new_rp_addr,
                pim_zebra_update_all_interfaces(pim);
 
        /* Register new RP addr with Zebra NHT */
-       nht_p.u.prefix4 = rp_info->rp.rpf_addr.u.prefix4;
+       nht_p = rp_info->rp.rpf_addr;
        if (PIM_DEBUG_PIM_NHT_RP)
                zlog_debug("%s: NHT Register RP addr %pFX grp %pFX with Zebra ",
                           __func__, &nht_p, &rp_info->group);

diff --git a/pimd/pim_rp.h b/pimd/pim_rp.h
index a63295209f855724055c1feb43589e2319814b46..bc12273a2affd883e97f99d53ac74de0d1e33785 100644 (file)
--- a/pimd/pim_rp.h
+++ b/pimd/pim_rp.h
@@ -54,7 +54,7 @@ void pim_rp_del_config(struct pim_instance *pim, pim_addr rp_addr,
 int pim_rp_del(struct pim_instance *pim, struct in_addr rp_addr,
               struct prefix group, const char *plist,
               enum rp_source rp_src_flag);
-int pim_rp_change(struct pim_instance *pim, struct in_addr new_rp_addr,
+int pim_rp_change(struct pim_instance *pim, pim_addr new_rp_addr,
                  struct prefix group, enum rp_source rp_src_flag);
 void pim_rp_prefix_list_update(struct pim_instance *pim,
                               struct prefix_list *plist);