diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-05-19 16:41:25 -0400 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-07-24 13:51:35 -0400 |
| commit | fec883d95a64c37a9d0cb728085c816ff7188874 (patch) | |
| tree | b13d0a701ae0a337178848b0ae0015be1f70e7d2 /pimd/pim_register.c | |
| parent | 25b787a28780e33da3afef6130589dbe8fa3c243 (diff) | |
pimd: pim_rp.c -> convert pimg to pim
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_register.c')
| -rw-r--r-- | pimd/pim_register.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/pimd/pim_register.c b/pimd/pim_register.c index 3d783923de..a9c1ab9137 100644 --- a/pimd/pim_register.c +++ b/pimd/pim_register.c @@ -270,10 +270,13 @@ int pim_register_recv(struct interface *ifp, struct in_addr dest_addr, int i_am_rp = 0; struct pim_interface *pim_ifp = NULL; + pim_ifp = ifp->info; + #define PIM_MSG_REGISTER_BIT_RESERVED_LEN 4 ip_hdr = (struct ip *)(tlv_buf + PIM_MSG_REGISTER_BIT_RESERVED_LEN); - if (!pim_rp_check_is_my_ip_address(ip_hdr->ip_dst, dest_addr)) { + if (!pim_rp_check_is_my_ip_address(pim_ifp->pim, ip_hdr->ip_dst, + dest_addr)) { if (PIM_DEBUG_PIM_REG) { char dest[INET_ADDRSTRLEN]; @@ -285,8 +288,6 @@ int pim_register_recv(struct interface *ifp, struct in_addr dest_addr, return 0; } - pim_ifp = ifp->info; - zassert(pim_ifp); ++pim_ifp->pim_ifstat_reg_recv; /* @@ -330,8 +331,9 @@ int pim_register_recv(struct interface *ifp, struct in_addr dest_addr, pim_str_sg_dump(&sg), src_str, ifp->name, i_am_rp); } - if (i_am_rp && (dest_addr.s_addr - == ((RP(sg.grp))->rpf_addr.u.prefix4.s_addr))) { + if (i_am_rp + && (dest_addr.s_addr + == ((RP(pim_ifp->pim, sg.grp))->rpf_addr.u.prefix4.s_addr))) { sentRegisterStop = 0; if (*bits & PIM_REGISTER_BORDER_BIT) { |