- Updated dutch translation.

[tinc] / src / connlist.c

diff --git a/src/connlist.c b/src/connlist.c
index b1e3146..ac6970b 100644 (file)
--- a/src/connlist.c
+++ b/src/connlist.c
@@ -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: connlist.c,v 1.1.2.4 2000/10/15 00:59:34 guus Exp $
+    $Id: connlist.c,v 1.1.2.11 2000/10/29 02:07:39 guus Exp $
 */
 
 #include <syslog.h>
@@ -27,6 +27,7 @@
 #include "conf.h"
 #include <utils.h>
 
+#include "xalloc.h"
 #include "system.h"
 
 /* Root of the connection list */
@@ -57,12 +58,14 @@ cp
     free(p->name);
   if(p->hostname)
     free(p->hostname);
-  if(p->public_key)
-    RSA_free(p->public_key);
+  if(p->rsa_key)
+    RSA_free(p->rsa_key);
   if(p->cipher_pktkey)
     free(p->cipher_pktkey);
   if(p->buffer)
     free(p->buffer);
+  if(p->config)
+    clear_config(&p->config);
   free(p);
 cp
 }
@@ -79,14 +82,7 @@ cp
       next = p->next;
 
       if(p->status.remove)
-       {
-         if(prev)
-           prev->next = next;
-         else
-           conn_list = next;
-
-         free_conn_list(p);
-       }
+        conn_list_del(p);
       else
        prev = p;
 
@@ -120,7 +116,10 @@ void conn_list_add(conn_list_t *cl)
 cp
   cl->next = conn_list;
   cl->prev = NULL;
-  cl->next->prev = cl;
+
+  if(cl->next)
+    cl->next->prev = cl;
+
   conn_list = cl;
 cp
 }
@@ -133,7 +132,9 @@ cp
   else
     conn_list = cl->next;
   
-  cl->next->prev = cl->prev;
+  if(cl->next)
+    cl->next->prev = cl->prev;
+
   free_conn_list(cl);
 cp
 }
@@ -145,41 +146,9 @@ conn_list_t *lookup_id(char *name)
   conn_list_t *p;
 cp
   for(p = conn_list; p != NULL; p = p->next)
-    if(strcmp(name, p->name) == 0)
-      break;
-cp
-  return p;
-}
-
-conn_list_t *lookup_conn_list_mac(mac_t address)
-{
-  conn_list_t *p;
-cp
-  for(p = conn_list; p != NULL; p = p->next)
-    if(lookup_subnet_mac(p->subnets, address))
-      break;
-cp
-  return p;
-}
-
-conn_list_t *lookup_conn_list_ipv4(ipv4_t address)
-{
-  conn_list_t *p;
-cp
-  for(p = conn_list; p != NULL; p = p->next)
-    if(lookup_subnet_ipv4(p->subnets, address))
-      break;
-cp
-  return p;
-}
-
-conn_list_t *lookup_conn_list_ipv6(ipv6_t address)
-{
-  conn_list_t *p;
-cp
-  for(p = conn_list; p != NULL; p = p->next)
-    if(lookup_subnet_ipv6(p->subnets, address))
-      break;
+    if(p->status.active)
+      if(strcmp(name, p->name) == 0)
+        break;
 cp
   return p;
 }
@@ -194,15 +163,27 @@ void dump_conn_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,
+        myself->socket, myself->meta_socket, myself->status);
+
+  for(s = myself->subnets; s != NULL; s = s->next)
+    {
+      netstr = net2str(s);
+      syslog(LOG_DEBUG, "  %s", netstr);
+      free(netstr);
+    }
+
   for(p = conn_list; p != NULL; p = p->next)
     {
-      syslog(LOG_DEBUG, _("%s at %s port %hd flags %d sockets %d, %d status %04x"),
+      syslog(LOG_DEBUG, _(" %s at %s port %hd flags %d sockets %d, %d status %04x"),
             p->name, p->hostname, p->port, p->flags,
             p->socket, p->meta_socket, p->status);
+
       for(s = p->subnets; s != NULL; s = s->next)
         {
           netstr = net2str(s);
-          syslog(LOG_DEBUG, ": %s", netstr);
+          syslog(LOG_DEBUG, "  %s", netstr);
           free(netstr);
         }
     }