michaelh/zephyr
1
0
Fork 0
Code Releases Activity

net: ip: Fixed IGMP V2 membership report destination address.

Browse source 
As per RFC 2236 Section 9, the IGMP V2 membership reports should be sent
to the group multicast address being reported. Without this fix, when
IGMP snooping is enabled on a network a device is not able to receive
multicast from certain multicast addresses e.g. 239.255.x.x.

Fixes #52449

Signed-off-by: Chamira Perera <chamira.perera@audinate.com>
This commit is contained in:
Chamira Perera 2022-11-23 14:09:49 +11:00 • committed by Carles Cufí
commit 67db7d07f2
1 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

15
subsys/net/ip/igmp.c
View file

@ -152,10 +152,10 @@ static int send_igmp_report(struct net_if *iface,
return -ENOMEM; return -ENOMEM;
} }
/* TODO: send to arbitrary group address instead of /* Send the IGMP V2 membership report to the group multicast
* all_routers * address, as per RFC 2236 Section 9.
*/ */
ret = igmp_v2_create_packet(pkt, &all_routers, ret = igmp_v2_create_packet(pkt, &ipv4->mcast[i].address.in_addr,
&ipv4->mcast[i].address.in_addr, &ipv4->mcast[i].address.in_addr,
NET_IPV4_IGMP_REPORT_V2); NET_IPV4_IGMP_REPORT_V2);
if (ret < 0) { if (ret < 0) {
@ -242,8 +242,13 @@ static int igmp_send_generic(struct net_if *iface,
return -ENOMEM; return -ENOMEM;
} }
ret = igmp_v2_create_packet(pkt, &all_routers, addr, /* Send the IGMP V2 membership report to the group multicast
join ? NET_IPV4_IGMP_REPORT_V2 : NET_IPV4_IGMP_LEAVE); * address, as per RFC 2236 Section 9. The leave report
* should be sent to the ALL ROUTERS multicast address (224.0.0.2)
*/
ret = igmp_v2_create_packet(pkt,
join ? addr : &all_routers, addr,
join ? NET_IPV4_IGMP_REPORT_V2 : NET_IPV4_IGMP_LEAVE);
if (ret < 0) { if (ret < 0) {
goto drop; goto drop;
} }