Move the routing header out of the SPTPS payload.

[meshlink] / src / node.c

diff --git a/src/node.c b/src/node.c
index edf2c85809134bc55581b7a9b5d46d562c2be663..164520aa302c0997b29a36e71f3424c1da48ab62 100644 (file)
--- a/src/node.c
+++ b/src/node.c
@@ -33,114 +33,170 @@ static int node_compare(const node_t *a, const node_t *b) {
        return strcmp(a->name, b->name);
 }
 
+static int node_id_compare(const node_t *a, const node_t *b) {
+       if(a->id < b->id) {
+               return -1;
+       } else if(a->id == b->id) {
+               return 0;
+       } else {
+               return 1;
+       }
+}
+
 void init_nodes(meshlink_handle_t *mesh) {
-       pthread_mutex_lock(&(mesh->nodes_mutex));
        mesh->nodes = splay_alloc_tree((splay_compare_t) node_compare, (splay_action_t) free_node);
-       mesh->node_udp_cache = hash_alloc(0x100, sizeof(sockaddr_t));
-       pthread_mutex_unlock(&(mesh->nodes_mutex));
+       mesh->node_ids = splay_alloc_tree((splay_compare_t) node_id_compare, NULL);
 }
 
 void exit_nodes(meshlink_handle_t *mesh) {
-       pthread_mutex_lock(&(mesh->nodes_mutex));
-       if(mesh->node_udp_cache)
-               hash_free(mesh->node_udp_cache);
-       if(mesh->nodes)
+       if(mesh->nodes) {
                splay_delete_tree(mesh->nodes);
-       mesh->node_udp_cache = NULL;
+       }
+
+       if(mesh->node_ids) {
+               splay_delete_tree(mesh->node_ids);
+       }
+
        mesh->nodes = NULL;
-       pthread_mutex_unlock(&(mesh->nodes_mutex));
+       mesh->node_ids = NULL;
 }
 
 node_t *new_node(void) {
-       node_t *n = xzalloc(sizeof *n);
+       node_t *n = xzalloc(sizeof(*n));
 
-       if(replaywin) n->late = xzalloc(replaywin);
        n->edge_tree = new_edge_tree();
        n->mtu = MTU;
        n->maxmtu = MTU;
+       n->devclass = _DEV_CLASS_MAX;
 
        return n;
 }
 
 void free_node(node_t *n) {
-       if(n->edge_tree)
+       n->status.destroyed = true;
+
+       utcp_exit(n->utcp);
+
+       if(n->edge_tree) {
                free_edge_tree(n->edge_tree);
+       }
 
        sockaddrfree(&n->address);
 
        ecdsa_free(n->ecdsa);
        sptps_stop(&n->sptps);
 
-       if(n->mtutimeout.cb)
+       if(n->mtutimeout.cb) {
                abort();
+       }
 
-       if(n->hostname)
-               free(n->hostname);
-
-       if(n->name)
-               free(n->name);
-
-       if(n->late)
-               free(n->late);
+       free(n->name);
 
        free(n);
 }
 
 void node_add(meshlink_handle_t *mesh, node_t *n) {
-       pthread_mutex_lock(&(mesh->nodes_mutex));
        n->mesh = mesh;
        splay_insert(mesh->nodes, n);
-       pthread_mutex_unlock(&(mesh->nodes_mutex));
+       update_node_id(mesh, n);
 }
 
 void node_del(meshlink_handle_t *mesh, node_t *n) {
-       pthread_mutex_lock(&(mesh->nodes_mutex));
        timeout_del(&mesh->loop, &n->mtutimeout);
 
-       for splay_each(edge_t, e, n->edge_tree)
+       for splay_each(edge_t, e, n->edge_tree) {
                edge_del(mesh, e);
+       }
 
        splay_delete(mesh->nodes, n);
-       pthread_mutex_unlock(&(mesh->nodes_mutex));
 }
 
 node_t *lookup_node(meshlink_handle_t *mesh, const char *name) {
-       node_t n = {NULL};
-       node_t* result;
+       const node_t n = {.name = (char *)name};
+       return splay_search(mesh->nodes, &n);
+}
 
-       n.name = name;
+node_t *lookup_node_id(meshlink_handle_t *mesh, uint64_t id) {
+       const node_t n = {.id = id};
+       return splay_search(mesh->node_ids, &n);
+}
 
-       pthread_mutex_lock(&(mesh->nodes_mutex));
-       result = splay_search(mesh->nodes, &n);
-       pthread_mutex_unlock(&(mesh->nodes_mutex));
+void update_node_id(meshlink_handle_t *mesh, node_t *n) {
+       if(n->id) {
+               logger(mesh, LOG_WARNING, "Node %s already has id %"PRIu64"\n", n->name, n->id);
+               return;
+       }
 
-       return result;
-}
+       struct {
+               uint8_t public[32];
+               uint32_t gen;
+       } input;
+
+       uint8_t hash[64];
+       uint64_t id;
 
-node_t *lookup_node_udp(meshlink_handle_t *mesh, const sockaddr_t *sa) {
-       return hash_search(mesh->node_udp_cache, sa);
+       memset(&input, 0, sizeof input);
+
+       strncpy(input.public, n->name, sizeof input.public);
+       input.gen = 0;
+
+       while(true) {
+               sha512(&input, sizeof input, hash);
+               memcpy(&id, hash, sizeof id);
+               input.gen++;
+
+               // ID 0 is reserved
+               if(!id) {
+                       continue;
+               }
+
+               // Check if there is a conflict with an existing node
+               node_t *other = lookup_node_id(mesh, id);
+               int cmp = other ? strcmp(n->name, other->name) : 0;
+
+               // If yes and we sort after the other, try again
+               if(cmp > 0) {
+                       continue;
+               }
+
+               if(other) {
+                       splay_delete(mesh->node_ids, other);
+               }
+
+               n->id = id;
+               splay_insert(mesh->node_ids, n);
+
+               if(other) {
+                       update_node_id(mesh, other);
+               }
+
+               break;
+       }
 }
 
 void update_node_udp(meshlink_handle_t *mesh, node_t *n, const sockaddr_t *sa) {
        if(n == mesh->self) {
-               logger(DEBUG_ALWAYS, LOG_WARNING, "Trying to update UDP address of mesh->self!");
+               logger(mesh, MESHLINK_WARNING, "Trying to update UDP address of mesh->self!");
                return;
        }
 
-       hash_insert(mesh->node_udp_cache, &n->address, NULL);
-
        if(sa) {
                n->address = *sa;
                n->sock = 0;
+
                for(int i = 0; i < mesh->listen_sockets; i++) {
                        if(mesh->listen_socket[i].sa.sa.sa_family == sa->sa.sa_family) {
                                n->sock = i;
                                break;
                        }
                }
-               hash_insert(mesh->node_udp_cache, sa, n);
-               free(n->hostname);
-               n->hostname = sockaddr2hostname(&n->address);
-               logger(DEBUG_PROTOCOL, LOG_DEBUG, "UDP address of %s set to %s", n->name, n->hostname);
+
+               meshlink_hint_address(mesh, (meshlink_node_t *)n, &sa->sa);
+
+               if(mesh->log_level >= MESHLINK_DEBUG) {
+                       char *hostname = sockaddr2hostname(&n->address);
+                       logger(mesh, MESHLINK_DEBUG, "UDP address of %s set to %s", n->name, hostname);
+                       free(hostname);
+               }
        }
 }