Avoid allocating packet buffers unnecessarily.

[meshlink] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index 6e942f8eb96a03a92b7e122a59b2a133cdab5f37..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,120 +19,73 @@
 
 #include "system.h"
 
-#include "avl_tree.h"
+#include "list.h"
 #include "conf.h"
+#include "connection.h"
 #include "list.h"
 #include "logger.h"
-#include "net.h"                               /* Don't ask. */
-#include "netutl.h"
-#include "subnet.h"
+#include "meshlink_internal.h"
 #include "utils.h"
 #include "xalloc.h"
 
-avl_tree_t *connection_tree;   /* Meta connections */
-connection_t *broadcast;
+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 = avl_alloc_tree((avl_compare_t) connection_compare, (avl_action_t) free_connection);
-       broadcast = new_connection();
-       broadcast->name = xstrdup("everyone");
-       broadcast->hostname = xstrdup("BROADCAST");
-}
+void exit_connections(meshlink_handle_t *mesh) {
+       if(mesh->connections) {
+               list_delete_list(mesh->connections);
+       }
 
-void exit_connections(void) {
-       avl_delete_tree(connection_tree);
-       free_connection(broadcast);
+       if(mesh->everyone) {
+               free_connection(mesh->everyone);
+       }
+
+       mesh->connections = NULL;
+       mesh->everyone = NULL;
 }
 
 connection_t *new_connection(void) {
-       connection_t *c;
-
-       c = xmalloc_and_zero(sizeof(connection_t));
-
-       if(!c)
-               return NULL;
-
-       gettimeofday(&c->start, NULL);
-
-       return c;
+       return xzalloc(sizeof(connection_t));
 }
 
 void free_connection(connection_t *c) {
-       if(c->name)
-               free(c->name);
+       assert(c);
 
-       if(c->hostname)
-               free(c->hostname);
+       sptps_stop(&c->sptps);
+       ecdsa_free(c->ecdsa);
 
-       if(c->inkey)
-               free(c->inkey);
+       buffer_clear(&c->inbuf);
+       buffer_clear(&c->outbuf);
 
-       if(c->outkey)
-               free(c->outkey);
-
-       if(c->inctx) {
-               EVP_CIPHER_CTX_cleanup(c->inctx);
-               free(c->inctx);
+       if(c->io.cb) {
+               abort();
        }
 
-       if(c->outctx) {
-               EVP_CIPHER_CTX_cleanup(c->outctx);
-               free(c->outctx);
+       if(c->socket > 0) {
+               closesocket(c->socket);
        }
 
-       if(c->mychallenge)
-               free(c->mychallenge);
-
-       if(c->hischallenge)
-               free(c->hischallenge);
-
-       if(c->config_tree)
-               exit_configuration(&c->config_tree);
-
-       if(c->outbuf)
-               free(c->outbuf);
-
-       if(c->rsa_key)
-               RSA_free(c->rsa_key);
+       free(c->name);
 
        free(c);
 }
 
-void connection_add(connection_t *c) {
-       avl_insert(connection_tree, c);
-}
+void connection_add(meshlink_handle_t *mesh, connection_t *c) {
+       assert(c);
 
-void connection_del(connection_t *c) {
-       avl_delete(connection_tree, c);
+       c->mesh = mesh;
+       list_insert_tail(mesh->connections, c);
 }
 
-void dump_connections(void) {
-       avl_node_t *node;
-       connection_t *c;
-
-       logger(LOG_DEBUG, "Connections:");
-
-       for(node = connection_tree->head; node; node = node->next) {
-               c = node->data;
-               logger(LOG_DEBUG, " %s at %s options %lx socket %d status %04x outbuf %d/%d/%d",
-                          c->name, c->hostname, c->options, c->socket, bitfield_to_int(&c->status, sizeof c->status),
-                          c->outbufsize, c->outbufstart, c->outbuflen);
-       }
-
-       logger(LOG_DEBUG, "End of connections.");
-}
-
-bool read_connection_config(connection_t *c) {
-       char *fname;
-       int x;
-
-       xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
-       x = read_config_file(c->config_tree, fname);
-       free(fname);
+void connection_del(meshlink_handle_t *mesh, connection_t *c) {
+       assert(c);
 
-       return x == 0;
+       io_del(&mesh->loop, &c->io);
+       list_delete(mesh->connections, c);
 }