K&R style braces

[tinc] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index 65bf896..58e2d35 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,7 +1,7 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000-2003 Guus Sliepen <guus@sliepen.eu.org>,
-                  2000-2003 Ivo Timmermans <ivo@o2w.nl>
+    Copyright (C) 2000-2007 Guus Sliepen <guus@tinc-vpn.org>,
+                  2000-2005 Ivo Timmermans
 
     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.43 2003/07/29 10:50:15 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -35,49 +35,51 @@
 avl_tree_t *connection_tree;   /* Meta connections */
 connection_t *broadcast;
 
-static int connection_compare(const connection_t *a, const connection_t *b)
-{
+static int connection_compare(const connection_t *a, const connection_t *b) {
        return (void *)a - (void *)b;
 }
 
-void init_connections(void)
-{
+void init_connections(void) {
        cp();
 
-       connection_tree = avl_alloc_tree((avl_compare_t) connection_compare, NULL);
+       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)
-{
+void exit_connections(void) {
        cp();
 
        avl_delete_tree(connection_tree);
        free_connection(broadcast);
 }
 
-connection_t *new_connection(void)
-{
+connection_t *new_connection(void) {
        connection_t *c;
 
        cp();
 
-       c = (connection_t *) xmalloc_and_zero(sizeof(connection_t));
+       c = xmalloc_and_zero(sizeof(connection_t));
 
        if(!c)
                return NULL;
 
        gettimeofday(&c->start, NULL);
+       event_set(&c->ev, -1, 0, NULL, NULL);
 
        return c;
 }
 
-void free_connection(connection_t *c)
-{
+void free_connection(connection_t *c) {
        cp();
 
+       if(!c)
+               return;
+
+       if(c->name)
+               free(c->name);
+
        if(c->hostname)
                free(c->hostname);
 
@@ -93,25 +95,23 @@ void free_connection(connection_t *c)
        if(c->hischallenge)
                free(c->hischallenge);
 
+       event_del(&c->ev);
        free(c);
 }
 
-void connection_add(connection_t *c)
-{
+void connection_add(connection_t *c) {
        cp();
 
        avl_insert(connection_tree, c);
 }
 
-void connection_del(connection_t *c)
-{
+void connection_del(connection_t *c) {
        cp();
 
        avl_delete(connection_tree, c);
 }
 
-void dump_connections(void)
-{
+void dump_connections(void) {
        avl_node_t *node;
        connection_t *c;
 
@@ -120,16 +120,16 @@ void dump_connections(void)
        logger(LOG_DEBUG, _("Connections:"));
 
        for(node = connection_tree->head; node; node = node->next) {
-               c = (connection_t *) 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);
+               c = node->data;
+               logger(LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x outbuf %d/%d/%d"),
+                          c->name, c->hostname, c->options, c->socket, c->status.value,
+                          c->outbufsize, c->outbufstart, c->outbuflen);
        }
 
        logger(LOG_DEBUG, _("End of connections."));
 }
 
-bool read_connection_config(connection_t *c)
-{
+bool read_connection_config(connection_t *c) {
        char *fname;
        int x;