Mirror/frr
0
0
Fork 1
mirror of https://github.com/FRRouting/frr.git synced 2025-04-30 13:37:17 +02:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge pull request #13020 from SaiGomathiN/2462808-3

Browse source 
pimd: PIM not sending register packets after changing from non DR to DR
This commit is contained in:
Donald Sharp 2023-05-02 11:55:34 -04:00 committed by GitHub
parent 99a1ab0b21 1c883aef96
commit f7a775a78e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
pimd/pim_neighbor.c
View file

@ -29,6 +29,7 @@
#include "pim_jp_agg.h" #include "pim_jp_agg.h"
#include "pim_bfd.h" #include "pim_bfd.h"
#include "pim_register.h" #include "pim_register.h"
#include "pim_oil.h"
static void dr_election_by_addr(struct interface *ifp) static void dr_election_by_addr(struct interface *ifp)
{ {
@ -123,9 +124,10 @@ int pim_if_dr_election(struct interface *ifp)
pim_if_update_could_assert(ifp); pim_if_update_could_assert(ifp);
pim_if_update_assert_tracking_desired(ifp); pim_if_update_assert_tracking_desired(ifp);
if (PIM_I_am_DR(pim_ifp)) if (PIM_I_am_DR(pim_ifp)) {
pim_ifp->am_i_dr = true; pim_ifp->am_i_dr = true;
else { pim_clear_nocache_state(pim_ifp);
} else {
if (pim_ifp->am_i_dr == true) { if (pim_ifp->am_i_dr == true) {
pim_reg_del_on_couldreg_fail(ifp); pim_reg_del_on_couldreg_fail(ifp);
pim_ifp->am_i_dr = false; pim_ifp->am_i_dr = false;

25
pimd/pim_oil.c
View file

@ -149,6 +149,31 @@ struct channel_oil *pim_channel_oil_add(struct pim_instance *pim,
return c_oil; return c_oil;
} }
/*
* Clean up mroute and channel oil created for dropping pkts from directly
* connected source when the interface was non DR.
*/
void pim_clear_nocache_state(struct pim_interface *pim_ifp)
{
struct channel_oil *c_oil;
frr_each_safe (rb_pim_oil, &pim_ifp->pim->channel_oil_head, c_oil) {
if ((!c_oil->up) ||
!(PIM_UPSTREAM_FLAG_TEST_SRC_NOCACHE(c_oil->up->flags)))
continue;
if (*oil_parent(c_oil) != pim_ifp->mroute_vif_index)
continue;
THREAD_OFF(c_oil->up->t_ka_timer);
PIM_UPSTREAM_FLAG_UNSET_SRC_NOCACHE(c_oil->up->flags);
PIM_UPSTREAM_FLAG_UNSET_SRC_STREAM(c_oil->up->flags);
pim_upstream_del(pim_ifp->pim, c_oil->up, __func__);
}
}
struct channel_oil *pim_channel_oil_del(struct channel_oil *c_oil, struct channel_oil *pim_channel_oil_del(struct channel_oil *c_oil,
const char *name) const char *name)
{ {

1
pimd/pim_oil.h
View file

@ -182,6 +182,7 @@ struct channel_oil *pim_find_channel_oil(struct pim_instance *pim,
pim_sgaddr *sg); pim_sgaddr *sg);
struct channel_oil *pim_channel_oil_add(struct pim_instance *pim, struct channel_oil *pim_channel_oil_add(struct pim_instance *pim,
pim_sgaddr *sg, const char *name); pim_sgaddr *sg, const char *name);
void pim_clear_nocache_state(struct pim_interface *pim_ifp);
struct channel_oil *pim_channel_oil_del(struct channel_oil *c_oil, struct channel_oil *pim_channel_oil_del(struct channel_oil *c_oil,
const char *name); const char *name);