matthieu/frr
1
0
Fork 0
forked from Mirror/frr
Code Pull requests Activity

pimd: Stop leaving pim_register_recv early

Browse source 
When we received a pim_register_recv we were shortcutting
the algorithm to determine what to do when we receive
a register pim message.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2016-07-23 03:36:25 -04:00 committed by Donald Sharp
parent a3b58b4a14
commit 7a60249e36
1 changed files with 0 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pimd/pim_register.c
View file

@ -320,12 +320,6 @@ pim_register_recv (struct interface *ifp,
pim_upstream_switch (upstream, PIM_UPSTREAM_PRUNE); pim_upstream_switch (upstream, PIM_UPSTREAM_PRUNE);
} }
if (upstream->join_state == PIM_UPSTREAM_PRUNE)
{
pim_register_stop_send (ifp, &sg, src_addr);
return 1;
}
if ((upstream->sptbit == PIM_UPSTREAM_SPTBIT_TRUE) || if ((upstream->sptbit == PIM_UPSTREAM_SPTBIT_TRUE) ||
((SwitchToSptDesired(&sg)) && ((SwitchToSptDesired(&sg)) &&
(inherited_olist(source, group) == NULL))) { (inherited_olist(source, group) == NULL))) {