openthread: platform: Update code to use socket services config

Updated platform code to make use of number of socket services defined
in Kconfig. In this way, hardcoded values are avoided.

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

Author: Cristib05

modules/openthread/platform/dhcp6_pd.c

@@ -17,9 +17,8 @@
 
 #define DHCPV6_SERVER_PORT 547
 #define DHCPV6_CLIENT_PORT 546
-#define DHCPV6_PD_CLIENT_NUM_SERVICES 1
 
-static struct zsock_pollfd sockfd_udp[DHCPV6_PD_CLIENT_NUM_SERVICES];
+static struct zsock_pollfd sockfd_udp[CONFIG_OPENTHREAD_ZEPHYR_BORDER_ROUTER_DHCP6_PD_SERVICES];
 static struct otInstance *ot_instance_ptr;
 static uint32_t ail_iface_idx;
 static int dhcpv6_pd_client_sock = -1;
@@ -31,7 +30,7 @@ static void dhcpv6_pd_client_socket_deinit(uint32_t infra_if_index);
 
 NET_SOCKET_SERVICE_SYNC_DEFINE_STATIC(dhcpv6_pd_client_udp_receive,
 				      dhcpv6_pd_client_receive_handler,
-				      DHCPV6_PD_CLIENT_NUM_SERVICES);
+				      CONFIG_OPENTHREAD_ZEPHYR_BORDER_ROUTER_DHCP6_PD_SERVICES);
 
 otError dhcpv6_pd_client_init(otInstance *ot_instance, uint32_t ail_iface_index)
 {

modules/openthread/platform/mdns_socket.c

@@ -22,13 +22,8 @@
 #include "sockets_internal.h"
 
 #define MULTICAST_PORT 5353
-#if defined(CONFIG_NET_IPV4) && defined(CONFIG_NET_IPV6)
-#define MAX_SERVICES   2
-#else
-#define MAX_SERVICES 1
-#endif
 
-static struct zsock_pollfd sockfd_udp[MAX_SERVICES];
+static struct zsock_pollfd sockfd_udp[CONFIG_OPENTHREAD_ZEPHYR_BORDER_ROUTER_MAX_MDNS_SERVICES];
 static int mdns_sock_v6 = -1;
 #if defined(CONFIG_NET_IPV4)
 static int mdns_sock_v4 = -1;
@@ -48,7 +43,8 @@ static void mdns_send_unicast(otMessage *message, const otPlatMdnsAddressInfo *a
 static void mdns_receive_handler(struct net_socket_service_event *evt);
 static void process_mdns_message(struct otbr_msg_ctx *msg_ctx_ptr);
 
-NET_SOCKET_SERVICE_SYNC_DEFINE_STATIC(mdns_udp_service, mdns_receive_handler, MAX_SERVICES);
+NET_SOCKET_SERVICE_SYNC_DEFINE_STATIC(mdns_udp_service, mdns_receive_handler,
+				      CONFIG_OPENTHREAD_ZEPHYR_BORDER_ROUTER_MAX_MDNS_SERVICES);
 
 otError mdns_plat_socket_init(otInstance *ot_instance, uint32_t ail_iface_idx)
 {

modules/openthread/platform/trel.c

@@ -15,17 +15,16 @@
 #include <zephyr/net/net_ip.h>
 #include "sockets_internal.h"
 
-#define MAX_SERVICES   1
-
-static struct zsock_pollfd sockfd_udp[MAX_SERVICES];
+static struct zsock_pollfd sockfd_udp[CONFIG_OPENTHREAD_ZEPHYR_BORDER_ROUTER_TREL_SERVICES];
 static int trel_sock = -1;
 static struct otInstance *ot_instance_ptr;
 static otPlatTrelCounters trel_counters;
 static bool trel_is_enabled;
 static void trel_receive_handler(struct net_socket_service_event *evt);
 static void process_trel_message(struct otbr_msg_ctx *msg_ctx_ptr);
 
-NET_SOCKET_SERVICE_SYNC_DEFINE_STATIC(trel_udp_service, trel_receive_handler, MAX_SERVICES);
+NET_SOCKET_SERVICE_SYNC_DEFINE_STATIC(trel_udp_service, trel_receive_handler,
+				      CONFIG_OPENTHREAD_ZEPHYR_BORDER_ROUTER_TREL_SERVICES);
 
 void otPlatTrelEnable(otInstance *aInstance, uint16_t *aUdpPort)
 {