X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnlist.c;h=b1e3146bc6732a35dcbde34929368a49aa89ed5b;hp=df10ce37b2ab2b916de06863cdef4b229a63e3dd;hb=3b455b8f318528206b08121f5ce93d16e4ea01df;hpb=183a8edd22ba4bc682392c73ae02fc9e121eda68

diff --git a/src/connlist.c b/src/connlist.c
index df10ce37..b1e3146b 100644
--- a/src/connlist.c
+++ b/src/connlist.c
@@ -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: connlist.c,v 1.1.2.2 2000/10/11 22:00:58 guus Exp $
+    $Id: connlist.c,v 1.1.2.4 2000/10/15 00:59:34 guus Exp $
 */
 
 #include <syslog.h>
 
+#include "net.h"	/* Don't ask. */
 #include "config.h"
+#include "conf.h"
 #include <utils.h>
 
-#include "net.h"	/* Don't ask. */
+#include "system.h"
 
 /* Root of the connection list */
 
@@ -51,12 +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);
-  free_key(p->public_key);
-  free_key(p->datakey);
+  if(p->public_key)
+    RSA_free(p->public_key);
+  if(p->cipher_pktkey)
+    free(p->cipher_pktkey);
+  if(p->buffer)
+    free(p->buffer);
   free(p);
 cp
 }
@@ -79,7 +85,7 @@ cp
 	  else
 	    conn_list = next;
 
-	  free_conn_element(p);
+	  free_conn_list(p);
 	}
       else
 	prev = p;
@@ -99,7 +105,7 @@ cp
   for(p = conn_list; p != NULL; )
     {
       next = p->next;
-      free_conn_element(p);
+      free_conn_list(p);
       p = next;
     }
 
@@ -204,3 +210,15 @@ cp
   syslog(LOG_DEBUG, _("End of connection list."));
 cp
 }
+
+int read_host_config(conn_list_t *cl)
+{
+  char *fname;
+  int x;
+cp
+  asprintf(&fname, "%s/hosts/%s", confbase, cl->name);
+  x = read_config_file(&cl->config, fname);
+  free(fname);
+cp
+  return x;
+}