Merge branch 'master' into 1.1

[meshlink] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index a86faa9c6d5aeef9f779d96e3af6c3d6105eaf7d..4a2ba4c09110394e8654f4ecc3728484878ddf3f 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,7 +1,7 @@
 /*
     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-2007 Guus Sliepen <guus@tinc-vpn.org>,
+                  2000-2005 Ivo Timmermans
 
     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
@@ -17,123 +17,120 @@
     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.20 2001/10/27 12:13:17 guus Exp $
+    $Id$
 */
 
-#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 "splay_tree.h"
+#include "cipher.h"
 #include "conf.h"
-#include <utils.h>
+#include "list.h"
+#include "logger.h"
+#include "net.h"                               /* Don't ask. */
+#include "netutl.h"
 #include "subnet.h"
-
+#include "utils.h"
 #include "xalloc.h"
-#include "system.h"
 
-avl_tree_t *connection_tree;   /* Meta connections */
+splay_tree_t *connection_tree; /* Meta connections */
+connection_t *broadcast;
 
-int connection_compare(connection_t *a, connection_t *b)
-{
-  return a->socket - b->socket;
+static int connection_compare(const connection_t *a, const connection_t *b) {
+       return a < b ? -1 : a == b ? 0 : 1;
 }
 
-void init_connections(void)
-{
-cp
-  connection_tree = avl_alloc_tree((avl_compare_t)connection_compare, NULL);
-cp
-}
+void init_connections(void) {
+       cp();
 
-void exit_connection(void)
-{
-cp
-  avl_delete_tree(connection_tree);
-cp
+       connection_tree = splay_alloc_tree((splay_compare_t) connection_compare, (splay_action_t) free_connection);
+       broadcast = new_connection();
+       broadcast->name = xstrdup(_("everyone"));
+       broadcast->hostname = xstrdup(_("BROADCAST"));
 }
 
-connection_t *new_connection(void)
-{
-cp
-  return (connection_t *)xmalloc_and_zero(sizeof(connection_t));
+void exit_connections(void) {
+       cp();
+
+       splay_delete_tree(connection_tree);
+       free_connection(broadcast);
 }
 
-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) {
+       cp();
+
+       return xmalloc_and_zero(sizeof(connection_t));
 }
 
-void connection_add(connection_t *c)
-{
-cp
-  avl_insert(connection_tree, c);
-cp
+void free_connection(connection_t *c) {
+       cp();
+
+       if(!c)
+               return;
+
+       if(c->name)
+               free(c->name);
+
+       if(c->hostname)
+               free(c->hostname);
+
+       cipher_close(&c->incipher);
+       cipher_close(&c->outcipher);
+
+       if(c->hischallenge)
+               free(c->hischallenge);
+
+       if(c->config_tree)
+               exit_configuration(&c->config_tree);
+
+       if(c->buffer)
+               bufferevent_free(c->buffer);
+       
+       if(event_initialized(&c->inevent))
+               event_del(&c->inevent);
+
+       free(c);
 }
 
-void connection_del(connection_t *c)
-{
-cp
-  avl_delete(connection_tree, c);
-cp
+void connection_add(connection_t *c) {
+       cp();
+
+       splay_insert(connection_tree, c);
 }
 
-connection_t *lookup_connection(ipv4_t address, short unsigned int port)
-{
-  connection_t c;
-cp
-  c.address = address;
-  c.port = port;
+void connection_del(connection_t *c) {
+       cp();
 
-  return avl_search(connection_tree, &c);
+       splay_delete(connection_tree, 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
+int dump_connections(struct evbuffer *out) {
+       splay_node_t *node;
+       connection_t *c;
+
+       cp();
+
+       for(node = connection_tree->head; node; node = node->next) {
+               c = node->data;
+               if(evbuffer_add_printf(out,
+                                  _(" %s at %s options %lx socket %d status %04x\n"),
+                                  c->name, c->hostname, c->options, c->socket,
+                                  bitfield_to_int(&c->status, sizeof c->status)) == -1)
+                       return errno;
+       }
+
+       return 0;
 }
 
-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;
+bool read_connection_config(connection_t *c) {
+       char *fname;
+       int x;
+
+       cp();
+
+       xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
+       x = read_config_file(c->config_tree, fname);
+       free(fname);
+
+       return x == 0;
 }