summaryrefslogtreecommitdiffstats
path: root/pimd/pim_join.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetwroks.com>2016-09-02 18:17:10 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2016-12-22 02:26:08 +0100
commit63c59d0c9ae695bd7d8f33e570eb1bf7f6729b4e (patch)
tree1516e0220456b713922d651e38ff7104397857cd /pimd/pim_join.c
parentpimd: Use Quagga as official bug report place (diff)
downloadfrr-63c59d0c9ae695bd7d8f33e570eb1bf7f6729b4e.tar.xz
frr-63c59d0c9ae695bd7d8f33e570eb1bf7f6729b4e.zip
pimd: switch pim_rpf.h to use 'struct prefix' for address
mrib_nexthop_addr and rpf_addr should be 'struct prefix' so that we can safely handle unnumbered data from a nexthop lookup in zebra Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_join.c')
-rw-r--r--pimd/pim_join.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/pimd/pim_join.c b/pimd/pim_join.c
index 099245742..1f722e763 100644
--- a/pimd/pim_join.c
+++ b/pimd/pim_join.c
@@ -90,7 +90,7 @@ static void recv_join(struct interface *ifp,
* If the RP sent in the message is not
* our RP for the group, drop the message
*/
- if (sg.src.s_addr != rp->rpf_addr.s_addr)
+ if (sg.src.s_addr != rp->rpf_addr.u.prefix4.s_addr)
return;
sg.src.s_addr = INADDR_ANY;
@@ -162,7 +162,7 @@ static void recv_prune(struct interface *ifp,
struct pim_rpf *rp = RP (sg.grp);
// Ignoring Prune *,G's at the moment.
- if (sg.src.s_addr != rp->rpf_addr.s_addr)
+ if (sg.src.s_addr != rp->rpf_addr.u.prefix4.s_addr)
return;
sg.src.s_addr = INADDR_ANY;