X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=453a25ee99aaa0db65c4a2b85e8948e4b54027e5;hp=61657a3b9d792342d0a6e48e9d6c7f9a19b5e864;hb=4f9dad0972ac0f665a1b6050b059bd52f93e6221;hpb=f8b4a000d008082e5c7e511a49318b8dea8fd08d

diff --git a/src/connection.c b/src/connection.c
index 61657a3b..453a25ee 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,7 +1,7 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000 Guus Sliepen <guus@sliepen.warande.net>,
-                  2000 Ivo Timmermans <itimmermans@bigfoot.com>
+    Copyright (C) 2000,2001 Guus Sliepen <guus@sliepen.warande.net>,
+                  2000,2001 Ivo Timmermans <itimmermans@bigfoot.com>
 
     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,7 +17,7 @@
     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.4 2000/11/22 18:54:07 guus Exp $
+    $Id: connection.c,v 1.1.2.11 2001/06/05 16:09:55 guus Exp $
 */
 
 #include "config.h"
@@ -25,7 +25,8 @@
 #include <stdio.h>
 #include <syslog.h>
 
-#include <rbl.h>
+#include <avl_tree.h>
+#include <list.h>
 
 #include "net.h"	/* Don't ask. */
 #include "netutl.h"
@@ -39,8 +40,10 @@
 
 /* Root of the connection list */
 
-rbltree_t *connection_tree;
-rbltree_t *id_tree;
+avl_tree_t *connection_tree;
+avl_tree_t *id_tree;
+
+/* Pointer to connection describing myself */
 
 connection_t *myself = NULL;
 
@@ -49,6 +52,7 @@ connection_t *myself = NULL;
 int connection_compare(connection_t *a, connection_t *b)
 {
   ipv4_t result;
+
   result = a->address - b->address;
   if(result)
     return result;
@@ -63,20 +67,18 @@ int id_compare(connection_t *a, connection_t *b)
 
 void init_connections(void)
 {
-  connection_tree = new_rbltree((rbl_compare_t)connection_compare, (rbl_action_t)free_connection);
-  id_tree = new_rbltree((rbl_compare_t)id_compare, NULL);
+  connection_tree = avl_alloc_tree((avl_compare_t)connection_compare, (avl_action_t)free_connection);
+  id_tree = avl_alloc_tree((avl_compare_t)id_compare, NULL);
 }
 
 /* Creation and deletion of connection elements */
 
 connection_t *new_connection(void)
 {
-  connection_t *p = (connection_t *)xmalloc(sizeof(*p));
+  connection_t *p = (connection_t *)xmalloc_and_zero(sizeof(*p));
 cp
-  /* initialise all those stupid pointers at once */
-  memset(p, '\0', sizeof(*p));
-
-  p->subnet_tree = new_rbltree((rbl_compare_t)subnet_compare, NULL);
+  p->subnet_tree = avl_alloc_tree((avl_compare_t)subnet_compare, NULL);
+  p->queue = list_alloc((list_action_t)free);
 cp
   return p;
 }
@@ -84,11 +86,9 @@ cp
 void free_connection(connection_t *p)
 {
 cp
-  if(p->sq)
-    destroy_queue(p->sq);
-  if(p->rq)
-    destroy_queue(p->rq);
-  if(p->name && p->name!=unknown)
+  if(p->queue)
+    list_delete_list(p->queue);
+  if(p->name)
     free(p->name);
   if(p->hostname)
     free(p->hostname);
@@ -109,12 +109,13 @@ cp
 */
 void prune_connection_tree(void)
 {
-  rbl_t *rbl;
+  avl_node_t *node, *next;
   connection_t *cl;
 cp
-  RBL_FOREACH(connection_tree, rbl)
+  for(node = connection_tree->head; node; node = next)
     {
-      cl = (connection_t *) rbl->data;
+      next = node->next;
+      cl = (connection_t *)node->data;
       if(cl->status.remove)
         connection_del(cl);
     }
@@ -127,8 +128,8 @@ cp
 void destroy_connection_tree(void)
 {
 cp
-  rbl_delete_rbltree(id_tree);
-  rbl_delete_rbltree(connection_tree);
+  avl_delete_tree(id_tree);
+  avl_delete_tree(connection_tree);
 cp
 }
 
@@ -137,22 +138,22 @@ cp
 void connection_add(connection_t *cl)
 {
 cp
-  rbl_insert(connection_tree, cl);
+  avl_insert(connection_tree, cl);
 cp
 }
 
 void id_add(connection_t *cl)
 {
 cp
-  rbl_insert(id_tree, cl);
+  avl_insert(id_tree, cl);
 cp
 }
 
 void connection_del(connection_t *cl)
 {
 cp
-  rbl_delete(id_tree, cl);
-  rbl_delete(connection_tree, cl);
+  avl_delete(id_tree, cl);
+  avl_delete(connection_tree, cl);
 cp
 }
 
@@ -160,12 +161,12 @@ cp
 
 connection_t *lookup_connection(ipv4_t address, short unsigned int port)
 {
-  connection_t cl, *p;
+  connection_t cl;
 cp
   cl.address = address;
   cl.port = port;
 
-  return rbl_search(connection_tree, &cl);
+  return avl_search(connection_tree, &cl);
 }
 
 connection_t *lookup_id(char *name)
@@ -173,7 +174,7 @@ connection_t *lookup_id(char *name)
   connection_t cl, *p;
 cp
   cl.name = name;
-  p = rbl_search(id_tree, &cl);
+  p = avl_search(id_tree, &cl);
   if(p && p->status.active)
     return p;
   else
@@ -184,20 +185,20 @@ cp
 
 void dump_connection_list(void)
 {
-  rbl_t *rbl;
+  avl_node_t *node;
   connection_t *cl;
 cp
   syslog(LOG_DEBUG, _("Connection list:"));
 
-  syslog(LOG_DEBUG, _(" %s at %s port %hd flags %d sockets %d, %d status %04x"),
-         myself->name, myself->hostname, myself->port, myself->flags,
+  syslog(LOG_DEBUG, _(" %s at %s port %hd options %ld sockets %d, %d status %04x"),
+         myself->name, myself->hostname, myself->port, myself->options,
          myself->socket, myself->meta_socket, myself->status);
 
-  RBL_FOREACH(connection_tree, rbl)
+  for(node = connection_tree->head; node; node = node->next)
     {
-      cl = (connection_t *)rbl->data;
-      syslog(LOG_DEBUG, _(" %s at %s port %hd flags %d sockets %d, %d status %04x"),
-             cl->name, cl->hostname, cl->port, cl->flags,
+      cl = (connection_t *)node->data;
+      syslog(LOG_DEBUG, _(" %s at %s port %hd options %ld sockets %d, %d status %04x"),
+             cl->name, cl->hostname, cl->port, cl->options,
              cl->socket, cl->meta_socket, cl->status);
     }