gcoap: include CoAP resrouces from NANOCOAP_RESOURCE() XFA

RIOT-OS · Mar 9, 2023 · cc30b81 · cc30b81
1 parent 13aa272
commit cc30b81
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/sys/include/net/nanocoap.h b/sys/include/net/nanocoap.h
@@ -2071,7 +2071,7 @@ extern ssize_t coap_well_known_core_default_handler(coap_pkt_t *pkt, \
  * @brief   Respond to `/.well-known/core` to list all resources on the server
  */
 #ifndef CONFIG_NANOCOAP_SERVER_WELL_KNOWN_CORE
-#define CONFIG_NANOCOAP_SERVER_WELL_KNOWN_CORE (1)
+#define CONFIG_NANOCOAP_SERVER_WELL_KNOWN_CORE !IS_USED(MODULE_GCOAP)
 #endif
 
 /**

diff --git a/sys/net/application_layer/gcoap/gcoap.c b/sys/net/application_layer/gcoap/gcoap.c
@@ -1409,6 +1409,17 @@ kernel_pid_t gcoap_init(void)
         gcoap_forward_proxy_init();
     }
 
+#ifdef MODULE_NANOCOAP_RESOURCES
+    /* add CoAP resources from XFA */
+    XFA_USE_CONST(coap_resource_t, coap_resources_xfa);
+    static gcoap_listener_t _xfa_listener = {
+        .resources = coap_resources_xfa,
+    };
+    _xfa_listener.resources_len = XFA_LEN(coap_resource_t, coap_resources_xfa),
+
+    gcoap_register_listener(&_xfa_listener);
+#endif
+
     return _pid;
 }