X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=0211845b89521aa6a077a20a4a9b3bd83559f7a4;hp=7c8cd0ba83e3c326a47505f8f8cd175403926bfe;hb=ae5249610954af17c68c547bb1b45ad286ad647e;hpb=a227843b739d279b63adcf3736ebb03d856080c4

diff --git a/src/connection.c b/src/connection.c
index 7c8cd0ba..0211845b 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -2,6 +2,7 @@
     connection.c -- connection list management
     Copyright (C) 2000-2009 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
+                  2008      Max Rijevski <maksuf@gmail.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
@@ -22,16 +23,13 @@
 
 #include "avl_tree.h"
 #include "conf.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"
 
 avl_tree_t *connection_tree;	/* Meta connections */
-connection_t *broadcast;
+connection_t *everyone;
 
 static int connection_compare(const connection_t *a, const connection_t *b) {
 	return a < b ? -1 : a == b ? 0 : 1;
@@ -39,14 +37,14 @@ static int connection_compare(const connection_t *a, const connection_t *b) {
 
 void init_connections(void) {
 	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"));
+	everyone = new_connection();
+	everyone->name = xstrdup("everyone");
+	everyone->hostname = xstrdup("BROADCAST");
 }
 
 void exit_connections(void) {
 	avl_delete_tree(connection_tree);
-	free_connection(broadcast);
+	free_connection(everyone);
 }
 
 connection_t *new_connection(void) {
@@ -115,25 +113,14 @@ void dump_connections(void) {
 	avl_node_t *node;
 	connection_t *c;
 
-	logger(LOG_DEBUG, _("Connections:"));
+	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 outbuf %d/%d/%d"),
+		logger(LOG_DEBUG, " %s at %s options %x socket %d status %04x outbuf %d/%d/%d",
 			   c->name, c->hostname, c->options, c->socket, bitfield_to_int(&c->status, sizeof c->status),
 			   c->outbufsize, c->outbufstart, c->outbuflen);
 	}
 
-	logger(LOG_DEBUG, _("End of connections."));
-}
-
-bool read_connection_config(connection_t *c) {
-	char *fname;
-	int x;
-
-	xasprintf(&fname, "%s/hosts/%s", confbase, c->name);
-	x = read_config_file(c->config_tree, fname);
-	free(fname);
-
-	return x == 0;
+	logger(LOG_DEBUG, "End of connections.");
 }