Skip to content

{bp-19436} fix(net/igmp): restore General Query handling broken by pointer compare #19619

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoxiang781216 merged 1 commit into from
Aug 3, 2026
Merged

{bp-19436} fix(net/igmp): restore General Query handling broken by pointer compare #19619

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 11 additions & 5 deletions net/igmp/igmp_input.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,13 @@ void igmp_input(struct net_driver_s *dev)
* receivers.
*/

/* The group address lies in the IGMP header where it is stored as
* an unaligned uint16_t[2] in network order. Convert it to an
* in_addr_t before it is used in any comparison.
*/

grpaddr = net_ip4addr_conv32(igmp->grpaddr);

/* Check if the query was sent to all systems */

if (net_ipv4addr_cmp(destipaddr, g_ipv4_allsystems))
Expand All @@ -195,7 +202,7 @@ void igmp_input(struct net_driver_s *dev)
* Query."
*/

if (net_ipv4addr_cmp(igmp->grpaddr, INADDR_ANY) != 0)
if (net_ipv4addr_cmp(grpaddr, INADDR_ANY))
{
FAR struct igmp_group_s *member;

Expand Down Expand Up @@ -230,7 +237,7 @@ void igmp_input(struct net_driver_s *dev)
}
}
}
else /* if (net_ipv4addr_cmp(igmp->grpaddr, INADDR_ANY) == 0) */
else /* if (!net_ipv4addr_cmp(grpaddr, INADDR_ANY)) */
{
ninfo("Group-specific multicast query\n");

Expand All @@ -240,8 +247,7 @@ void igmp_input(struct net_driver_s *dev)

IGMP_STATINCR(g_netstats.igmp.ucast_query);

grpaddr = net_ip4addr_conv32(igmp->grpaddr);
group = igmp_grpallocfind(dev, &grpaddr);
group = igmp_grpallocfind(dev, &grpaddr);

if (group != NULL)
{
Expand All @@ -259,7 +265,7 @@ void igmp_input(struct net_driver_s *dev)

/* Not sent to all systems -- Unicast query */

else if (net_ipv4addr_cmp(igmp->grpaddr, INADDR_ANY) == 0)
else if (!net_ipv4addr_cmp(grpaddr, INADDR_ANY))
{
ninfo("Unicast query\n");
IGMP_STATINCR(g_netstats.igmp.ucast_query);
Expand Down
Loading