X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=089ff0de1babbdb5717d8382e2366e5d560fb058;hp=9fd23a75d2e519d8d8d48b0ad4384fd977334f4a;hb=f75dcef72a81a337e847adf0bae54198894f65b9;hpb=5fc1ed17f41f0c535cf57a4b7e00cd6d45759503

diff --git a/src/connection.c b/src/connection.c
index 9fd23a75..089ff0de 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.32 2002/09/09 19:39:58 guus Exp $
+    $Id: connection.c,v 1.1.2.33 2002/09/09 21:24:31 guus Exp $
 */
 
 #include "config.h"
@@ -30,7 +30,7 @@
 #include <avl_tree.h>
 #include <list.h>
 
-#include "net.h"	/* Don't ask. */
+#include "net.h"				/* Don't ask. */
 #include "netutl.h"
 #include "config.h"
 #include "conf.h"
@@ -43,102 +43,109 @@
 avl_tree_t *connection_tree;	/* Meta connections */
 connection_t *broadcast;
 
-int connection_compare(connection_t *a, connection_t *b)
+int connection_compare(connection_t * a, connection_t * b)
 {
-  return a - b;
+	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();
+	cp();
+
+	connection_tree = avl_alloc_tree((avl_compare_t) connection_compare, NULL);
+	broadcast = new_connection();
+	broadcast->name = xstrdup(_("everyone"));
+	broadcast->hostname = xstrdup(_("BROADCAST"));
 }
 
 void exit_connections(void)
 {
-  cp();
-  avl_delete_tree(connection_tree);
-  cp();
-  free_connection(broadcast);
-  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 = (connection_t *) xmalloc_and_zero(sizeof(connection_t));
+
+	if(!c)
+		return NULL;
 
-  if(!c)
-    return NULL;
+	gettimeofday(&c->start, NULL);
 
-  gettimeofday(&c->start, NULL);
-  cp();
-  return c;
+	return c;
 }
 
-void free_connection(connection_t *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)
+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)
+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();
+
+	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."));
 }
 
-int read_connection_config(connection_t *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;
+	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;
 }