/*
connection.c -- connection list management
- Copyright (C) 2000-2004 Guus Sliepen <guus@tinc-vpn.org>,
- 2000-2004 Ivo Timmermans <ivo@tinc-vpn.org>
+ 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
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, (avl_action_t) free);
+ 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();
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);
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;
for(node = connection_tree->head; node; node = node->next) {
c = 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);
+ 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;