openthread: platform: Correct handling of closing sockets

In this commit, `net_socket_service_register` is called when a platform
module that has sockets is deinitialized, and it's socket/sockets are
closed.
This commit also handles a case when a module tries to join a multicast
group and a subscription, from another module, is already present.

Signed-off-by: Cristian Bulacu <cristian.bulacu@nxp.com>

Author: Cristib05

modules/openthread/platform/dhcp6_pd.c

@@ -163,6 +163,9 @@ static void dhcpv6_pd_client_socket_deinit(uint32_t infra_if_index)
 
 	sockfd_udp[0].fd = -1;
 	dhcpv6_pd_client_sock = -1;
+
+	net_socket_service_register(&dhcpv6_pd_client_udp_receive, sockfd_udp,
+				    ARRAY_SIZE(sockfd_udp), NULL);
 exit:
 	return;
 }

modules/openthread/platform/infra_if.c

@@ -35,6 +35,7 @@ static uint32_t ail_iface_index;
 static struct net_icmp_ctx ra_ctx;
 static struct net_icmp_ctx rs_ctx;
 static struct net_icmp_ctx na_ctx;
+static struct in6_addr mcast_addr;
 
 static void infra_if_handle_backbone_icmp6(struct otbr_msg_ctx *msg_ctx_ptr);
 static void handle_ra_from_ot(const uint8_t *buffer, uint16_t buffer_length);
@@ -133,13 +134,16 @@ otError otPlatGetInfraIfLinkLayerAddress(otInstance *aInstance, uint32_t aIfInde
 otError infra_if_init(otInstance *instance, struct net_if *ail_iface)
 {
 	otError error = OT_ERROR_NONE;
-	struct net_in6_addr addr = {0};
+	int ret;
 
 	ot_instance = instance;
 	ail_iface_ptr = ail_iface;
 	ail_iface_index = (uint32_t)net_if_get_by_iface(ail_iface_ptr);
-	net_ipv6_addr_create_ll_allrouters_mcast(&addr);
-	VerifyOrExit(net_ipv6_mld_join(ail_iface, &addr) == 0, error = OT_ERROR_FAILED);
+
+	net_ipv6_addr_create_ll_allrouters_mcast(&mcast_addr);
+	ret = net_ipv6_mld_join(ail_iface, &mcast_addr);
+
+	VerifyOrExit((ret == 0 || ret == -EALREADY), error = OT_ERROR_FAILED);
 
 	for (uint8_t i = 0; i < MAX_SERVICES; i++) {
 		sockfd_raw[i].fd = -1;
@@ -148,6 +152,22 @@ otError infra_if_init(otInstance *instance, struct net_if *ail_iface)
 	return error;
 }
 
+otError infra_if_deinit(void)
+{
+	otError error = OT_ERROR_NONE;
+
+	ot_instance = NULL;
+	ail_iface_index = 0;
+
+	VerifyOrExit(net_ipv6_mld_leave(ail_iface_ptr, &mcast_addr) == 0,
+		     error = OT_ERROR_FAILED);
+
+exit:
+	ail_iface_ptr = NULL;
+
+	return error;
+}
+
 static void handle_ra_from_ot(const uint8_t *buffer, uint16_t buffer_length)
 {
 	struct net_if *ot_iface = net_if_get_first_by_type(&NET_L2_GET_NAME(OPENTHREAD));

modules/openthread/platform/mdns_socket.c

@@ -20,6 +20,7 @@
 #include <zephyr/net/socket_service.h>
 #include <openthread/nat64.h>
 #include "sockets_internal.h"
+#include <errno.h>
 
 #define MULTICAST_PORT 5353
 #if defined(CONFIG_NET_IPV4) && defined(CONFIG_NET_IPV6)
@@ -108,6 +109,7 @@ static otError mdns_socket_init_v6(uint32_t ail_iface_idx)
 	struct net_ipv6_mreq mreq_v6 = {0};
 	int mcast_hops = 255;
 	int on = 1;
+	int mcast_join_ret = 0;
 
 	struct net_sockaddr_in6 addr = {.sin6_family = NET_AF_INET6,
 				    .sin6_port = net_htons(MULTICAST_PORT),
@@ -134,8 +136,9 @@ static otError mdns_socket_init_v6(uint32_t ail_iface_idx)
 		     error = OT_ERROR_FAILED);
 	mreq_v6.ipv6mr_ifindex = ail_iface_idx;
 	net_ipv6_addr_create(&mreq_v6.ipv6mr_multiaddr, 0xff02, 0, 0, 0, 0, 0, 0, 0x00fb);
-	VerifyOrExit(zsock_setsockopt(mdns_sock_v6, NET_IPPROTO_IPV6, ZSOCK_IPV6_ADD_MEMBERSHIP,
-				      &mreq_v6, sizeof(mreq_v6)) == 0,
+	mcast_join_ret = zsock_setsockopt(mdns_sock_v6, IPPROTO_IPV6, IPV6_ADD_MEMBERSHIP,
+					  &mreq_v6, sizeof(mreq_v6));
+	VerifyOrExit(mcast_join_ret == 0 || (mcast_join_ret == -1 && errno == EALREADY),
 		     error = OT_ERROR_FAILED);
 	VerifyOrExit(zsock_setsockopt(mdns_sock_v6, NET_IPPROTO_IPV6, ZSOCK_IPV6_MULTICAST_LOOP,
 				      &on, sizeof(on)) == 0,
@@ -172,6 +175,7 @@ static otError mdns_socket_init_v4(uint32_t ail_iface_idx)
 	struct net_ip_mreqn mreq_v4 = {0};
 	int mcast_hops = 255;
 	int on = 1;
+	int mcast_join_ret = 0;
 
 	struct net_sockaddr_in addr = {.sin_family = NET_AF_INET,
 				   .sin_port = net_htons(MULTICAST_PORT),
@@ -193,9 +197,10 @@ static otError mdns_socket_init_v4(uint32_t ail_iface_idx)
 				      &on, sizeof(on)) == 0,
 		     error = OT_ERROR_FAILED);
 	mreq_v4.imr_ifindex = ail_iface_idx;
-	mreq_v4.imr_multiaddr.s_addr = net_htonl(0xE00000FB);
-	VerifyOrExit(zsock_setsockopt(mdns_sock_v4, NET_IPPROTO_IP, ZSOCK_IP_ADD_MEMBERSHIP,
-				      &mreq_v4, sizeof(mreq_v4)) == 0,
+	mreq_v4.imr_multiaddr.s_addr = htonl(0xE00000FB);
+	mcast_join_ret = zsock_setsockopt(mdns_sock_v4, IPPROTO_IP, IP_ADD_MEMBERSHIP,
+					  &mreq_v4, sizeof(mreq_v4));
+	VerifyOrExit(mcast_join_ret == 0 || (mcast_join_ret == -1 && errno == EALREADY),
 		     error = OT_ERROR_FAILED);
 	VerifyOrExit(zsock_setsockopt(mdns_sock_v4, NET_IPPROTO_IP, ZSOCK_IP_MULTICAST_LOOP,
 				      &on, sizeof(on)) == 0,
@@ -241,6 +246,10 @@ static otError mdns_socket_deinit(void)
 	sockfd_udp[1].fd = -1;
 	mdns_sock_v4 = -1;
 #endif /* CONFIG_NET_IPV4 */
+
+	VerifyOrExit(net_socket_service_register(&mdns_udp_service, sockfd_udp,
+						 ARRAY_SIZE(sockfd_udp), NULL) == 0,
+						 error = OT_ERROR_FAILED);
 exit:
 	return error;
 }

modules/openthread/platform/platform-zephyr.h

@@ -120,6 +120,7 @@ int notify_new_tx_frame(struct net_pkt *pkt);
 
 #if defined(CONFIG_OPENTHREAD_ZEPHYR_BORDER_ROUTER)
 otError infra_if_init(otInstance *instance, struct net_if *ail_iface);
+otError infra_if_deinit(void);
 otError infra_if_start_icmp6_listener(void);
 void infra_if_stop_icmp6_listener(void);
 void udp_plat_init_sockfd(void);

modules/openthread/platform/trel.c

@@ -70,6 +70,9 @@ void otPlatTrelDisable(otInstance *aInstance)
 	sockfd_udp[0].fd = -1;
 	trel_sock = -1;
 
+	net_socket_service_register(&trel_udp_service, sockfd_udp,
+				    ARRAY_SIZE(sockfd_udp), NULL);
+
 	trel_is_enabled = false;
 
 exit:

modules/openthread/platform/udp.c

@@ -66,6 +66,9 @@ void udp_plat_deinit(void)
 			sockfd_udp[idx].fd = -1;
 		}
 	}
+
+	net_socket_service_register(&handle_udp_receive, sockfd_udp,
+				    ARRAY_SIZE(sockfd_udp), NULL);
 }
 
 otError otPlatUdpSocket(otUdpSocket *aUdpSocket)