DTLSSocketWrapper: Convert to Chrono

Author: kjbracey

features/netsocket/DTLSSocketWrapper.cpp

@@ -39,6 +39,8 @@ DTLSSocketWrapper::DTLSSocketWrapper(Socket *transport, const char *hostname, co
 void DTLSSocketWrapper::timing_set_delay(void *ctx, uint32_t int_ms, uint32_t fin_ms)
 {
     DTLSSocketWrapper *context = static_cast<DTLSSocketWrapper *>(ctx);
+    auto int_duration = std::chrono::duration<uint32_t, std::milli>(int_ms);
+    auto fin_duration = std::chrono::duration<uint32_t, std::milli>(fin_ms);
 
     if (context->_timer_event_id) {
         mbed::mbed_event_queue()->cancel(context->_timer_event_id);
@@ -50,8 +52,8 @@ void DTLSSocketWrapper::timing_set_delay(void *ctx, uint32_t int_ms, uint32_t fi
         return;
     }
 
-    context->_int_ms_tick = rtos::Kernel::get_ms_count() + int_ms;
-    context->_timer_event_id = mbed::mbed_event_queue()->call_in(fin_ms, context, &DTLSSocketWrapper::timer_event);
+    context->_int_time = rtos::Kernel::Clock::now() + int_duration;
+    context->_timer_event_id = mbed::mbed_event_queue()->call_in(fin_duration, context, &DTLSSocketWrapper::timer_event);
 }
 
 int DTLSSocketWrapper::timing_get_delay(void *ctx)
@@ -64,7 +66,7 @@ int DTLSSocketWrapper::timing_get_delay(void *ctx)
         return -1;
     } else if (context->_timer_expired) {
         return 2;
-    } else if (context->_int_ms_tick < rtos::Kernel::get_ms_count()) {
+    } else if (context->_int_time < rtos::Kernel::Clock::now()) {
         return 1;
     } else {
         return 0;

features/netsocket/DTLSSocketWrapper.h

@@ -23,6 +23,7 @@
 #define DTLSSOCKETWRAPPER_H
 
 #include "TLSSocketWrapper.h"
+#include "rtos/Kernel.h"
 
 // This class requires Mbed TLS SSL/TLS client code
 #if defined(MBEDTLS_SSL_CLI_C) || defined(DOXYGEN_ONLY)
@@ -43,9 +44,9 @@ class DTLSSocketWrapper : public TLSSocketWrapper {
     static void timing_set_delay(void *ctx, uint32_t int_ms, uint32_t fin_ms);
     static int timing_get_delay(void *ctx);
     void timer_event();
-    uint64_t _int_ms_tick = 0;
-    int _timer_event_id = 0;
-    bool _timer_expired = false;
+    rtos::Kernel::Clock::time_point _int_time;
+    int _timer_event_id;
+    bool _timer_expired : 1;
 };
 
 #endif