Update UTCP and replace gettimeofday() with clock_gettime().

[meshlink] / src / meshlink.c

diff --git a/src/meshlink.c b/src/meshlink.c
index 8513c8f99613ed6785789be189aafaa96759feb0..747bd3b5071a406310b4e4e7e8c7d8a463fcd736 100644 (file)
--- a/src/meshlink.c
+++ b/src/meshlink.c
@@ -995,10 +995,18 @@ static bool ecdsa_keygen(meshlink_handle_t *mesh) {
        return true;
 }
 
-static struct timeval idle(event_loop_t *loop, void *data) {
+static bool timespec_lt(const struct timespec *a, const struct timespec *b) {
+       if(a->tv_sec == b->tv_sec) {
+               return a->tv_nsec < b->tv_nsec;
+       } else {
+               return a->tv_sec < b->tv_sec;
+       }
+}
+
+static struct timespec idle(event_loop_t *loop, void *data) {
        (void)loop;
        meshlink_handle_t *mesh = data;
-       struct timeval t, tmin = {3600, 0};
+       struct timespec t, tmin = {3600, 0};
 
        for splay_each(node_t, n, mesh->nodes) {
                if(!n->utcp) {
@@ -1007,7 +1015,7 @@ static struct timeval idle(event_loop_t *loop, void *data) {
 
                t = utcp_timeout(n->utcp);
 
-               if(timercmp(&t, &tmin, <)) {
+               if(timespec_lt(&t, &tmin)) {
                        tmin = t;
                }
        }
@@ -1954,22 +1962,12 @@ void meshlink_set_error_cb(struct meshlink_handle *mesh, meshlink_error_cb_t cb)
        pthread_mutex_unlock(&mesh->mutex);
 }
 
-bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const void *data, size_t len) {
+static vpn_packet_t *prepare_packet(meshlink_handle_t *mesh, meshlink_node_t *destination, const void *data, size_t len) {
        meshlink_packethdr_t *hdr;
 
-       // Validate arguments
-       if(!mesh || !destination || len >= MAXSIZE - sizeof(*hdr)) {
+       if(len >= MAXSIZE - sizeof(*hdr)) {
                meshlink_errno = MESHLINK_EINVAL;
-               return false;
-       }
-
-       if(!len) {
-               return true;
-       }
-
-       if(!data) {
-               meshlink_errno = MESHLINK_EINVAL;
-               return false;
+               return NULL;
        }
 
        node_t *n = (node_t *)destination;
@@ -1977,7 +1975,7 @@ bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const
        if(n->status.blacklisted) {
                logger(mesh, MESHLINK_ERROR, "Node %s blacklisted, dropping packet\n", n->name);
                meshlink_errno = MESHLINK_EBLACKLISTED;
-               return false;
+               return NULL;
        }
 
        // Prepare the packet
@@ -1985,7 +1983,7 @@ bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const
 
        if(!packet) {
                meshlink_errno = MESHLINK_ENOMEM;
-               return false;
+               return NULL;
        }
 
        packet->probe = false;
@@ -2001,6 +1999,52 @@ bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const
 
        memcpy(packet->data + sizeof(*hdr), data, len);
 
+       return packet;
+}
+
+static bool meshlink_send_immediate(meshlink_handle_t *mesh, meshlink_node_t *destination, const void *data, size_t len) {
+       assert(mesh);
+       assert(destination);
+       assert(data);
+       assert(len);
+
+       // Prepare the packet
+       vpn_packet_t *packet = prepare_packet(mesh, destination, data, len);
+
+       if(!packet) {
+               return false;
+       }
+
+       // Send it immediately
+       route(mesh, mesh->self, packet);
+       free(packet);
+
+       return true;
+}
+
+bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const void *data, size_t len) {
+       // Validate arguments
+       if(!mesh || !destination) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return false;
+       }
+
+       if(!len) {
+               return true;
+       }
+
+       if(!data) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return false;
+       }
+
+       // Prepare the packet
+       vpn_packet_t *packet = prepare_packet(mesh, destination, data, len);
+
+       if(!packet) {
+               return false;
+       }
+
        // Queue it
        if(!meshlink_queue_push(&mesh->outpacketqueue, packet)) {
                free(packet);
@@ -2008,6 +2052,8 @@ bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const
                return false;
        }
 
+       logger(mesh, MESHLINK_DEBUG, "Adding packet of %zu bytes to packet queue", len);
+
        // Notify event loop
        signal_trigger(&mesh->loop, &mesh->datafromapp);
 
@@ -2017,17 +2063,16 @@ bool meshlink_send(meshlink_handle_t *mesh, meshlink_node_t *destination, const
 void meshlink_send_from_queue(event_loop_t *loop, void *data) {
        (void)loop;
        meshlink_handle_t *mesh = data;
-       vpn_packet_t *packet = meshlink_queue_pop(&mesh->outpacketqueue);
 
-       if(!packet) {
-               return;
-       }
-
-       mesh->self->in_packets++;
-       mesh->self->in_bytes += packet->len;
-       route(mesh, mesh->self, packet);
+       logger(mesh, MESHLINK_DEBUG, "Flushing the packet queue");
 
-       free(packet);
+       for(vpn_packet_t *packet; (packet = meshlink_queue_pop(&mesh->outpacketqueue));) {
+               logger(mesh, MESHLINK_DEBUG, "Removing packet of %d bytes from packet queue", packet->len);
+               mesh->self->in_packets++;
+               mesh->self->in_bytes += packet->len;
+               route(mesh, mesh->self, packet);
+               free(packet);
+       }
 }
 
 ssize_t meshlink_get_pmtu(meshlink_handle_t *mesh, meshlink_node_t *destination) {
@@ -3197,7 +3242,7 @@ static bool blacklist(meshlink_handle_t *mesh, node_t *n) {
        n->status.udp_confirmed = false;
 
        if(n->status.reachable) {
-               n->last_unreachable = mesh->loop.now.tv_sec;
+               n->last_unreachable = time(NULL);
        }
 
        /* Graph updates will suppress status updates for blacklisted nodes, so we need to
@@ -3271,7 +3316,7 @@ static bool whitelist(meshlink_handle_t *mesh, node_t *n) {
        n->status.blacklisted = false;
 
        if(n->status.reachable) {
-               n->last_reachable = mesh->loop.now.tv_sec;
+               n->last_reachable = time(NULL);
                update_node_status(mesh, n);
        }
 
@@ -3517,7 +3562,7 @@ static ssize_t channel_send(struct utcp *utcp, const void *data, size_t len) {
        }
 
        meshlink_handle_t *mesh = n->mesh;
-       return meshlink_send(mesh, (meshlink_node_t *)n, data, len) ? (ssize_t)len : -1;
+       return meshlink_send_immediate(mesh, (meshlink_node_t *)n, data, len) ? (ssize_t)len : -1;
 }
 
 void meshlink_set_channel_receive_cb(meshlink_handle_t *mesh, meshlink_channel_t *channel, meshlink_channel_receive_cb_t cb) {