mirror/lwip
1
0
Fork 0
mirror of https://github.com/lwip-tcpip/lwip.git synced 2024-12-26 03:16:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use netconn_join_leave_group_netif() in sockets.c, lwip_socket_drop_registered_mld6_memberships to avoid threading issues (reported by Joel Cunningham)

Browse Source
This commit is contained in:
Dirk Ziegelmeier 2017-08-21 09:43:34 +02:00
parent f457769fe8
commit 6082251854
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/api/sockets.c
View File

@ -267,7 +267,7 @@ struct lwip_socket_multicast_mld6_pair {
/** the socket */ /** the socket */
struct lwip_sock* sock; struct lwip_sock* sock;
/** the interface index */ /** the interface index */
unsigned int if_idx; u8_t if_idx;
/** the group address */ /** the group address */
ip6_addr_t multi_addr; ip6_addr_t multi_addr;
}; };
@ -3638,7 +3638,7 @@ lwip_socket_register_mld6_membership(int s, unsigned int if_idx, const ip6_addr_
for (i = 0; i < LWIP_SOCKET_MAX_MEMBERSHIPS; i++) { for (i = 0; i < LWIP_SOCKET_MAX_MEMBERSHIPS; i++) {
if (socket_ipv6_multicast_memberships[i].sock == NULL) { if (socket_ipv6_multicast_memberships[i].sock == NULL) {
socket_ipv6_multicast_memberships[i].sock = sock; socket_ipv6_multicast_memberships[i].sock = sock;
socket_ipv6_multicast_memberships[i].if_idx = if_idx; socket_ipv6_multicast_memberships[i].if_idx = (u8_t)if_idx;
ip6_addr_copy(socket_ipv6_multicast_memberships[i].multi_addr, *multi_addr); ip6_addr_copy(socket_ipv6_multicast_memberships[i].multi_addr, *multi_addr);
done_socket(sock); done_socket(sock);
return 1; return 1;
@ -3693,17 +3693,12 @@ lwip_socket_drop_registered_mld6_memberships(int s)
for (i = 0; i < LWIP_SOCKET_MAX_MEMBERSHIPS; i++) { for (i = 0; i < LWIP_SOCKET_MAX_MEMBERSHIPS; i++) {
if (socket_ipv6_multicast_memberships[i].sock == sock) { if (socket_ipv6_multicast_memberships[i].sock == sock) {
ip_addr_t multi_addr; ip_addr_t multi_addr;
struct netif *netif;
ip_addr_copy_from_ip6(multi_addr, socket_ipv6_multicast_memberships[i].multi_addr); ip_addr_copy_from_ip6(multi_addr, socket_ipv6_multicast_memberships[i].multi_addr);
netif = netif_get_by_index((u8_t)socket_ipv6_multicast_memberships[i].if_idx);
socket_ipv6_multicast_memberships[i].sock = NULL; socket_ipv6_multicast_memberships[i].sock = NULL;
socket_ipv6_multicast_memberships[i].if_idx = NETIF_NO_INDEX; socket_ipv6_multicast_memberships[i].if_idx = NETIF_NO_INDEX;
ip6_addr_set_zero(&socket_ipv6_multicast_memberships[i].multi_addr); ip6_addr_set_zero(&socket_ipv6_multicast_memberships[i].multi_addr);
if (netif == NULL) { netconn_join_leave_group_netif(sock->conn, &multi_addr, socket_ipv6_multicast_memberships[i].if_idx, NETCONN_LEAVE);
return;
}
/* fixme: need netconn_join_leave_group that takes netif as argument */
netconn_join_leave_group(sock->conn, &multi_addr, netif_ip_addr6(netif, 0), NETCONN_LEAVE);
} }
} }
done_socket(sock); done_socket(sock);