X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=d39f43ff71ee4b163e2e3a6622065a40340512d5;hp=e8a53eccc94cd885f7ee38b0c724f9a4850b89d7;hb=d917c8cb6b69475d568ccbe82389b9f2b3eb5e80;hpb=627f7c22b447bd464b536cd016278545674df93d

diff --git a/src/connection.c b/src/connection.c
index e8a53ecc..d39f43ff 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,7 +1,8 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000-2002 Guus Sliepen <guus@sliepen.eu.org>,
-                  2000-2002 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2000-2012 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
@@ -13,125 +14,93 @@
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    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.30 2002/06/21 10:11:12 guus Exp $
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 
-#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 "list.h"
+#include "cipher.h"
 #include "conf.h"
-#include <utils.h>
+#include "control_common.h"
+#include "list.h"
+#include "logger.h"
 #include "subnet.h"
-
+#include "utils.h"
 #include "xalloc.h"
-#include "system.h"
 
-avl_tree_t *connection_tree;	/* Meta connections */
+list_t *connection_list;
+connection_t *everyone;
 
-int connection_compare(connection_t *a, connection_t *b)
-{
-  return a - b;
+void init_connections(void) {
+	connection_list = list_alloc((list_action_t) free_connection);
+	everyone = new_connection();
+	everyone->name = xstrdup("everyone");
+	everyone->hostname = xstrdup("BROADCAST");
 }
 
-void init_connections(void)
-{
-cp
-  connection_tree = avl_alloc_tree((avl_compare_t)connection_compare, NULL);
-cp
+void exit_connections(void) {
+	list_delete_list(connection_list);
+	free_connection(everyone);
 }
 
-void exit_connections(void)
-{
-cp
-  avl_delete_tree(connection_tree);
-cp
+connection_t *new_connection(void) {
+	return xmalloc_and_zero(sizeof(connection_t));
 }
 
-connection_t *new_connection(void)
-{
-  connection_t *c;
-cp
-  c = (connection_t *)xmalloc_and_zero(sizeof(connection_t));
+void free_connection(connection_t *c) {
+	if(!c)
+		return;
 
-  if(!c)
-    return NULL;
+	cipher_close(&c->incipher);
+	digest_close(&c->indigest);
+	cipher_close(&c->outcipher);
+	digest_close(&c->outdigest);
 
-  gettimeofday(&c->start, NULL);
-cp
-  return c;
-}
+	sptps_stop(&c->sptps);
+	ecdsa_free(&c->ecdsa);
+	rsa_free(&c->rsa);
 
-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
-}
+	free(c->hischallenge);
 
-void connection_add(connection_t *c)
-{
-cp
-  avl_insert(connection_tree, c);
-cp
+	buffer_clear(&c->inbuf);
+	buffer_clear(&c->outbuf);
+
+	if(event_initialized(&c->inevent))
+		event_del(&c->inevent);
+
+	if(event_initialized(&c->outevent))
+		event_del(&c->outevent);
+
+	if(c->socket > 0)
+		closesocket(c->socket);
+
+	free(c->name);
+	free(c->hostname);
+
+	if(c->config_tree)
+		exit_configuration(&c->config_tree);
+
+	free(c);
 }
 
-void connection_del(connection_t *c)
-{
-cp
-  avl_delete(connection_tree, c);
-cp
+void connection_add(connection_t *c) {
+	list_insert_tail(connection_list, 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
+void connection_del(connection_t *c) {
+	list_delete(connection_list, c);
 }
 
-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;
+bool dump_connections(connection_t *cdump) {
+	for list_each(connection_t, c, connection_list) {
+		send_request(cdump, "%d %d %s %s %x %d %x",
+				CONTROL, REQ_DUMP_CONNECTIONS,
+				c->name, c->hostname, c->options, c->socket,
+				bitfield_to_int(&c->status, sizeof c->status));
+	}
+
+	return send_request(cdump, "%d %d", CONTROL, REQ_DUMP_CONNECTIONS);
 }