Avoid allocating packet buffers unnecessarily.

[meshlink] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index ccc41252d35960e8a5343ef3aceff404b0da9195..9cc64914cd4ba217a85d824f9ff378e5f41884b1 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,7 +1,6 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000,2001 Guus Sliepen <guus@sliepen.warande.net>,
-                  2000,2001 Ivo Timmermans <itimmermans@bigfoot.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
@@ -13,131 +12,80 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id: connection.c,v 1.1.2.21 2001/10/27 15:19:13 guus Exp $
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#include "config.h"
-
-#include <stdio.h>
-#include <syslog.h>
-#include <string.h>
-
-#include <avl_tree.h>
-#include <list.h>
+#include "system.h"
 
-#include "net.h"       /* Don't ask. */
-#include "netutl.h"
-#include "config.h"
+#include "list.h"
 #include "conf.h"
-#include <utils.h>
-#include "subnet.h"
-
+#include "connection.h"
+#include "list.h"
+#include "logger.h"
+#include "meshlink_internal.h"
+#include "utils.h"
 #include "xalloc.h"
-#include "system.h"
 
-avl_tree_t *connection_tree;   /* Meta connections */
+void init_connections(meshlink_handle_t *mesh) {
+       assert(!mesh->connections);
+       assert(!mesh->everyone);
 
-int connection_compare(connection_t *a, connection_t *b)
-{
-  return a->socket - b->socket;
+       mesh->connections = list_alloc((list_action_t) free_connection);
+       mesh->everyone = new_connection();
+       mesh->everyone->name = xstrdup("mesh->everyone");
 }
 
-void init_connections(void)
-{
-cp
-  connection_tree = avl_alloc_tree((avl_compare_t)connection_compare, NULL);
-cp
-}
+void exit_connections(meshlink_handle_t *mesh) {
+       if(mesh->connections) {
+               list_delete_list(mesh->connections);
+       }
 
-void exit_connection(void)
-{
-cp
-  avl_delete_tree(connection_tree);
-cp
-}
+       if(mesh->everyone) {
+               free_connection(mesh->everyone);
+       }
 
-connection_t *new_connection(void)
-{
-  connection_t *c;
-cp
-  c = (connection_t *)xmalloc_and_zero(sizeof(connection_t));
-  init_configuration(&c->config_tree);
-cp
-  return c;
+       mesh->connections = NULL;
+       mesh->everyone = NULL;
 }
 
-void free_connection(connection_t *c)
-{
-cp
-  if(c->hostname)
-    free(c->hostname);
-  if(c->inkey)
-    free(c->inkey);
-  if(c->outkey)
-    free(c->outkey);
-  if(c->mychallenge)
-    free(c->mychallenge);
-  if(c->hischallenge)
-    free(c->hischallenge);
-  free(c);
-cp
+connection_t *new_connection(void) {
+       return xzalloc(sizeof(connection_t));
 }
 
-void connection_add(connection_t *c)
-{
-cp
-  avl_insert(connection_tree, c);
-cp
-}
+void free_connection(connection_t *c) {
+       assert(c);
 
-void connection_del(connection_t *c)
-{
-cp
-  avl_delete(connection_tree, c);
-cp
-}
+       sptps_stop(&c->sptps);
+       ecdsa_free(c->ecdsa);
+
+       buffer_clear(&c->inbuf);
+       buffer_clear(&c->outbuf);
+
+       if(c->io.cb) {
+               abort();
+       }
 
-connection_t *lookup_connection(ipv4_t address, short unsigned int port)
-{
-  connection_t c;
-cp
-  c.address = address;
-  c.port = port;
+       if(c->socket > 0) {
+               closesocket(c->socket);
+       }
 
-  return avl_search(connection_tree, &c);
+       free(c->name);
+
+       free(c);
 }
 
-void dump_connections(void)
-{
-  avl_node_t *node;
-  connection_t *c;
-cp
-  syslog(LOG_DEBUG, _("Connections:"));
-
-  for(node = connection_tree->head; node; node = node->next)
-    {
-      c = (connection_t *)node->data;
-      syslog(LOG_DEBUG, _(" %s at %s port %hd options %ld socket %d status %04x"),
-             c->name, c->hostname, c->port, c->options,
-             c->socket, c->status);
-    }
-    
-  syslog(LOG_DEBUG, _("End of connections."));
-cp
+void connection_add(meshlink_handle_t *mesh, connection_t *c) {
+       assert(c);
+
+       c->mesh = mesh;
+       list_insert_tail(mesh->connections, c);
 }
 
-int read_connection_config(connection_t *c)
-{
-  char *fname;
-  int x;
-cp
-  asprintf(&fname, "%s/hosts/%s", confbase, c->name);
-  x = read_config_file(c->config_tree, fname);
-  free(fname);
-cp
-  return x;
+void connection_del(meshlink_handle_t *mesh, connection_t *c) {
+       assert(c);
+
+       io_del(&mesh->loop, &c->io);
+       list_delete(mesh->connections, c);
 }