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

pimd: Fix igmp isex_excl

Browse source 
When we receive an igmpv3 group report that has
an implied *,g make sure that we look at
the source for the g and handle it appropriately

Ticket: CM-11396
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2016-06-29 15:07:51 -04:00
parent d2ccd60b22
commit 539fba1a52
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pimd/pim_igmpv3.c
View file

@ -592,6 +592,7 @@ void igmpv3_report_isin(struct igmp_sock *igmp, struct in_addr from,
static void isex_excl(struct igmp_group *group, static void isex_excl(struct igmp_group *group,
int num_sources, struct in_addr *sources) int num_sources, struct in_addr *sources)
{ {
struct igmp_source *source;
int i; int i;
/* EXCLUDE mode */ /* EXCLUDE mode */
@ -602,7 +603,6 @@ static void isex_excl(struct igmp_group *group,
/* scan received sources (A) */ /* scan received sources (A) */
for (i = 0; i < num_sources; ++i) { for (i = 0; i < num_sources; ++i) {
struct igmp_source *source;
struct in_addr *src_addr; struct in_addr *src_addr;
src_addr = sources + i; src_addr = sources + i;
@ -627,6 +627,20 @@ static void isex_excl(struct igmp_group *group,
} /* scan received sources */ } /* scan received sources */
/*
* If we are in isexcl mode and num_sources == 0
* than that means we have a *,g entry that
* needs to be handled
*/
if (group->group_filtermode_isexcl && num_sources == 0)
{
struct in_addr star = { .s_addr = INADDR_ANY };
source = igmp_find_source_by_addr (group, star);
if (source)
IGMP_SOURCE_DONT_DELETE(source->source_flags);
igmp_source_reset_gmi (group->group_igmp_sock, group, source);
}
/* E.5: delete all sources marked with deletion flag: (X-A) and (Y-A) */ /* E.5: delete all sources marked with deletion flag: (X-A) and (Y-A) */
source_delete_by_flag(group->group_source_list); source_delete_by_flag(group->group_source_list);
} }