diff options
| author | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-06-29 21:07:51 +0200 |
|---|---|---|
| committer | Donald Sharp <sharpd@cumulusnetworks.com> | 2016-06-29 21:23:01 +0200 |
| commit | 539fba1a52eeb78de4cf6129d4d8ed0613a25e2c (patch) | |
| tree | d9e659c28704067178347560e3c697170de69b25 /pimd | |
| parent | pimd: Pass the appropriate data structure around (diff) | |
| download | frr-539fba1a52eeb78de4cf6129d4d8ed0613a25e2c.tar.xz frr-539fba1a52eeb78de4cf6129d4d8ed0613a25e2c.zip | |
pimd: Fix igmp isex_excl
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>
Diffstat (limited to 'pimd')
| -rw-r--r-- | pimd/pim_igmpv3.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/pimd/pim_igmpv3.c b/pimd/pim_igmpv3.c index 670054df5..d198ec92b 100644 --- a/pimd/pim_igmpv3.c +++ b/pimd/pim_igmpv3.c @@ -592,6 +592,7 @@ void igmpv3_report_isin(struct igmp_sock *igmp, struct in_addr from, static void isex_excl(struct igmp_group *group, int num_sources, struct in_addr *sources) { + struct igmp_source *source; int i; /* EXCLUDE mode */ @@ -602,7 +603,6 @@ static void isex_excl(struct igmp_group *group, /* scan received sources (A) */ for (i = 0; i < num_sources; ++i) { - struct igmp_source *source; struct in_addr *src_addr; src_addr = sources + i; @@ -627,6 +627,20 @@ static void isex_excl(struct igmp_group *group, } /* 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) */ source_delete_by_flag(group->group_source_list); } |