- More fixing. Tinc daemons can now even create activated connections.

[tinc] / src / connlist.c

diff --git a/src/connlist.c b/src/connlist.c
index df10ce3..38c7c8b 100644 (file)
--- 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.6 2000/10/16 19:04:46 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;
     }
 
@@ -114,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
 }
@@ -139,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;
 }
@@ -204,3 +212,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;
+}