Skip to content
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

Adds bugfix for lwip multicast group commands #20136

Merged
merged 9 commits into from
Jul 8, 2022
Merged

Adds bugfix for lwip multicast group commands #20136

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c5f3eb0
Adds fix for IPV6 multicast
rosahay-silabs Jun 29, 2022
841e563
Revert LwIP options
rosahay-silabs Jun 30, 2022
b710538
Adds fix for warning on ESP32 toolchain
rosahay-silabs Jun 30, 2022
087af03
Adds changes to incorporate InterfaceId:Null() for LWIP
rosahay-silabs Jul 6, 2022
0aea364
Merge branch 'master' into bugfix/lwip-group-multicast
andy31415 Jul 7, 2022
2fa93f8
Add IPv4 support for non-interface join/leave group
andy31415 Jul 7, 2022
09f1fd4
Fix some typos - compile tested with esp32
andy31415 Jul 7, 2022
a5eaff9
Merge branch 'master' into bugfix/lwip-group-multicast
andy31415 Jul 7, 2022
997d148
Reformat code for readability and consistency
andy31415 Jul 7, 2022
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
41 changes: 30 additions & 11 deletions src/inet/UDPEndPointImplLwIP.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -410,13 +410,24 @@ CHIP_ERROR UDPEndPointImplLwIP::SetMulticastLoopback(IPVersion aIPVersion, bool
CHIP_ERROR UDPEndPointImplLwIP::IPv4JoinLeaveMulticastGroupImpl(InterfaceId aInterfaceId, const IPAddress & aAddress, bool join)
{
#if LWIP_IPV4 && LWIP_IGMP
const auto method = join ? igmp_joingroup_netif : igmp_leavegroup_netif;
const ip4_addr_t lIPv4Address = aAddress.ToIPv4();
err_t lStatus;

struct netif * const lNetif = FindNetifFromInterfaceId(aInterfaceId);
VerifyOrReturnError(lNetif != nullptr, INET_ERROR_UNKNOWN_INTERFACE);
if (aInterfaceId.IsPresent())
{

struct netif * const lNetif = FindNetifFromInterfaceId(aInterfaceId);
VerifyOrReturnError(lNetif != nullptr, INET_ERROR_UNKNOWN_INTERFACE);

lStatus = join ? igmp_joingroup_netif(lNetif, &lIPv4Address) //
: igmp_leavegroup_netif(lNetif, &lIPv4Address);
}
else
{
lStatus = join ? igmp_joingroup(IP4_ADDR_ANY4, &lIPv4Address) //
: igmp_leavegroup(IP4_ADDR_ANY4, &lIPv4Address);
}

const ip4_addr_t lIPv4Address = aAddress.ToIPv4();
const err_t lStatus = method(lNetif, &lIPv4Address);
if (lStatus == ERR_MEM)
{
return CHIP_ERROR_NO_MEMORY;
Expand All @@ -431,13 +442,21 @@ CHIP_ERROR UDPEndPointImplLwIP::IPv4JoinLeaveMulticastGroupImpl(InterfaceId aInt
CHIP_ERROR UDPEndPointImplLwIP::IPv6JoinLeaveMulticastGroupImpl(InterfaceId aInterfaceId, const IPAddress & aAddress, bool join)
{
#ifdef HAVE_IPV6_MULTICAST
const auto method = join ? mld6_joingroup_netif : mld6_leavegroup_netif;

struct netif * const lNetif = FindNetifFromInterfaceId(aInterfaceId);
VerifyOrReturnError(lNetif != nullptr, INET_ERROR_UNKNOWN_INTERFACE);

const ip6_addr_t lIPv6Address = aAddress.ToIPv6();
const err_t lStatus = method(lNetif, &lIPv6Address);
err_t lStatus;
andy31415 marked this conversation as resolved.
Show resolved Hide resolved
if (aInterfaceId.IsPresent())
{
struct netif * const lNetif = FindNetifFromInterfaceId(aInterfaceId);
VerifyOrReturnError(lNetif != nullptr, INET_ERROR_UNKNOWN_INTERFACE);
lStatus = join ? mld6_joingroup_netif(lNetif, &lIPv6Address) //
: mld6_leavegroup_netif(lNetif, &lIPv6Address);
}
else
{
lStatus = join ? mld6_joingroup(IP6_ADDR_ANY6, &lIPv6Address) //
: mld6_leavegroup(IP6_ADDR_ANY6, &lIPv6Address);
}

if (lStatus == ERR_MEM)
{
return CHIP_ERROR_NO_MEMORY;
Expand Down