/*
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-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
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.38 2003/07/06 23:16:28 guus Exp $
+ $Id$
*/
-#include "config.h"
-
-#include <stdio.h>
-#include <string.h>
-#include <sys/time.h>
-
-#include <avl_tree.h>
-#include <list.h>
+#include "system.h"
+#include "avl_tree.h"
+#include "conf.h"
+#include "list.h"
+#include "logger.h"
#include "net.h" /* Don't ask. */
#include "netutl.h"
-#include "conf.h"
-#include <utils.h>
#include "subnet.h"
-#include "logger.h"
-
+#include "utils.h"
#include "xalloc.h"
-#include "system.h"
avl_tree_t *connection_tree; /* Meta connections */
connection_t *broadcast;
-static int connection_compare(connection_t *a, connection_t *b)
+static int connection_compare(const connection_t *a, const connection_t *b)
{
return (void *)a - (void *)b;
}
{
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"));
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;
}
{
cp();
+ if(!c)
+ return;
+
+ if(c->name)
+ free(c->name);
+
if(c->hostname)
free(c->hostname);
if(c->hischallenge)
free(c->hischallenge);
+ event_del(&c->ev);
free(c);
}
cp();
- logger(DEBUG_ALWAYS, LOG_DEBUG, _("Connections:"));
+ logger(LOG_DEBUG, _("Connections:"));
for(node = connection_tree->head; node; node = node->next) {
- c = (connection_t *) node->data;
- logger(DEBUG_ALWAYS, LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x"),
- c->name, c->hostname, c->options, c->socket, 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(DEBUG_ALWAYS, LOG_DEBUG, _("End of connections."));
+ logger(LOG_DEBUG, _("End of connections."));
}
-int read_connection_config(connection_t *c)
+bool read_connection_config(connection_t *c)
{
char *fname;
int x;
x = read_config_file(c->config_tree, fname);
free(fname);
- return x;
+ return x == 0;
}