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

pimd: start fix of inherited_olist

Browse source 
We were not correctly determing the inherited olist and
applying it to the s,g.

Start the work to do this.

Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2016-07-23 03:47:15 -04:00 committed by Donald Sharp
parent 7a60249e36
commit 4fdc8f3630
3 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pimd/pim_register.c
View file

@ -257,7 +257,6 @@ pim_register_recv (struct interface *ifp,
return 0; return 0;
} }
#define inherited_olist(S,G) NULL
/* /*
* Please note this is not drawn to get the correct bit/data size * Please note this is not drawn to get the correct bit/data size
* *
@ -322,7 +321,7 @@ pim_register_recv (struct interface *ifp,
if ((upstream->sptbit == PIM_UPSTREAM_SPTBIT_TRUE) || if ((upstream->sptbit == PIM_UPSTREAM_SPTBIT_TRUE) ||
((SwitchToSptDesired(&sg)) && ((SwitchToSptDesired(&sg)) &&
(inherited_olist(source, group) == NULL))) { pim_upstream_inherited_olist (upstream) == 0)) {
pim_register_stop_send (ifp, &sg, src_addr); pim_register_stop_send (ifp, &sg, src_addr);
sentRegisterStop = 1; sentRegisterStop = 1;
} }

12
pimd/pim_upstream.c
View file

@ -849,3 +849,15 @@ pim_upstream_start_register_stop_timer (struct pim_upstream *up, int null_regist
pim_upstream_register_stop_timer, pim_upstream_register_stop_timer,
up, time); up, time);
} }
/*
* For a given upstream, determine the inherited_olist
* and apply it.
* return 1 if there are any output interfaces
* return 0 if there are not any output interfaces
*/
int
pim_upstream_inherited_olist (struct pim_upstream *up)
{
return 0;
}

2
pimd/pim_upstream.h
View file

@ -156,4 +156,6 @@ void pim_upstream_send_join (struct pim_upstream *up);
void pim_upstream_switch (struct pim_upstream *up, enum pim_upstream_state new_state); void pim_upstream_switch (struct pim_upstream *up, enum pim_upstream_state new_state);
const char *pim_upstream_state2str (struct pim_upstream *up); const char *pim_upstream_state2str (struct pim_upstream *up);
int pim_upstream_inherited_olist (struct pim_upstream *up);
#endif /* PIM_UPSTREAM_H */ #endif /* PIM_UPSTREAM_H */