Update oc_ri API

iotivity · Sep 29, 2024 · 66ff75f · 66ff75f
1 parent b28a73a
commit 66ff75f
Show file tree

Hide file tree

Showing 8 changed files with 665 additions and 639 deletions.
diff --git a/api/cloud/unittest/cloud_store_test.cpp b/api/cloud/unittest/cloud_store_test.cpp
@@ -22,6 +22,7 @@
 #include "api/cloud/oc_cloud_resource_internal.h"
 #include "api/cloud/oc_cloud_store_internal.h"
 #include "api/oc_event_callback_internal.h"
+#include "api/oc_rep_internal.h"
 #include "api/oc_storage_internal.h"
 #include "oc_api.h"
 #include "oc_config.h"

diff --git a/api/oc_collection.c b/api/oc_collection.c
@@ -25,6 +25,7 @@
 #include "api/oc_link_internal.h"
 #include "api/oc_resource_internal.h"
 #include "api/oc_ri_internal.h"
+#include "api/oc_ri_server_internal.h"
 #include "messaging/coap/observe_internal.h"
 #include "oc_api.h"
 #include "oc_core_res.h"

diff --git a/api/oc_discovery.c b/api/oc_discovery.c
@@ -1241,7 +1241,7 @@ oc_wkcore_discovery_handler(oc_request_t *request,
     }
   }
 
-  if (rt_request != 0 && rt_device != 0 &&
+  if (rt_request != 0 && rt_device != NULL &&
       strncmp(rt_request, rt_device, rt_len) == 0) {
     /* request for specific device type */
     matches = 1;
@@ -1273,7 +1273,9 @@ oc_wkcore_discovery_handler(oc_request_t *request,
 
     length += clf_add_line_to_buffer("/oic/res>;");
     length += clf_add_line_to_buffer("rt=\"oic.wk.res ");
-    length += clf_add_str_to_buffer(rt_device, rt_devlen);
+    if (rt_device != NULL) {
+      length += clf_add_str_to_buffer(rt_device, rt_devlen);
+    }
     length += clf_add_line_to_buffer("\";");
     length +=
       clf_add_line_to_buffer("if=\"oic.if.ll oic.if.baseline\";ct=10000");