pimd: Handle rpf_addr in register send/recv

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

diff --git a/pimd/pim_register.c b/pimd/pim_register.c
index 8403340d861a39bb6b139f142d4779ed22bae8ac..0eb49a7f91a3962173e921348ef6e17d60b2135f 100644 (file)
--- a/pimd/pim_register.c
+++ b/pimd/pim_register.c
@@ -139,7 +139,6 @@ int pim_register_stop_recv(struct interface *ifp, uint8_t *buf, int buf_size)
        struct pim_instance *pim = pim_ifp->pim;
        struct pim_upstream *up = NULL;
        struct pim_rpf *rp;
-       pim_addr rpf_addr;
        pim_sgaddr sg;
        struct listnode *up_node;
        struct pim_upstream *child;
@@ -174,12 +173,11 @@ int pim_register_stop_recv(struct interface *ifp, uint8_t *buf, int buf_size)
 
        rp = RP(pim_ifp->pim, sg.grp);
        if (rp) {
-               rpf_addr = pim_addr_from_prefix(&rp->rpf_addr);
                /* As per RFC 7761, Section 4.9.4:
                 * A special wildcard value consisting of an address field of
                 * all zeros can be used to indicate any source.
                 */
-               if ((pim_addr_cmp(sg.src, rpf_addr) == 0) ||
+               if ((pim_addr_cmp(sg.src, rp->rpf_addr) == 0) ||
                    pim_addr_is_any(sg.src)) {
                        handling_star = true;
                        sg.src = PIMADDR_ANY;
@@ -284,11 +282,10 @@ void pim_register_send(const uint8_t *buf, int buf_size, pim_addr src,
        unsigned char *b1;
        struct pim_interface *pinfo;
        struct interface *ifp;
-       pim_addr dst = pim_addr_from_prefix(&rpg->rpf_addr);
 
        if (PIM_DEBUG_PIM_REG) {
                zlog_debug("Sending %s %sRegister Packet to %pPA", up->sg_str,
-                          null_register ? "NULL " : "", &dst);
+                          null_register ? "NULL " : "", &rpg->rpf_addr);
        }
 
        ifp = rpg->source_nexthop.interface;
@@ -310,7 +307,7 @@ void pim_register_send(const uint8_t *buf, int buf_size, pim_addr src,
        if (PIM_DEBUG_PIM_REG) {
                zlog_debug("%s: Sending %s %sRegister Packet to %pPA on %s",
                           __func__, up->sg_str, null_register ? "NULL " : "",
-                          &dst, ifp->name);
+                          &rpg->rpf_addr, ifp->name);
        }
 
        memset(buffer, 0, 10000);
@@ -327,13 +324,14 @@ void pim_register_send(const uint8_t *buf, int buf_size, pim_addr src,
         */
        src = pim_register_get_unicast_v6_addr(pinfo);
 #endif
-       pim_msg_build_header(src, dst, buffer, buf_size + PIM_MSG_REGISTER_LEN,
+       pim_msg_build_header(src, rpg->rpf_addr, buffer,
+                            buf_size + PIM_MSG_REGISTER_LEN,
                             PIM_MSG_TYPE_REGISTER, false);
 
        if (!pinfo->pim_passive_enable)
                ++pinfo->pim_ifstat_reg_send;
 
-       if (pim_msg_send(pinfo->pim_sock_fd, src, dst, buffer,
+       if (pim_msg_send(pinfo->pim_sock_fd, src, rpg->rpf_addr, buffer,
                         buf_size + PIM_MSG_REGISTER_LEN, ifp)) {
                if (PIM_DEBUG_PIM_TRACE) {
                        zlog_debug(
@@ -618,7 +616,7 @@ int pim_register_recv(struct interface *ifp, pim_addr dest_addr,
                }
        }
 
-       rp_addr = pim_addr_from_prefix(&(RP(pim, sg.grp))->rpf_addr);
+       rp_addr = (RP(pim, sg.grp))->rpf_addr;
        if (i_am_rp && (!pim_addr_cmp(dest_addr, rp_addr))) {
                sentRegisterStop = 0;