X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnlist.c;h=9da2d6d1021f87bd0107fcc9b118b9555e8bb07c;hb=60401d99b18ae01d91ca65faf8d2b32fac2b4474;hp=f1b0eba0aeca1a2b4796d3c71ac2dd8528cb20c2;hpb=e9635ae38e0e2e3eb92568a1e234f8348856dd69;p=tinc

diff --git a/src/connlist.c b/src/connlist.c
index f1b0eba0..9da2d6d1 100644
--- 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.3 2000/10/14 17:04:13 guus Exp $
+    $Id: connlist.c,v 1.1.2.7 2000/10/20 15:34:34 guus Exp $
 */
 
 #include <syslog.h>
@@ -53,14 +53,16 @@ cp
     destroy_queue(p->sq);
   if(p->rq)
     destroy_queue(p->rq);
-  if(p->name)
+  if(p->name && p->name!=unknown)
     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);
   free(p);
 cp
 }
@@ -118,7 +120,8 @@ 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
 }
@@ -143,8 +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;
+    if(p->status.active)
+      if(strcmp(name, p->name) == 0)
+        break;
 cp
   return p;
 }
@@ -214,7 +218,7 @@ int read_host_config(conn_list_t *cl)
   char *fname;
   int x;
 cp
-  asprintf(fname, "%s/hosts/%s", confbase, cl->name);
+  asprintf(&fname, "%s/hosts/%s", confbase, cl->name);
   x = read_config_file(&cl->config, fname);
   free(fname);
 cp