Add an example chat application.

[meshlink-tiny] / src / node.c

diff --git a/src/node.c b/src/node.c
index 160bcb38248805e0724930632186c24391c2dfb1..c02644dc020d58c37e11133182514fe3c16894e5 100644 (file)
--- a/src/node.c
+++ b/src/node.c
@@ -25,31 +25,24 @@
 #include "net.h"
 #include "netutl.h"
 #include "node.h"
-#include "splay_tree.h"
 #include "utils.h"
 #include "xalloc.h"
 
-static int node_compare(const node_t *a, const node_t *b) {
-       return strcmp(a->name, b->name);
-}
-
 void init_nodes(meshlink_handle_t *mesh) {
-       mesh->nodes = splay_alloc_tree((splay_compare_t) node_compare, (splay_action_t) free_node);
+       mesh->peer = NULL;
 }
 
 void exit_nodes(meshlink_handle_t *mesh) {
-       if(mesh->nodes) {
-               splay_delete_tree(mesh->nodes);
+       if(mesh->peer) {
+               free_node(mesh->peer);
        }
 
-       mesh->nodes = NULL;
+       mesh->peer = NULL;
 }
 
 node_t *new_node(void) {
        node_t *n = xzalloc(sizeof(*n));
 
-       n->mtu = MTU;
-       n->maxmtu = MTU;
        n->devclass = DEV_CLASS_UNKNOWN;
 
        return n;
@@ -58,16 +51,7 @@ node_t *new_node(void) {
 void free_node(node_t *n) {
        n->status.destroyed = true;
 
-       utcp_exit(n->utcp);
-
-       sockaddrfree(&n->address);
-
        ecdsa_free(n->ecdsa);
-       sptps_stop(&n->sptps);
-
-       if(n->mtutimeout.cb) {
-               abort();
-       }
 
        free(n->name);
        free(n->canonical_address);
@@ -76,22 +60,33 @@ void free_node(node_t *n) {
 }
 
 void node_add(meshlink_handle_t *mesh, node_t *n) {
+       if(n == mesh->self) {
+               return;
+       }
+
+       assert(!mesh->peer);
        n->mesh = mesh;
-       splay_insert(mesh->nodes, n);
+       mesh->peer = n;
 }
 
 void node_del(meshlink_handle_t *mesh, node_t *n) {
-       timeout_del(&mesh->loop, &n->mtutimeout);
-       splay_delete(mesh->nodes, n);
+       if(n == mesh->self) {
+               return;
+       }
+
+       assert(mesh->peer && mesh->peer == n);
+       free_node(n);
+       mesh->peer = NULL;
 }
 
 node_t *lookup_node(meshlink_handle_t *mesh, const char *name) {
-       const node_t n = {.name = (char *)name};
-       node_t *result;
-
-       result = splay_search(mesh->nodes, &n);
-
-       return result;
+       if(mesh->peer && !strcmp(name, mesh->peer->name)) {
+               return mesh->peer;
+       } else if(!strcmp(name, mesh->self->name)) {
+               return mesh->self;
+       } else {
+               return NULL;
+       }
 }
 
 bool node_add_recent_address(meshlink_handle_t *mesh, node_t *n, const sockaddr_t *sa) {