oc_set_delayed_callback_ms_v1 deprecates oc_set_delayed_callback_ms

fix api

api/cloud/oc_cloud.c

@@ -50,7 +50,7 @@ cloud_reset_delayed_callback_ms(void *cb_data, oc_trigger_t callback,
                                 uint64_t milliseconds)
 {
   oc_remove_delayed_callback(cb_data, callback);
-  oc_set_delayed_callback_ms(cb_data, callback, milliseconds);
+  oc_set_delayed_callback_ms_v1(cb_data, callback, milliseconds);
 }
 
 bool

api/oc_server_api.c

@@ -138,9 +138,16 @@ oc_set_delayed_callback(void *cb_data, oc_trigger_t callback, uint16_t seconds)
 
 void
 oc_set_delayed_callback_ms(void *cb_data, oc_trigger_t callback,
-                           uint16_t miliseconds)
+                           uint16_t milliseconds)
 {
-  oc_clock_time_t ticks = miliseconds * OC_CLOCK_SECOND / 1000;
+  oc_set_delayed_callback_ms_v1(cb_data, callback, (uint64_t)milliseconds);
+}
+
+void
+oc_set_delayed_callback_ms_v1(void *cb_data, oc_trigger_t callback,
+                              uint64_t milliseconds)
+{
+  oc_clock_time_t ticks = milliseconds * OC_CLOCK_SECOND / 1000;
   oc_ri_add_timed_event_callback_ticks(cb_data, callback, ticks);
 }
 
@@ -739,9 +746,9 @@ oc_notify_observers_delayed(oc_resource_t *resource, uint16_t seconds)
 }
 
 void
-oc_notify_observers_delayed_ms(oc_resource_t *resource, uint16_t miliseconds)
+oc_notify_observers_delayed_ms(oc_resource_t *resource, uint16_t milliseconds)
 {
-  oc_clock_time_t ticks = miliseconds * OC_CLOCK_SECOND / 1000;
+  oc_clock_time_t ticks = milliseconds * OC_CLOCK_SECOND / 1000;
   oc_notify_observers_delayed_ticks(resource, ticks);
 }
 

include/oc_api.h

@@ -1694,11 +1694,11 @@ void oc_notify_observers_delayed(oc_resource_t *resource, uint16_t seconds);
  *       result from a PUT, or POST oc_request_callback_t.
  *
  * @param[in] resource the oc_resource_t that has a modified property
- * @param[in] miliseconds the number of miliseconds to wait till the callback is
- * invoked
+ * @param[in] milliseconds the number of milliseconds to wait till the callback
+ * is invoked
  */
 void oc_notify_observers_delayed_ms(oc_resource_t *resource,
-                                    uint16_t miliseconds);
+                                    uint16_t milliseconds);
 
 #ifdef __cplusplus
 }
@@ -2372,17 +2372,30 @@ void oc_set_delayed_callback(void *cb_data, oc_trigger_t callback,
                              uint16_t seconds);
 
 /**
- * Schedule a callback to be invoked after a set number of miliseconds.
+ * Schedule a callback to be invoked after a set number of milliseconds.
  *
+ * @deprecated use oc_set_delayed_callback_ms_v1 instead
  * @param[in] cb_data user defined context pointer that is passed to the
  *                    oc_trigger_t callback
- * @param[in] callback the callback invoked after the set number of miliseconds
- * @param[in] miliseconds the number of miliseconds to wait till the callback is
- * invoked
+ * @param[in] callback the callback invoked after the set number of milliseconds
+ * @param[in] milliseconds the number of milliseconds to wait till the callback
+ * is invoked
  */
 OC_API
 void oc_set_delayed_callback_ms(void *cb_data, oc_trigger_t callback,
-                                uint16_t miliseconds);
+                                uint16_t milliseconds);
+/**
+ * Schedule a callback to be invoked after a set number of milliseconds.
+ *
+ * @param[in] cb_data user defined context pointer that is passed to the
+ *                    oc_trigger_t callback
+ * @param[in] callback the callback invoked after the set number of milliseconds
+ * @param[in] milliseconds the number of milliseconds to wait till the callback
+ * is invoked
+ */
+OC_API
+void oc_set_delayed_callback_ms_v1(void *cb_data, oc_trigger_t callback,
+                                   uint64_t milliseconds);
 
 /**
  * @brief Check if given delayed callback has already been scheduled.

security/oc_doxm.c

@@ -346,8 +346,9 @@ get_doxm(oc_request_t *request, oc_interface_mask_t iface_mask, void *data)
       }
 
       oc_indicate_separate_response(request, &rd->separate_response);
-      uint16_t jitter = oc_random_value() % OC_MULTICAST_RESPONSE_JITTER_MS;
-      oc_set_delayed_callback_ms(rd, handle_doxm_separate_response, jitter);
+      uint64_t jitter =
+        (uint64_t)(oc_random_value() % OC_MULTICAST_RESPONSE_JITTER_MS);
+      oc_set_delayed_callback_ms_v1(rd, handle_doxm_separate_response, jitter);
       return;
     }
 #endif /* OC_SERVER */