X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconnection.c;h=4a2ba4c09110394e8654f4ecc3728484878ddf3f;hb=075e6828a7533e7daa790225f17aa6bb39703278;hp=08c165e5586bd7331eb3f6e368ccc8d72ce8f48b;hpb=07a08f5539f441e66946d1db1711dc584f8621c4;p=meshlink diff --git a/src/connection.c b/src/connection.c index 08c165e5..4a2ba4c0 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,7 +1,7 @@ /* connection.c -- connection list management - Copyright (C) 2000 Guus Sliepen , - 2000 Ivo Timmermans + Copyright (C) 2000-2007 Guus Sliepen , + 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,203 +17,120 @@ 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.8 2001/01/07 15:25:40 guus Exp $ + $Id$ */ -#include "config.h" - -#include -#include - -#include -#include +#include "system.h" -#include "net.h" /* Don't ask. */ -#include "netutl.h" -#include "config.h" +#include "splay_tree.h" +#include "cipher.h" #include "conf.h" -#include +#include "list.h" +#include "logger.h" +#include "net.h" /* Don't ask. */ +#include "netutl.h" #include "subnet.h" - +#include "utils.h" #include "xalloc.h" -#include "system.h" -/* Root of the connection list */ +splay_tree_t *connection_tree; /* Meta connections */ +connection_t *broadcast; -avl_tree_t *connection_tree; -avl_tree_t *id_tree; - -/* Pointer to connection describing myself */ +static int connection_compare(const connection_t *a, const connection_t *b) { + return a < b ? -1 : a == b ? 0 : 1; +} -connection_t *myself = NULL; +void init_connections(void) { + cp(); -/* Initialization and callbacks */ + connection_tree = splay_alloc_tree((splay_compare_t) connection_compare, (splay_action_t) free_connection); + broadcast = new_connection(); + broadcast->name = xstrdup(_("everyone")); + broadcast->hostname = xstrdup(_("BROADCAST")); +} -int connection_compare(connection_t *a, connection_t *b) -{ - ipv4_t result; +void exit_connections(void) { + cp(); - result = a->address - b->address; - if(result) - return result; - else - return a->port - b->port; + splay_delete_tree(connection_tree); + free_connection(broadcast); } -int id_compare(connection_t *a, connection_t *b) -{ - return strcmp(a->name, b->name); -} +connection_t *new_connection(void) { + cp(); -void init_connections(void) -{ - connection_tree = avl_alloc_tree((avl_compare_t)connection_compare, (avl_action_t)free_connection); - id_tree = avl_alloc_tree((avl_compare_t)id_compare, NULL); + return xmalloc_and_zero(sizeof(connection_t)); } -/* Creation and deletion of connection elements */ +void free_connection(connection_t *c) { + cp(); -connection_t *new_connection(void) -{ - connection_t *p = (connection_t *)xmalloc_and_zero(sizeof(*p)); -cp - p->subnet_tree = avl_alloc_tree((avl_compare_t)subnet_compare, NULL); - p->queue = list_alloc((list_action_t)free); -cp - return p; -} + if(!c) + return; -void free_connection(connection_t *p) -{ -cp - if(p->queue) - list_delete_list(p->queue); - 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); -cp -} + if(c->name) + free(c->name); -/* - remove all marked connections -*/ -void prune_connection_tree(void) -{ - avl_node_t *node, *next; - connection_t *cl; -cp - for(node = connection_tree->head; node; node = next) - { - next = node->next; - cl = (connection_t *)node->data; - if(cl->status.remove) - connection_del(cl); - } -cp -} + if(c->hostname) + free(c->hostname); -/* - free all elements of connection -*/ -void destroy_connection_tree(void) -{ -cp - avl_delete_tree(id_tree); - avl_delete_tree(connection_tree); -cp -} + cipher_close(&c->incipher); + cipher_close(&c->outcipher); + + if(c->hischallenge) + free(c->hischallenge); + + if(c->config_tree) + exit_configuration(&c->config_tree); -/* Linked list management */ + if(c->buffer) + bufferevent_free(c->buffer); + + if(event_initialized(&c->inevent)) + event_del(&c->inevent); -void connection_add(connection_t *cl) -{ -cp - avl_insert(connection_tree, cl); -cp + free(c); } -void id_add(connection_t *cl) -{ -cp - avl_insert(id_tree, cl); -cp +void connection_add(connection_t *c) { + cp(); + + splay_insert(connection_tree, c); } -void connection_del(connection_t *cl) -{ -cp - avl_delete(id_tree, cl); - avl_delete(connection_tree, cl); -cp +void connection_del(connection_t *c) { + cp(); + + splay_delete(connection_tree, c); } -/* Lookup functions */ +int dump_connections(struct evbuffer *out) { + splay_node_t *node; + connection_t *c; -connection_t *lookup_connection(ipv4_t address, short unsigned int port) -{ - connection_t cl; -cp - cl.address = address; - cl.port = port; + cp(); - return avl_search(connection_tree, &cl); -} + for(node = connection_tree->head; node; node = node->next) { + c = node->data; + if(evbuffer_add_printf(out, + _(" %s at %s options %lx socket %d status %04x\n"), + c->name, c->hostname, c->options, c->socket, + bitfield_to_int(&c->status, sizeof c->status)) == -1) + return errno; + } -connection_t *lookup_id(char *name) -{ - connection_t cl, *p; -cp - cl.name = name; - p = avl_search(id_tree, &cl); - if(p && p->status.active) - return p; - else - return NULL; + return 0; } -/* Debugging */ - -void dump_connection_list(void) -{ - avl_node_t *node; - connection_t *cl; -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); - - for(node = connection_tree->head; node; node = node->next) - { - cl = (connection_t *)node->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); - } - - syslog(LOG_DEBUG, _("End of connection list.")); -cp -} +bool read_connection_config(connection_t *c) { + char *fname; + int x; + + cp(); + + xasprintf(&fname, "%s/hosts/%s", confbase, c->name); + x = read_config_file(c->config_tree, fname); + free(fname); -int read_host_config(connection_t *cl) -{ - char *fname; - int x; -cp - asprintf(&fname, "%s/hosts/%s", confbase, cl->name); - x = read_config_file(&cl->config, fname); - free(fname); -cp - return x; + return x == 0; }