X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=5985cbf0c5ac4317c912c07088862b6c394c76cf;hp=391982a66e2b99a8806ce6a953f4d4365f713270;hb=df3220a1549f992cbf4a9b6e67c1e67b69896c7d;hpb=3c5655f59e85d312d11fa04489123e604920f95b

diff --git a/src/connection.c b/src/connection.c
index 391982a6..5985cbf0 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,7 +1,7 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000-2002 Guus Sliepen <guus@sliepen.warande.net>,
-                  2000-2002 Ivo Timmermans <itimmermans@bigfoot.com>
+    Copyright (C) 2000-2005 Guus Sliepen <guus@tinc-vpn.org>,
+                  2000-2005 Ivo Timmermans <ivo@tinc-vpn.org>
 
     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,121 +17,127 @@
     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.29 2002/03/22 13:31:18 guus Exp $
+    $Id$
 */
 
-#include "config.h"
-
-#include <stdio.h>
-#include <syslog.h>
-#include <string.h>
-#include <sys/time.h>
-
-#include <avl_tree.h>
-#include <list.h>
+#include "system.h"
 
-#include "net.h"	/* Don't ask. */
-#include "netutl.h"
-#include "config.h"
+#include "avl_tree.h"
 #include "conf.h"
-#include <utils.h>
+#include "list.h"
+#include "logger.h"
+#include "net.h"				/* Don't ask. */
+#include "netutl.h"
 #include "subnet.h"
-
+#include "utils.h"
 #include "xalloc.h"
-#include "system.h"
 
 avl_tree_t *connection_tree;	/* Meta connections */
+connection_t *broadcast;
 
-int connection_compare(connection_t *a, connection_t *b)
+static int connection_compare(const connection_t *a, const connection_t *b)
 {
-  return a - b;
+	return (void *)a - (void *)b;
 }
 
 void init_connections(void)
 {
-cp
-  connection_tree = avl_alloc_tree((avl_compare_t)connection_compare, NULL);
-cp
+	cp();
+
+	connection_tree = avl_alloc_tree((avl_compare_t) connection_compare, (avl_action_t) free_connection);
+	broadcast = new_connection();
+	broadcast->name = xstrdup(_("everyone"));
+	broadcast->hostname = xstrdup(_("BROADCAST"));
 }
 
 void exit_connections(void)
 {
-cp
-  avl_delete_tree(connection_tree);
-cp
+	cp();
+
+	avl_delete_tree(connection_tree);
+	free_connection(broadcast);
 }
 
 connection_t *new_connection(void)
 {
-  connection_t *c;
-cp
-  c = (connection_t *)xmalloc_and_zero(sizeof(connection_t));
+	connection_t *c;
+
+	cp();
+
+	c = xmalloc_and_zero(sizeof(connection_t));
 
-  if(!c)
-    return NULL;
+	if(!c)
+		return NULL;
 
-  gettimeofday(&c->start, NULL);
-cp
-  return c;
+	gettimeofday(&c->start, NULL);
+
+	return c;
 }
 
 void free_connection(connection_t *c)
 {
-cp
-  if(c->hostname)
-    free(c->hostname);
-  if(c->inkey)
-    free(c->inkey);
-  if(c->outkey)
-    free(c->outkey);
-  if(c->mychallenge)
-    free(c->mychallenge);
-  if(c->hischallenge)
-    free(c->hischallenge);
-  free(c);
-cp
+	cp();
+
+	if(c->hostname)
+		free(c->hostname);
+
+	if(c->inkey)
+		free(c->inkey);
+
+	if(c->outkey)
+		free(c->outkey);
+
+	if(c->mychallenge)
+		free(c->mychallenge);
+
+	if(c->hischallenge)
+		free(c->hischallenge);
+
+	free(c);
 }
 
 void connection_add(connection_t *c)
 {
-cp
-  avl_insert(connection_tree, c);
-cp
+	cp();
+
+	avl_insert(connection_tree, c);
 }
 
 void connection_del(connection_t *c)
 {
-cp
-  avl_delete(connection_tree, c);
-cp
+	cp();
+
+	avl_delete(connection_tree, c);
 }
 
 void dump_connections(void)
 {
-  avl_node_t *node;
-  connection_t *c;
-cp
-  syslog(LOG_DEBUG, _("Connections:"));
-
-  for(node = connection_tree->head; node; node = node->next)
-    {
-      c = (connection_t *)node->data;
-      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
+	avl_node_t *node;
+	connection_t *c;
+
+	cp();
+
+	logger(LOG_DEBUG, _("Connections:"));
+
+	for(node = connection_tree->head; node; node = node->next) {
+		c = node->data;
+		logger(LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x"),
+			   c->name, c->hostname, c->options, c->socket, *(uint32_t *)&c->status);
+	}
+
+	logger(LOG_DEBUG, _("End of connections."));
 }
 
-int read_connection_config(connection_t *c)
+bool 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;
+	char *fname;
+	int x;
+
+	cp();
+
+	asprintf(&fname, "%s/hosts/%s", confbase, c->name);
+	x = read_config_file(c->config_tree, fname);
+	free(fname);
+
+	return x == 0;
 }