Generalized request broadcasting/forwarding.

[tinc] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index f01b2e7..642bfac 100644 (file)
--- 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.eu.org>,
+                  2000-2002 Ivo Timmermans <ivo@o2w.nl>
 
     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.18 2001/10/10 09:42:29 guus Exp $
+    $Id: connection.c,v 1.1.2.31 2002/09/04 16:26:44 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>
@@ -40,30 +41,45 @@
 #include "system.h"
 
 avl_tree_t *connection_tree;   /* Meta connections */
+connection_t *broadcast;
 
 int connection_compare(connection_t *a, connection_t *b)
 {
-  return a->socket - b->socket;
+  return a - b;
 }
 
 void init_connections(void)
 {
 cp
   connection_tree = avl_alloc_tree((avl_compare_t)connection_compare, NULL);
+cp
+  broadcast = new_connection();
+  broadcast->name = xstrdup(_("everyone"));
+  broadcast->hostname = xstrdup(_("BROADCAST"));
 cp
 }
 
-void exit_connection(void)
+void exit_connections(void)
 {
 cp
   avl_delete_tree(connection_tree);
+cp
+  free_connection(broadcast);
 cp
 }
 
 connection_t *new_connection(void)
 {
+  connection_t *c;
+cp
+  c = (connection_t *)xmalloc_and_zero(sizeof(connection_t));
+
+  if(!c)
+    return NULL;
+
+  gettimeofday(&c->start, NULL);
 cp
-  return (connection_t *)xmalloc_and_zero(sizeof(*c));
+  return c;
 }
 
 void free_connection(connection_t *c)
@@ -71,12 +87,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,16 +113,6 @@ cp
 cp
 }
 
-connection_t *lookup_connection(ipv4_t address, short unsigned int port)
-{
-  connection_t c;
-cp
-  c.address = address;
-  c.port = port;
-
-  return avl_search(connection_tree, &c);
-}
-
 void dump_connections(void)
 {
   avl_node_t *node;
@@ -119,11 +123,22 @@ cp
   for(node = connection_tree->head; node; node = node->next)
     {
       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);
+      syslog(LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x"),
+             c->name, c->hostname, 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;
+}