proxmox-mirrors/mirror_frr
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_frr synced 2025-08-14 02:53:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pimd: IGMPv3 leave not deleting group entry

Browse Source 
After sending a IGMPv3 exclude report for a multicast address
with 0 sources, send an include report for the same group and also 0
sources.  This should cause IGMP to GS query and age/delete
the entry.

This fix addresses this issue.

Ticket: CM-11685
Signed-off-by: Donald Sharp <sharpd@cumulusnetworks.com>
This commit is contained in:
Donald Sharp 2016-07-11 15:54:37 -04:00
parent d4dc41b6a2
commit 60b1960ff7
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pimd/pim_igmpv3.c
View File

@ -543,6 +543,7 @@ static void allow(struct igmp_sock *igmp, struct in_addr from,
struct in_addr group_addr, struct in_addr group_addr,
int num_sources, struct in_addr *sources) int num_sources, struct in_addr *sources)
{ {
struct igmp_source *source;
struct igmp_group *group; struct igmp_group *group;
int i; int i;
@ -554,7 +555,6 @@ static void allow(struct igmp_sock *igmp, struct in_addr from,
/* scan received sources */ /* scan received sources */
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;
@ -577,6 +577,17 @@ static void allow(struct igmp_sock *igmp, struct in_addr from,
igmp_source_reset_gmi(igmp, group, source); igmp_source_reset_gmi(igmp, group, source);
} /* scan received sources */ } /* scan received sources */
if ((num_sources == 0) &&
(group->group_filtermode_isexcl) &&
(listcount (group->group_source_list) == 1))
{
struct in_addr star = { .s_addr = INADDR_ANY };
source = igmp_find_source_by_addr (group, star);
if (source)
igmp_source_reset_gmi (igmp, group, source);
}
} }
void igmpv3_report_isin(struct igmp_sock *igmp, struct in_addr from, void igmpv3_report_isin(struct igmp_sock *igmp, struct in_addr from,