Remove global variable "now".

[meshlink] / src / protocol_key.c

diff --git a/src/protocol_key.c b/src/protocol_key.c
index 59ca7db499e540bc331dcd34e7848f078597567f..887ccd0d9f394ed6a09e8f14a46dbbb9812e1d77 100644 (file)
--- a/src/protocol_key.c
+++ b/src/protocol_key.c
@@ -19,9 +19,7 @@
 
 #include "system.h"
 
-#include "cipher.h"
 #include "connection.h"
-#include "crypto.h"
 #include "logger.h"
 #include "meshlink_internal.h"
 #include "net.h"
@@ -96,7 +94,7 @@ bool send_req_key(node_t *to) {
        sptps_stop(&to->sptps);
        to->status.validkey = false;
        to->status.waitingforkey = true;
-       to->last_req_key = now.tv_sec;
+       to->last_req_key = mesh->loop.now.tv_sec;
        to->incompression = mesh->self->incompression;
        return sptps_start(&to->sptps, to, true, true, mesh->self->connection->ecdsa, to->ecdsa, label, sizeof label, send_initial_sptps_data, receive_sptps_record);
 }
@@ -152,7 +150,7 @@ static bool req_key_ext_h(connection_t *c, const char *request, node_t *from, in
                        sptps_stop(&from->sptps);
                        from->status.validkey = false;
                        from->status.waitingforkey = true;
-                       from->last_req_key = now.tv_sec;
+                       from->last_req_key = mesh->loop.now.tv_sec;
                        sptps_start(&from->sptps, from, false, true, mesh->self->connection->ecdsa, from->ecdsa, label, sizeof label, send_sptps_data, receive_sptps_record);
                        sptps_receive_data(&from->sptps, buf, len);
                        return true;