diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-06-22 17:05:03 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2017-07-24 19:51:40 +0200 |
| commit | 0885a9f1f4352996d95766b69fc29e464adee01c (patch) | |
| tree | 93cca0199ebd05321ecc31928f5c43eed9a6f89a /pimd/pim_upstream.h | |
| parent | pimd: display down ports show ip pim interface (diff) | |
| download | frr-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_upstream.h')
| -rw-r--r-- | pimd/pim_upstream.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pimd/pim_upstream.h b/pimd/pim_upstream.h index b261b8cba..af4af2a36 100644 --- a/pimd/pim_upstream.h +++ b/pimd/pim_upstream.h @@ -146,7 +146,8 @@ struct pim_upstream *pim_upstream_find_or_add(struct prefix_sg *sg, struct pim_upstream *pim_upstream_add(struct pim_instance *pim, struct prefix_sg *sg, struct interface *ifp, int flags, - const char *name); + const char *name, + struct pim_ifchannel *ch); void pim_upstream_ref(struct pim_upstream *up, int flags, const char *name); struct pim_upstream *pim_upstream_del(struct pim_instance *pim, struct pim_upstream *up, |