Moved clock handling into dtls-support

nfi · nfi · commit 34a891ba82c5 · 2017-10-17T22:44:39.000+02:00
diff --git a/contiki-support/dtls-support-conf.h b/contiki-support/dtls-support-conf.h
@@ -18,6 +18,10 @@ typedef struct {
   int ifindex;
 } session_t;
 
+#define DTLS_TICKS_PER_SECOND CLOCK_SECOND
+
+typedef clock_time_t dtls_tick_t;
+
 #define WITH_CONTIKI 1
 
 #define HAVE_ASSERT_H 1
diff --git a/contiki-support/dtls-support.c b/contiki-support/dtls-support.c
@@ -183,11 +183,6 @@ dtls_dsrv_hexdump_log(log_t level, const char *name, const unsigned char *buf, s
 
 /* --------- time support --------- */
 
-void
-dtls_clock_init(void)
-{
-}
-
 void
 dtls_ticks(dtls_tick_t *t)
 {
diff --git a/dtls-support.h b/dtls-support.h
@@ -51,5 +51,13 @@ void dtls_session_print(const session_t *a);
  */
 void dtls_session_snprint(const session_t *a, char *buf, size_t size);
 
+/**
+ * Clock handling
+ */
+void dtls_ticks(dtls_tick_t *t);
+
+#ifndef DTLS_TICKS_PER_SECOND
+#error DTLS_TICKS_PER_SECOND is not defined
+#endif /* DTLS_TICKS_PER_SECOND */
 
 #endif /* DTLS_SUPPORT_H_ */
diff --git a/dtls.c b/dtls.c
@@ -18,7 +18,6 @@
  *******************************************************************************/
 
 #include "tinydtls.h"
-#include "dtls_time.h"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -33,7 +32,6 @@
 #include "dtls-numeric.h"
 #include "netq.h"
 #include "dtls.h"
-#include "dtls-hmac.h"
 
 #include "dtls-alert.h"
 #include "dtls-prng.h"
@@ -149,12 +147,11 @@ static const unsigned char cert_asn1_header[] = {
 
 void
 dtls_init() {
-  dtls_clock_init();
+  dtls_support_init();
   dtls_crypto_init();
   dtls_hmac_storage_init();
   netq_init();
   dtls_peer_init();
-  dtls_support_init();
   dtls_hmac_storage_init();
 }
 
@@ -1464,9 +1461,9 @@ dtls_send_multi(dtls_context_t *ctx, dtls_peer_t *peer,
     if (n) {
       dtls_tick_t now;
       dtls_ticks(&now);
-      n->t = now + 2 * CLOCK_SECOND;
+      n->t = now + 2 * DTLS_TICKS_PER_SECOND;
       n->retransmit_cnt = 0;
-      n->timeout = 2 * CLOCK_SECOND;
+      n->timeout = 2 * DTLS_TICKS_PER_SECOND;
       n->peer = peer;
       n->epoch = (security) ? security->epoch : 0;
       n->type = type;
@@ -1774,7 +1771,7 @@ dtls_send_server_hello(dtls_context_t *ctx, dtls_peer_t *peer)
   /* Set server random: First 4 bytes are the server's Unix timestamp,
    * followed by 28 bytes of generate random data. */
   dtls_ticks(&now);
-  dtls_int_to_uint32(handshake->tmp.random.server, now / CLOCK_SECOND);
+  dtls_int_to_uint32(handshake->tmp.random.server, now / DTLS_TICKS_PER_SECOND);
   dtls_prng(handshake->tmp.random.server + 4, 28);
 
   memcpy(p, handshake->tmp.random.server, DTLS_RANDOM_LENGTH);
@@ -2353,7 +2350,7 @@ dtls_send_client_hello(dtls_context_t *ctx, dtls_peer_t *peer,
     /* Set client random: First 4 bytes are the client's Unix timestamp,
      * followed by 28 bytes of generate random data. */
     dtls_ticks(&now);
-    dtls_int_to_uint32(handshake->tmp.random.client, now / CLOCK_SECOND);
+    dtls_int_to_uint32(handshake->tmp.random.client, now / DTLS_TICKS_PER_SECOND);
     dtls_prng(handshake->tmp.random.client + sizeof(uint32_t),
          DTLS_RANDOM_LENGTH - sizeof(uint32_t));
   }
@@ -3969,7 +3966,7 @@ dtls_stop_retransmission(dtls_context_t *context, dtls_peer_t *peer) {
 }
 
 void
-dtls_check_retransmit(dtls_context_t *context, clock_time_t *next, int all) {
+dtls_check_retransmit(dtls_context_t *context, dtls_tick_t *next, int all) {
   dtls_tick_t now;
   netq_t *node = netq_head(&context->sendqueue);
 
diff --git a/dtls.h b/dtls.h
@@ -34,7 +34,6 @@
 #include "dtls-hmac.h"
 
 #include "tinydtls.h"
-#include "dtls_time.h"
 
 #ifndef DTLSv12
 #define DTLS_VERSION 0xfeff	/* DTLS v1.1 */
@@ -210,7 +209,7 @@ struct netq_t;
 /** Holds global information of the DTLS engine. */
 typedef struct dtls_context_t {
   unsigned char cookie_secret[DTLS_COOKIE_SECRET_LENGTH];
-  clock_time_t cookie_secret_age; /**< the time the secret has been generated */
+  dtls_tick_t cookie_secret_age; /**< the time the secret has been generated */
 
   dtls_peer_t *peers;		/**< peer hash map */
 
@@ -306,7 +305,7 @@ int dtls_write(struct dtls_context_t *ctx, session_t *session,
  *  of the next scheduled retransmission, or @c 0 when no packets are
  *  waiting.
  */
-void dtls_check_retransmit(dtls_context_t *context, clock_time_t *next,
+void dtls_check_retransmit(dtls_context_t *context, dtls_tick_t *next,
                            int all);
 
 #define DTLS_COOKIE_LENGTH 16
diff --git a/dtls_time.h b/dtls_time.h
diff --git a/netq.h b/netq.h
@@ -20,7 +20,6 @@
 
 #include "tinydtls.h"
 #include "dtls.h"
-#include "dtls_time.h"
 
 /**
  * \defgroup netq Network Packet Queue
@@ -50,7 +49,7 @@ typedef unsigned char netq_packet_t[DTLS_MAX_BUF];
 typedef struct netq_t {
   struct netq_t *next;
 
-  clock_time_t t;	        /**< when to send PDU for the next time */
+  dtls_tick_t t;	        /**< when to send PDU for the next time */
   unsigned int timeout;		/**< randomized timeout value */
 
   dtls_peer_t *peer;		/**< remote address */
diff --git a/posix/dtls-support-conf.h b/posix/dtls-support-conf.h
@@ -17,4 +17,8 @@ typedef struct {
   uint8_t ifindex;
 } session_t;
 
+#define DTLS_TICKS_PER_SECOND 1000
+
+typedef uint64_t dtls_tick_t;
+
 #endif /* DTLS_SUPPORT_CONF_H_ */
diff --git a/posix/dtls-support.c b/posix/dtls-support.c
@@ -3,10 +3,10 @@
 
 #include "tinydtls.h"
 #include "lib/memb.h"
-#include <stdlib.h>
 #include "dtls-support.h"
 #include "dtls_debug.h"
-#include "dtls_time.h"
+#include <stdlib.h>
+#include <sys/time.h>
 #ifdef HAVE_ASSERT_H
 #include <assert.h>
 #endif
@@ -214,19 +214,15 @@ dtls_dsrv_hexdump_log(log_t level, const char *name, const unsigned char *buf, s
 
 /* --------- time support ----------- */
 
-time_t dtls_clock_offset;
+static time_t dtls_clock_offset;
 
 void
-dtls_clock_init(void) {
-  dtls_clock_offset = time(NULL);
-  dtls_clock_offset = 0;
-}
-
-void dtls_ticks(dtls_tick_t *t) {
+dtls_ticks(dtls_tick_t *t)
+{
   struct timeval tv;
   gettimeofday(&tv, NULL);
-  *t = (tv.tv_sec - dtls_clock_offset) * DTLS_TICKS_PER_SECOND 
-    + (tv.tv_usec * DTLS_TICKS_PER_SECOND / 1000000);
+  *t = (tv.tv_sec - dtls_clock_offset) * (dtls_tick_t)DTLS_TICKS_PER_SECOND
+    + (tv.tv_usec * (dtls_tick_t)DTLS_TICKS_PER_SECOND / 1000000);
 }
 
 int
@@ -292,7 +288,17 @@ dtls_session_equals(const session_t *a, const session_t *b) {
 
 
 /* The init */
-void dtls_support_init(void)
+void
+dtls_support_init(void)
 {
-  /* setup whatever */
+#ifdef HAVE_TIME_H
+  dtls_clock_offset = time(NULL);
+#else
+# ifdef __GNUC__
+  /* Issue a warning when using gcc. Other prepropressors do
+   *  not seem to have a similar feature. */
+#  warning "cannot initialize clock"
+# endif
+  dtls_clock_offset = 0;
+#endif
 }
diff --git a/tests/netq-test.c b/tests/netq-test.c
@@ -22,9 +22,9 @@ int main(int argc, char **argv) {
   struct netq_t *nq = NULL, *node;
   int i;
     
-  clock_time_t timestamps[] = { 300, 100, 200, 400, 500 };
+  dtls_tick_t timestamps[] = { 300, 100, 200, 400, 500 };
 
-  for (i = 0; i < sizeof(timestamps)/sizeof(clock_time_t); i++) {
+  for (i = 0; i < sizeof(timestamps)/sizeof(dtls_tick_t); i++) {
     node = netq_node_new(0);
 
     if (!node) {
