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_ifchannel.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_ifchannel.h')
| -rw-r--r-- | pimd/pim_ifchannel.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pimd/pim_ifchannel.h b/pimd/pim_ifchannel.h index 2260fd451..3fd717bec 100644 --- a/pimd/pim_ifchannel.h +++ b/pimd/pim_ifchannel.h @@ -116,7 +116,8 @@ void pim_ifchannel_delete_on_noinfo(struct interface *ifp); struct pim_ifchannel *pim_ifchannel_find(struct interface *ifp, struct prefix_sg *sg); struct pim_ifchannel *pim_ifchannel_add(struct interface *ifp, - struct prefix_sg *sg, int flags); + struct prefix_sg *sg, uint8_t ch_flags, + int up_flags); void pim_ifchannel_join_add(struct interface *ifp, struct in_addr neigh_addr, struct in_addr upstream, struct prefix_sg *sg, uint8_t source_flags, uint16_t holdtime); |