X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=83227cff88e99d5f5ba85a408cf1bafe041f5b6e;hp=f01b2e7a6a69bb6507985f2adc66881e6d37616b;hb=3ef15f2554d1819d6c7d2573dac6039f2e76b638;hpb=5904806dc80830d4eddca857a41db2fc25598201

diff --git a/src/connection.c b/src/connection.c
index f01b2e7a..83227cff 100644
--- a/src/connection.c
+++ b/src/connection.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: connection.c,v 1.1.2.18 2001/10/10 09:42:29 guus Exp $
+    $Id: connection.c,v 1.1.2.25 2001/11/16 12:02:17 zarq 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(*c));
+  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,12 +80,10 @@ void free_connection(connection_t *c)
 cp
   if(c->hostname)
     free(c->hostname);
-  if(c->rsa_key)
-    RSA_free(c->rsa_key);
-  if(c->inpktkey)
-    free(c->inpktkey);
-  if(c->outpktkey)
-    free(c->outpktkey);
+  if(c->inkey)
+    free(c->inkey);
+  if(c->outkey)
+    free(c->outkey);
   if(c->mychallenge)
     free(c->mychallenge);
   if(c->hischallenge)
@@ -99,12 +106,11 @@ cp
 cp
 }
 
-connection_t *lookup_connection(ipv4_t address, short unsigned int port)
+connection_t *lookup_connection(struct addrinfo *address)
 {
   connection_t c;
 cp
   c.address = address;
-  c.port = port;
 
   return avl_search(connection_tree, &c);
 }
@@ -120,10 +126,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,
-             cl->socket, c->status);
+             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;
+}