From 01ecd3517eddf1327748b7bf83dbae85dbc08f2a Mon Sep 17 00:00:00 2001 From: Simon Goldschmidt Date: Tue, 25 Feb 2014 22:21:31 +0100 Subject: [PATCH] fixed bug #39145 IGMP membership report for 224.0.0.1 -> ensure that we never send a report for 224.0.0.1 --- CHANGELOG | 5 ++++- src/core/ipv4/igmp.c | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index d646560e..90cb7769 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -96,7 +96,10 @@ HISTORY ++ Bugfixes: - 2014-02-22: Simon Goldschmidt (patch by Amir Shalem) + 2014-02-25: Simon Goldschmidt + * igmp.c: fixed bug #39145 IGMP membership report for 224.0.0.1 + + 2014-02-22: Simon Goldschmidt (patch by Amir Shalem) * etharp.c, opt.h: fixed bug #34681 Limit ARP queue length by ARP_QUEUE_LEN (=3) 2014-02-22: Simon Goldschmidt (patch by Amir Shalem) diff --git a/src/core/ipv4/igmp.c b/src/core/ipv4/igmp.c index 107c0e9a..2e79f545 100644 --- a/src/core/ipv4/igmp.c +++ b/src/core/ipv4/igmp.c @@ -271,7 +271,7 @@ igmp_report_groups(struct netif *netif) LWIP_DEBUGF(IGMP_DEBUG, ("igmp_report_groups: sending IGMP reports on if %p\n", netif)); while (group != NULL) { - if (group->netif == netif) { + if ((group->netif == netif) && (!(ip_addr_cmp(&(group->group_address), &allsystems)))) { igmp_delaying_member(group, IGMP_JOIN_DELAYING_MEMBER_TMR); } group = group->next; @@ -674,8 +674,10 @@ igmp_tmr(void) static void igmp_timeout(struct igmp_group *group) { - /* If the state is IGMP_GROUP_DELAYING_MEMBER then we send a report for this group */ - if (group->group_state == IGMP_GROUP_DELAYING_MEMBER) { + /* If the state is IGMP_GROUP_DELAYING_MEMBER then we send a report for this group + (unless it is the allsystems group) */ + if ((group->group_state == IGMP_GROUP_DELAYING_MEMBER) && + (!(ip_addr_cmp(&(group->group_address), &allsystems)))) { LWIP_DEBUGF(IGMP_DEBUG, ("igmp_timeout: report membership for group with address ")); ip_addr_debug_print(IGMP_DEBUG, &(group->group_address)); LWIP_DEBUGF(IGMP_DEBUG, (" on if %p\n", group->netif));