sys: make auto init default with DHCPv6 client

sys/Makefile.dep

@@ -98,6 +98,7 @@ ifneq (,$(filter dhcpv6_%,$(USEMODULE)))
 endif
 
 ifneq (,$(filter dhcpv6_client,$(USEMODULE)))
+  DEFAULT_MODULE += auto_init_dhcpv6_client
   USEMODULE += event
   USEMODULE += event_timeout
   ifneq (,$(filter ztimer,$(USEMODULE)))

sys/auto_init/include/auto_init_priorities.h

@@ -333,19 +333,19 @@ extern "C" {
 /**
  * @brief   DHCPv6 client priority
  */
-#define AUTO_INIT_PRIO_MOD_DHCPV6_CLIENT                1470
+#define AUTO_INIT_PRIO_MOD_DHCPV6_CLIENT                1480
 #endif
 #ifndef AUTO_INIT_PRIO_MOD_DHCPV6_RELAY
 /**
  * @brief   DHCPv6 relay priority
  */
-#define AUTO_INIT_PRIO_MOD_DHCPV6_RELAY                 1480
+#define AUTO_INIT_PRIO_MOD_DHCPV6_RELAY                 1490
 #endif
 #ifndef AUTO_INIT_PRIO_MOD_DHCPV6_CLIENT_SIMPLE_PD
 /**
  * @brief   DHCPv6 client simple PD priority
  */
-#define AUTO_INIT_PRIO_MOD_DHCPV6_CLIENT_SIMPLE_PD      1490
+#define AUTO_INIT_PRIO_MOD_DHCPV6_CLIENT_SIMPLE_PD      1470
 #endif
 #ifndef AUTO_INIT_PRIO_MOD_GNRC_IPV6_AUTO_SUBNETS
 /**

sys/include/net/dhcpv6/client.h

@@ -107,6 +107,16 @@ typedef struct __attribute__((packed)) {
 } dhcpv6_duid_l2_t;
 
 #if defined(MODULE_AUTO_INIT_DHCPV6_CLIENT) || defined(DOXYGEN)
+/**
+ * @brief   Configure a hook function to be executed during dhcpv6 client's
+ *          auto init.
+ *
+ * @param[in] _hook     The hook function to be called during auto init.
+ * @param[in] netif         The network interface the client should listen on.
+ *                          SOCK_ADDR_ANY_NETIF for any interface
+ */
+void dhcpv6_client_set_init_hook(void (*_hook)(void), uint16_t netif);
+
 /**
  * @brief   Auto-initializes the client in its own thread
  *

sys/net/application_layer/dhcpv6/client.c

@@ -131,6 +131,17 @@ static char _thread_stack[DHCPV6_CLIENT_STACK_SIZE];
 static void *_thread(void *args);
 static kernel_pid_t _thread_pid;
 
+static void (*_init_hook)(void) = NULL;
+static uint16_t _dhcpv6_netif = SOCK_ADDR_ANY_NETIF;
+
+void dhcpv6_client_set_init_hook(void (*_hook)(void), uint16_t netif)
+{
+    /* set hook function to call during auto init */
+    _init_hook = _hook;
+    /* specify interface to use for DHCPv6 */
+    _dhcpv6_netif = netif;
+}
+
 void dhcpv6_client_auto_init(void)
 {
     if (_thread_pid <= 0) {
@@ -145,9 +156,21 @@ static void *_thread(void *args)
 {
     (void)args;
     event_queue_t auto_init_event_queue;
+    /* initialize client event queue */
     event_queue_init(&auto_init_event_queue);
-    dhcpv6_client_init(&auto_init_event_queue, SOCK_ADDR_ANY_NETIF);
+    /* initialize DHCPv6 client either on any interface or
+     * (if configured via the init hook) a specific one */
+    dhcpv6_client_init(&auto_init_event_queue, _dhcpv6_netif);
+
+    /* execute init hook if set */
+    if (_init_hook != NULL)
+    {
+        _init_hook();
+    }
+
+    /* start DHCPv6 client */
     dhcpv6_client_start();
+    /* start event loop of DHCPv6 client */
     event_loop(&auto_init_event_queue); /* never returns */
     return NULL;
 }

sys/net/gnrc/application_layer/dhcpv6/client_simple_pd.c

@@ -24,13 +24,6 @@
 
 #include "net/gnrc/dhcpv6/client/simple_pd.h"
 
-#if IS_USED(MODULE_AUTO_INIT_DHCPV6_CLIENT)
-#error "Module `gnrc_dhcpv6_client_simple_pd` is mutually exclusive to \
-`auto_init_dhcpv6_client`"
-#endif
-
-static char _stack[DHCPV6_CLIENT_STACK_SIZE];
-
 /**
  * @brief   Find upstream network interface
  *
@@ -123,39 +116,25 @@
 /**
  * @brief   The DHCPv6 client thread
  */
-static void *_dhcpv6_cl_simple_pd_thread(void *args)
+static void _dhcpv6_client_simple_pd_init_hook(void)
 {
-    event_queue_t event_queue;
-    gnrc_netif_t *upstream_netif = _find_upstream_netif();
-
-    (void)args;
-    if (upstream_netif == NULL) {
-        LOG_ERROR("DHCPv6: No upstream interface found!\n");
-        return NULL;
-    }
-    _configure_upstream_netif(upstream_netif);
-    /* initialize client event queue */
-    event_queue_init(&event_queue);
-    /* initialize DHCPv6 client on border interface */
-    dhcpv6_client_init(&event_queue, upstream_netif->pid);
     /* configure client to request prefix delegation for WPAN interfaces */
     _configure_dhcpv6_client();
     /* set client configuration mode to stateful */
     dhcpv6_client_set_conf_mode(DHCPV6_CLIENT_CONF_MODE_STATEFUL);
-    /* start DHCPv6 client */
-    dhcpv6_client_start();
-    /* start event loop of DHCPv6 client */
-    event_loop(&event_queue);   /* never returns */
-    return NULL;
 }
 
 void gnrc_dhcpv6_client_simple_pd_init(void)
 {
-    /* start DHCPv6 client thread to request prefix for WPAN */
-    thread_create(_stack, DHCPV6_CLIENT_STACK_SIZE,
-                  DHCPV6_CLIENT_PRIORITY,
-                  0,
-                  _dhcpv6_cl_simple_pd_thread, NULL, "dhcpv6-client");
+    gnrc_netif_t *upstream_netif = _find_upstream_netif();
+
+    if (upstream_netif == NULL) {
+        LOG_ERROR("DHCPv6: No upstream interface found!\n");
+        return ;
+    }
+    _configure_upstream_netif(upstream_netif);
+
+    dhcpv6_client_set_init_hook(_dhcpv6_client_simple_pd_init_hook, upstream_netif->pid);
 }
 
 /** @} */