X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=815de4ba29a914816a1c0cb685d9393fad58297e;hp=d606e9c3a1c0c3cc2591bc01a7e624f0cb7f3ee4;hb=f0aa9641e82fb6e09c1e485366d14dddaa7f7c36;hpb=0bbace18e96cd6fc32dfa23ffd55f73ff96e8c6f

diff --git a/src/connection.c b/src/connection.c
index d606e9c3..815de4ba 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,7 +1,7 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000,2001 Guus Sliepen <guus@sliepen.warande.net>,
-                  2000,2001 Ivo Timmermans <itimmermans@bigfoot.com>
+    Copyright (C) 2000-2002 Guus Sliepen <guus@sliepen.warande.net>,
+                  2000-2002 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.19 2001/10/10 20:35:10 guus Exp $
+    $Id: connection.c,v 1.1.2.27 2002/02/10 21:57:53 guus Exp $
 */
 
 #include "config.h"
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <syslog.h>
 #include <string.h>
+#include <sys/time.h>
 
 #include <avl_tree.h>
 #include <list.h>
@@ -53,7 +54,7 @@ cp
 cp
 }
 
-void exit_connection(void)
+void exit_connections(void)
 {
 cp
   avl_delete_tree(connection_tree);
@@ -62,8 +63,16 @@ cp
 
 connection_t *new_connection(void)
 {
+  connection_t *c;
 cp
-  return (connection_t *)xmalloc_and_zero(sizeof(connection_t));
+  c = (connection_t *)xmalloc_and_zero(sizeof(connection_t));
+
+  if(!c)
+    return NULL;
+
+  gettimeofday(&c->start, NULL);
+cp
+  return c;
 }
 
 void free_connection(connection_t *c)
@@ -71,8 +80,6 @@ void free_connection(connection_t *c)
 cp
   if(c->hostname)
     free(c->hostname);
-  if(c->rsa_key)
-    RSA_free(c->rsa_key);
   if(c->inkey)
     free(c->inkey);
   if(c->outkey)
@@ -99,7 +106,7 @@ cp
 cp
 }
 
-connection_t *lookup_connection(ipv4_t address, short unsigned int port)
+connection_t *lookup_connection(ipv4_t address, port_t port)
 {
   connection_t c;
 cp
@@ -120,10 +127,22 @@ cp
     {
       c = (connection_t *)node->data;
       syslog(LOG_DEBUG, _(" %s at %s port %hd options %ld socket %d status %04x"),
-             c->node->name, c->hostname, c->port, c->options,
+             c->name, c->hostname, c->port, c->options,
              c->socket, c->status);
     }
     
   syslog(LOG_DEBUG, _("End of connections."));
 cp
 }
+
+int read_connection_config(connection_t *c)
+{
+  char *fname;
+  int x;
+cp
+  asprintf(&fname, "%s/hosts/%s", confbase, c->name);
+  x = read_config_file(c->config_tree, fname);
+  free(fname);
+cp
+  return x;
+}