Never automatically try to bind to ports >= 32768.

[meshlink] / src / devtools.c

diff --git a/src/devtools.c b/src/devtools.c
index e6ba56171c5dabc7aa727b0d989235121d693a41..12c5432e2ca8dbf9ae7ece2accb612fa543c15e6 100644 (file)
--- a/src/devtools.c
+++ b/src/devtools.c
@@ -65,7 +65,9 @@ devtool_edge_t *devtool_get_all_edges(meshlink_handle_t *mesh, devtool_edge_t *e
                return NULL;
        }
 
-       assert(pthread_mutex_lock(&mesh->mutex) == 0);
+       if(pthread_mutex_lock(&mesh->mutex) != 0) {
+               abort();
+       }
 
        devtool_edge_t *result = NULL;
        unsigned int result_size = 0;
@@ -113,7 +115,7 @@ devtool_edge_t *devtool_get_all_edges(meshlink_handle_t *mesh, devtool_edge_t *e
                meshlink_errno = MESHLINK_ENOMEM;
        }
 
-       assert(pthread_mutex_unlock(&mesh->mutex) == 0);
+       pthread_mutex_unlock(&mesh->mutex);
 
        return result;
 }
@@ -135,7 +137,9 @@ bool devtool_export_json_all_edges_state(meshlink_handle_t *mesh, FILE *stream)
 
        bool result = true;
 
-       assert(pthread_mutex_lock(&mesh->mutex) == 0);
+       if(pthread_mutex_lock(&mesh->mutex) != 0) {
+               abort();
+       }
 
        // export edges and nodes
        size_t node_count = 0;
@@ -250,50 +254,78 @@ done:
        free(nodes);
        free(edges);
 
-       assert(pthread_mutex_unlock(&mesh->mutex) == 0);
+       pthread_mutex_unlock(&mesh->mutex);
 
        return result;
 }
 
+static void devtool_get_reset_node_status(meshlink_handle_t *mesh, meshlink_node_t *node, devtool_node_status_t *status, bool reset) {
+       node_t *internal = (node_t *)node;
+
+       if(pthread_mutex_lock(&mesh->mutex) != 0) {
+               abort();
+       }
+
+       if(status) {
+               memcpy(&status->status, &internal->status, sizeof status->status);
+               memcpy(&status->address, &internal->address, sizeof status->address);
+               status->mtu = internal->mtu;
+               status->minmtu = internal->minmtu;
+               status->maxmtu = internal->maxmtu;
+               status->mtuprobes = internal->mtuprobes;
+               status->in_data = internal->in_data;
+               status->out_data = internal->out_data;
+               status->in_forward = internal->in_forward;
+               status->out_forward = internal->out_forward;
+               status->in_meta = internal->in_meta;
+               status->out_meta = internal->out_meta;
+
+               // Derive UDP connection status
+               if(internal == mesh->self) {
+                       status->udp_status = DEVTOOL_UDP_WORKING;
+               } else if(!internal->status.reachable) {
+                       status->udp_status = DEVTOOL_UDP_IMPOSSIBLE;
+               } else if(!internal->status.validkey) {
+                       status->udp_status = DEVTOOL_UDP_UNKNOWN;
+               } else if(internal->status.udp_confirmed) {
+                       status->udp_status = DEVTOOL_UDP_WORKING;
+               } else if(internal->mtuprobes > 30) {
+                       status->udp_status = DEVTOOL_UDP_FAILED;
+               } else if(internal->mtuprobes > 0) {
+                       status->udp_status = DEVTOOL_UDP_TRYING;
+               } else {
+                       status->udp_status = DEVTOOL_UDP_UNKNOWN;
+               }
+       }
+
+       if(reset) {
+               internal->in_data = 0;
+               internal->out_data = 0;
+               internal->in_forward = 0;
+               internal->out_forward = 0;
+               internal->in_meta = 0;
+               internal->out_meta = 0;
+       }
+
+       pthread_mutex_unlock(&mesh->mutex);
+}
+
 void devtool_get_node_status(meshlink_handle_t *mesh, meshlink_node_t *node, devtool_node_status_t *status) {
        if(!mesh || !node || !status) {
                meshlink_errno = MESHLINK_EINVAL;
                return;
        }
 
-       node_t *internal = (node_t *)node;
+       devtool_get_reset_node_status(mesh, node, status, false);
+}
 
-       assert(pthread_mutex_lock(&mesh->mutex) == 0);
-
-       memcpy(&status->status, &internal->status, sizeof status->status);
-       memcpy(&status->address, &internal->address, sizeof status->address);
-       status->mtu = internal->mtu;
-       status->minmtu = internal->minmtu;
-       status->maxmtu = internal->maxmtu;
-       status->mtuprobes = internal->mtuprobes;
-       status->in_packets = internal->in_packets;
-       status->in_bytes = internal->in_bytes;
-       status->out_packets = internal->out_packets;
-       status->out_bytes = internal->out_bytes;
-
-       // Derive UDP connection status
-       if(internal == mesh->self) {
-               status->udp_status = DEVTOOL_UDP_WORKING;
-       } else if(!internal->status.reachable) {
-               status->udp_status = DEVTOOL_UDP_IMPOSSIBLE;
-       } else if(!internal->status.validkey) {
-               status->udp_status = DEVTOOL_UDP_UNKNOWN;
-       } else if(internal->status.udp_confirmed) {
-               status->udp_status = DEVTOOL_UDP_WORKING;
-       } else if(internal->mtuprobes > 30) {
-               status->udp_status = DEVTOOL_UDP_FAILED;
-       } else if(internal->mtuprobes > 0) {
-               status->udp_status = DEVTOOL_UDP_TRYING;
-       } else {
-               status->udp_status = DEVTOOL_UDP_UNKNOWN;
+void devtool_reset_node_counters(meshlink_handle_t *mesh, meshlink_node_t *node, devtool_node_status_t *status) {
+       if(!mesh || !node) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return;
        }
 
-       assert(pthread_mutex_unlock(&mesh->mutex) == 0);
+       devtool_get_reset_node_status(mesh, node, status, true);
 }
 
 meshlink_submesh_t **devtool_get_all_submeshes(meshlink_handle_t *mesh, meshlink_submesh_t **submeshes, size_t *nmemb) {
@@ -305,7 +337,9 @@ meshlink_submesh_t **devtool_get_all_submeshes(meshlink_handle_t *mesh, meshlink
        meshlink_submesh_t **result;
 
        //lock mesh->nodes
-       assert(pthread_mutex_lock(&mesh->mutex) == 0);
+       if(pthread_mutex_lock(&mesh->mutex) != 0) {
+               abort();
+       }
 
        *nmemb = mesh->submeshes->count;
        result = realloc(submeshes, *nmemb * sizeof(*submeshes));
@@ -322,7 +356,7 @@ meshlink_submesh_t **devtool_get_all_submeshes(meshlink_handle_t *mesh, meshlink
                meshlink_errno = MESHLINK_ENOMEM;
        }
 
-       assert(pthread_mutex_unlock(&mesh->mutex) == 0);
+       pthread_mutex_unlock(&mesh->mutex);
 
        return result;
 }
@@ -359,3 +393,17 @@ void devtool_force_sptps_renewal(meshlink_handle_t *mesh, meshlink_node_t *node)
                c->last_key_renewal = -3600;
        }
 }
+
+void devtool_set_meta_status_cb(meshlink_handle_t *mesh, meshlink_node_status_cb_t cb) {
+       if(!mesh) {
+               meshlink_errno = MESHLINK_EINVAL;
+               return;
+       }
+
+       if(pthread_mutex_lock(&mesh->mutex) != 0) {
+               abort();
+       }
+
+       mesh->meta_status_cb = cb;
+       pthread_mutex_unlock(&mesh->mutex);
+}