summaryrefslogtreecommitdiffstats
path: root/pimd/pim_assert.c
diff options
context:
space:
mode:
authorDonald Sharp <sharpd@cumulusnetworks.com>2017-06-22 17:05:03 +0200
committerDonald Sharp <sharpd@cumulusnetworks.com>2017-07-24 19:51:40 +0200
commit0885a9f1f4352996d95766b69fc29e464adee01c (patch)
tree93cca0199ebd05321ecc31928f5c43eed9a6f89a /pimd/pim_assert.c
parentpimd: display down ports show ip pim interface (diff)
downloadfrr-0885a9f1f4352996d95766b69fc29e464adee01c.tar.xz
frr-0885a9f1f4352996d95766b69fc29e464adee01c.zip
pimd: Fix code to not send joins when SGRPT Prune is received
When we receive a SGRPT Prune we were switching the upstream to JOINED and immediately sending a join. This was not the right thing to do. This was happening because we were making decisions about the new ifchannel before it was fully formed. Rework ifchannel startup to provide enough information to the pim upstream data structure to make the right decisions Ticket: CM-16425 Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
Diffstat (limited to 'pimd/pim_assert.c')
-rw-r--r--pimd/pim_assert.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/pimd/pim_assert.c b/pimd/pim_assert.c
index 6af52bbf4..934fea5a9 100644
--- a/pimd/pim_assert.c
+++ b/pimd/pim_assert.c
@@ -147,7 +147,7 @@ static int dispatch_assert(struct interface *ifp, struct in_addr source_addr,
memset(&sg, 0, sizeof(struct prefix_sg));
sg.src = source_addr;
sg.grp = group_addr;
- ch = pim_ifchannel_add(ifp, &sg, 0);
+ ch = pim_ifchannel_add(ifp, &sg, 0, 0);
if (!ch) {
zlog_warn(
"%s: (S,G)=%s failure creating channel on interface %s",