X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.c;h=c09ca94aec1d678597005e477220194de68c477a;hb=37ed4265fa73d4c06c74362514d78c92029b2f05;hp=59ff1201cac74a1884264647c46b6eeba08a5e73;hpb=e924096f62655d711cd2d114a8d1ef0fecbb593b;p=tinc

diff --git a/src/connection.c b/src/connection.c
index 59ff1201..c09ca94a 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,15 +17,17 @@
     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.7 2001/01/05 23:53:49 guus Exp $
+    $Id: connection.c,v 1.1.2.13 2001/07/15 18:07:31 guus Exp $
 */
 
 #include "config.h"
 
 #include <stdio.h>
 #include <syslog.h>
+#include <string.h>
 
 #include <avl_tree.h>
+#include <list.h>
 
 #include "net.h"	/* Don't ask. */
 #include "netutl.h"
@@ -40,6 +42,7 @@
 /* Root of the connection list */
 
 avl_tree_t *connection_tree;
+avl_tree_t *active_tree;
 avl_tree_t *id_tree;
 
 /* Pointer to connection describing myself */
@@ -49,6 +52,11 @@ connection_t *myself = NULL;
 /* Initialization and callbacks */
 
 int connection_compare(connection_t *a, connection_t *b)
+{
+  return a->meta_socket - b->meta_socket;
+}
+
+int active_compare(connection_t *a, connection_t *b)
 {
   ipv4_t result;
 
@@ -67,6 +75,7 @@ int id_compare(connection_t *a, connection_t *b)
 void init_connections(void)
 {
   connection_tree = avl_alloc_tree((avl_compare_t)connection_compare, (avl_action_t)free_connection);
+  active_tree = avl_alloc_tree((avl_compare_t)active_compare, NULL);
   id_tree = avl_alloc_tree((avl_compare_t)id_compare, NULL);
 }
 
@@ -77,6 +86,7 @@ connection_t *new_connection(void)
   connection_t *p = (connection_t *)xmalloc_and_zero(sizeof(*p));
 cp
   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 +94,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);
@@ -129,6 +137,7 @@ void destroy_connection_tree(void)
 {
 cp
   avl_delete_tree(id_tree);
+  avl_delete_tree(active_tree);
   avl_delete_tree(connection_tree);
 cp
 }
@@ -142,6 +151,13 @@ cp
 cp
 }
 
+void active_add(connection_t *cl)
+{
+cp
+  avl_insert(active_tree, cl);
+cp
+}
+
 void id_add(connection_t *cl)
 {
 cp
@@ -153,20 +169,21 @@ void connection_del(connection_t *cl)
 {
 cp
   avl_delete(id_tree, cl);
+  avl_delete(active_tree, cl);
   avl_delete(connection_tree, cl);
 cp
 }
 
 /* Lookup functions */
 
-connection_t *lookup_connection(ipv4_t address, short unsigned int port)
+connection_t *lookup_active(ipv4_t address, short unsigned int port)
 {
   connection_t cl;
 cp
   cl.address = address;
   cl.port = port;
 
-  return avl_search(connection_tree, &cl);
+  return avl_search(active_tree, &cl);
 }
 
 connection_t *lookup_id(char *name)
@@ -190,15 +207,15 @@ void dump_connection_list(void)
 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);
 
   for(node = connection_tree->head; node; node = node->next)
     {
       cl = (connection_t *)node->data;
-      syslog(LOG_DEBUG, _(" %s at %s port %hd flags %d sockets %d, %d status %04x"),
-             cl->name, cl->hostname, cl->port, cl->flags,
+      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);
     }