Merge pull request #11667 from sathishm6/pr/ipv6-multi-cast-join-fix

0xc0170 · web-flow · commit 7522f9c34839 · 2019-10-15T13:15:43.000+08:00
Fixes IPv6 multicast join issue
diff --git a/features/lwipstack/LWIPStack.cpp b/features/lwipstack/LWIPStack.cpp
@@ -560,13 +560,14 @@ nsapi_error_t LWIP::setsockopt(nsapi_socket_t handle, int level, int optname, co
                 return NSAPI_ERROR_PARAMETER;
             }
 
-            /* Convert the interface address, or make sure it's the correct sort of "any" */
             if (imr->imr_interface.version != NSAPI_UNSPEC) {
+                /* Convert the interface address */
                 if (!convert_mbed_addr_to_lwip(&if_addr, &imr->imr_interface)) {
                     return NSAPI_ERROR_PARAMETER;
                 }
             } else {
-                ip_addr_set_any(IP_IS_V6(&if_addr), &if_addr);
+                /* Set interface address to "any", matching the group address type */
+                ip_addr_set_any(IP_IS_V6(&multi_addr), &if_addr);
             }
 
             igmp_err = ERR_USE; // Maps to NSAPI_ERROR_UNSUPPORTED

Original file line number	Diff line number	Diff line change
`@@ -560,13 +560,14 @@ nsapi_error_t LWIP::setsockopt(nsapi_socket_t handle, int level, int optname, co`
`560`	`560`	`return NSAPI_ERROR_PARAMETER;`
`561`	`561`	`}`
`562`	`562`
`563`		`- /* Convert the interface address, or make sure it's the correct sort of "any" */`
`564`	`563`	`if (imr->imr_interface.version != NSAPI_UNSPEC) {`
	`564`	`+ /* Convert the interface address */`
`565`	`565`	`if (!convert_mbed_addr_to_lwip(&if_addr, &imr->imr_interface)) {`
`566`	`566`	`return NSAPI_ERROR_PARAMETER;`
`567`	`567`	`}`
`568`	`568`	`} else {`
`569`		`- ip_addr_set_any(IP_IS_V6(&if_addr), &if_addr);`
	`569`	`+ /* Set interface address to "any", matching the group address type */`
	`570`	`+ ip_addr_set_any(IP_IS_V6(&multi_addr), &if_addr);`
`570`	`571`	`}`
`571`	`572`
`572`	`573`	`igmp_err = ERR_USE; // Maps to NSAPI_ERROR_UNSUPPORTED`