/*
connection.c -- connection list management
- Copyright (C) 2000 Guus Sliepen <guus@sliepen.warande.net>,
- 2000 Ivo Timmermans <itimmermans@bigfoot.com>
+ Copyright (C) 2000-2002 Guus Sliepen <guus@sliepen.warande.net>,
+ 2000-2002 Ivo Timmermans <itimmermans@bigfoot.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
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.2 2000/11/20 19:41:10 guus Exp $
+ $Id: connection.c,v 1.1.2.27 2002/02/10 21:57:53 guus Exp $
*/
#include "config.h"
#include <stdio.h>
#include <syslog.h>
+#include <string.h>
+#include <sys/time.h>
-#include <rbl.h>
+#include <avl_tree.h>
+#include <list.h>
#include "net.h" /* Don't ask. */
#include "netutl.h"
#include "xalloc.h"
#include "system.h"
-/* Root of the connection list */
-
-rbltree_t *connection_tree;
-connection_t *myself = NULL;
-
-/* Initialization and callbacks */
+avl_tree_t *connection_tree; /* Meta connections */
int connection_compare(connection_t *a, connection_t *b)
{
- return strcmp(a->name, b->name);
+ return a->socket - b->socket;
}
void init_connections(void)
{
- connection_tree = new_rbltree((rbl_compare_t)connection_compare, (rbl_action_t)free_connection);
-}
-
-/* Creation and deletion of connection elements */
-
-connection_t *new_connection(void)
-{
- connection_t *p = (connection_t *)xmalloc(sizeof(*p));
cp
- /* initialise all those stupid pointers at once */
- memset(p, '\0', sizeof(*p));
-
- p->subnet_tree = new_rbltree((rbl_compare_t)subnet_compare, NULL);
+ connection_tree = avl_alloc_tree((avl_compare_t)connection_compare, NULL);
cp
- return p;
}
-void free_connection(connection_t *p)
+void exit_connections(void)
{
cp
- if(p->sq)
- destroy_queue(p->sq);
- if(p->rq)
- destroy_queue(p->rq);
- if(p->name && p->name!=unknown)
- free(p->name);
- if(p->hostname)
- free(p->hostname);
- if(p->rsa_key)
- RSA_free(p->rsa_key);
- if(p->cipher_pktkey)
- free(p->cipher_pktkey);
- if(p->buffer)
- free(p->buffer);
- if(p->config)
- clear_config(&p->config);
- free(p);
+ avl_delete_tree(connection_tree);
cp
}
-/*
- remove all marked connections
-*/
-void prune_connection_tree(void)
+connection_t *new_connection(void)
{
- rbl_t *rbl;
- connection_t *cl;
+ connection_t *c;
cp
- RBL_FOREACH(connection_tree, rbl)
- {
- cl = (connection_t *) rbl->data;
- if(cl->status.remove)
- connection_del(cl);
- }
+ c = (connection_t *)xmalloc_and_zero(sizeof(connection_t));
+
+ if(!c)
+ return NULL;
+
+ gettimeofday(&c->start, NULL);
cp
+ return c;
}
-/*
- free all elements of connection
-*/
-void destroy_connection_tree(void)
+void free_connection(connection_t *c)
{
cp
- rbl_delete_rbltree(connection_tree);
+ 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
}
-/* Linked list management */
-
-void connection_add(connection_t *cl)
+void connection_add(connection_t *c)
{
cp
- rbl_insert(connection_tree, cl);
+ avl_insert(connection_tree, c);
cp
}
-void connection_del(connection_t *cl)
+void connection_del(connection_t *c)
{
cp
- rbl_delete(connection_tree, cl);
+ avl_delete(connection_tree, c);
cp
}
-/* Lookup functions */
-
-connection_t *lookup_id(char *name)
+connection_t *lookup_connection(ipv4_t address, port_t port)
{
- connection_t cl;
-cp
- cl.name = name;
- return rbl_search(connection_tree, &cl);
+ connection_t c;
cp
-}
+ c.address = address;
+ c.port = port;
-/* Debugging */
+ return avl_search(connection_tree, &c);
+}
-void dump_connection_list(void)
+void dump_connections(void)
{
- rbl_t *rbl;
- connection_t *cl;
+ avl_node_t *node;
+ connection_t *c;
cp
- syslog(LOG_DEBUG, _("Connection list:"));
-
- syslog(LOG_DEBUG, _(" %s at %s port %hd flags %d sockets %d, %d status %04x"),
- myself->name, myself->hostname, myself->port, myself->flags,
- myself->socket, myself->meta_socket, myself->status);
+ syslog(LOG_DEBUG, _("Connections:"));
- RBL_FOREACH(connection_tree, rbl)
+ for(node = connection_tree->head; node; node = node->next)
{
- cl = (connection_t *)rbl->data;
- syslog(LOG_DEBUG, _(" %s at %s port %hd flags %d sockets %d, %d status %04x"),
- cl->name, cl->hostname, cl->port, cl->flags,
- cl->socket, cl->meta_socket, cl->status);
+ c = (connection_t *)node->data;
+ syslog(LOG_DEBUG, _(" %s at %s port %hd options %ld socket %d status %04x"),
+ c->name, c->hostname, c->port, c->options,
+ c->socket, c->status);
}
- syslog(LOG_DEBUG, _("End of connection list."));
+ syslog(LOG_DEBUG, _("End of connections."));
cp
}
-int read_host_config(connection_t *cl)
+int read_connection_config(connection_t *c)
{
char *fname;
int x;
cp
- asprintf(&fname, "%s/hosts/%s", confbase, cl->name);
- x = read_config_file(&cl->config, fname);
+ asprintf(&fname, "%s/hosts/%s", confbase, c->name);
+ x = read_config_file(c->config_tree, fname);
free(fname);
cp
return x;
projects / tinc / blobdiff