Avoid allocating packet buffers unnecessarily.

[meshlink] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index ee44e539acabadccf7a5818519a593eaec0b5495..9cc64914cd4ba217a85d824f9ff378e5f41884b1 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,8 +1,6 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000-2009 Guus Sliepen <guus@tinc-vpn.org>,
-                  2000-2005 Ivo Timmermans
-                  2008      Max Rijevski <maksuf@gmail.com>
+    Copyright (C) 2000-2013 Guus Sliepen <guus@meshlink.io>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -21,98 +19,73 @@
 
 #include "system.h"
 
-#include "splay_tree.h"
-#include "cipher.h"
+#include "list.h"
 #include "conf.h"
-#include "control_common.h"
+#include "connection.h"
 #include "list.h"
 #include "logger.h"
-#include "subnet.h"
+#include "meshlink_internal.h"
 #include "utils.h"
 #include "xalloc.h"
 
-splay_tree_t *connection_tree; /* Meta connections */
-connection_t *everyone;
+void init_connections(meshlink_handle_t *mesh) {
+       assert(!mesh->connections);
+       assert(!mesh->everyone);
 
-static int connection_compare(const connection_t *a, const connection_t *b) {
-       return a < b ? -1 : a == b ? 0 : 1;
+       mesh->connections = list_alloc((list_action_t) free_connection);
+       mesh->everyone = new_connection();
+       mesh->everyone->name = xstrdup("mesh->everyone");
 }
 
-void init_connections(void) {
-       connection_tree = splay_alloc_tree((splay_compare_t) connection_compare, (splay_action_t) free_connection);
-       everyone = new_connection();
-       everyone->name = xstrdup("everyone");
-       everyone->hostname = xstrdup("BROADCAST");
-}
+void exit_connections(meshlink_handle_t *mesh) {
+       if(mesh->connections) {
+               list_delete_list(mesh->connections);
+       }
+
+       if(mesh->everyone) {
+               free_connection(mesh->everyone);
+       }
 
-void exit_connections(void) {
-       splay_delete_tree(connection_tree);
-       free_connection(everyone);
+       mesh->connections = NULL;
+       mesh->everyone = NULL;
 }
 
 connection_t *new_connection(void) {
-       return xmalloc_and_zero(sizeof(connection_t));
+       return xzalloc(sizeof(connection_t));
 }
 
 void free_connection(connection_t *c) {
-       if(!c)
-               return;
-
-       if(c->name)
-               free(c->name);
-
-       if(c->hostname)
-               free(c->hostname);
-
-       cipher_close(&c->incipher);
-       digest_close(&c->indigest);
-       cipher_close(&c->outcipher);
-       digest_close(&c->outdigest);
+       assert(c);
 
        sptps_stop(&c->sptps);
-       ecdsa_free(&c->ecdsa);
-       rsa_free(&c->rsa);
-
-       if(c->hischallenge)
-               free(c->hischallenge);
-
-       if(c->config_tree)
-               exit_configuration(&c->config_tree);
+       ecdsa_free(c->ecdsa);
 
        buffer_clear(&c->inbuf);
        buffer_clear(&c->outbuf);
-       
-       if(event_initialized(&c->inevent))
-               event_del(&c->inevent);
 
-       if(event_initialized(&c->outevent))
-               event_del(&c->outevent);
+       if(c->io.cb) {
+               abort();
+       }
 
-       if(c->socket > 0)
+       if(c->socket > 0) {
                closesocket(c->socket);
+       }
+
+       free(c->name);
 
        free(c);
 }
 
-void connection_add(connection_t *c) {
-       splay_insert(connection_tree, c);
-}
+void connection_add(meshlink_handle_t *mesh, connection_t *c) {
+       assert(c);
 
-void connection_del(connection_t *c) {
-       splay_delete(connection_tree, c);
+       c->mesh = mesh;
+       list_insert_tail(mesh->connections, c);
 }
 
-bool dump_connections(connection_t *cdump) {
-       splay_node_t *node;
-       connection_t *c;
-
-       for(node = connection_tree->head; node; node = node->next) {
-               c = node->data;
-               send_request(cdump, "%d %d %s at %s options %x socket %d status %04x",
-                               CONTROL, REQ_DUMP_CONNECTIONS,
-                               c->name, c->hostname, c->options, c->socket,
-                               bitfield_to_int(&c->status, sizeof c->status));
-       }
+void connection_del(meshlink_handle_t *mesh, connection_t *c) {
+       assert(c);
 
-       return send_request(cdump, "%d %d", CONTROL, REQ_DUMP_CONNECTIONS);
+       io_del(&mesh->loop, &c->io);
+       list_delete(mesh->connections, c);
 }