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

diff --git a/src/connection.c b/src/connection.c
index 59ff1201..c1acfeab 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.7 2001/01/05 23:53:49 guus Exp $
+    $Id: connection.c,v 1.1.2.10 2001/03/04 13:59:25 guus Exp $
 */
 
 #include "config.h"
@@ -26,6 +26,7 @@
 #include <syslog.h>
 
 #include <avl_tree.h>
+#include <list.h>
 
 #include "net.h"	/* Don't ask. */
 #include "netutl.h"
@@ -77,6 +78,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,10 +86,8 @@ cp
 void free_connection(connection_t *p)
 {
 cp
-  if(p->sq)
-    destroy_queue(p->sq);
-  if(p->rq)
-    destroy_queue(p->rq);
+  if(p->queue)
+    list_delete_list(p->queue);
   if(p->name && p->name!=unknown)
     free(p->name);
   if(p->hostname)
@@ -190,15 +190,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);
     }