X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=e4e8fad81c6bf6087b15f20dbcf229fa2324e06c;hp=1e34329c52e3ae22fb42bb93c078cc7ca716d90b;hb=6c7172d694dcb80e538518282b6c4bd51818f1d2;hpb=d3f889c8076dff9c00ebfe1459cb36425f8da41d diff --git a/src/connection.c b/src/connection.c index 1e34329c..e4e8fad8 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,7 +1,7 @@ /* connection.c -- connection list management - Copyright (C) 2000,2001 Guus Sliepen , - 2000,2001 Ivo Timmermans + Copyright (C) 2000-2002 Guus Sliepen , + 2000-2002 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,20 +17,21 @@ 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.9 2001/01/07 17:08:56 guus Exp $ + $Id: connection.c,v 1.1.2.36 2003/06/25 20:55:05 guus Exp $ */ #include "config.h" #include #include +#include +#include #include #include -#include "net.h" /* Don't ask. */ +#include "net.h" /* Don't ask. */ #include "netutl.h" -#include "config.h" #include "conf.h" #include #include "subnet.h" @@ -38,182 +39,112 @@ #include "xalloc.h" #include "system.h" -/* Root of the connection list */ - -avl_tree_t *connection_tree; -avl_tree_t *id_tree; - -/* Pointer to connection describing myself */ - -connection_t *myself = NULL; - -/* Initialization and callbacks */ +avl_tree_t *connection_tree; /* Meta connections */ +connection_t *broadcast; int connection_compare(connection_t *a, connection_t *b) { - ipv4_t result; - - result = a->address - b->address; - if(result) - return result; - else - return a->port - b->port; + return (void *)a - (void *)b; } -int id_compare(connection_t *a, connection_t *b) +void init_connections(void) { - return strcmp(a->name, b->name); + cp(); + + connection_tree = avl_alloc_tree((avl_compare_t) connection_compare, NULL); + broadcast = new_connection(); + broadcast->name = xstrdup(_("everyone")); + broadcast->hostname = xstrdup(_("BROADCAST")); } -void init_connections(void) +void exit_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); -} + cp(); -/* Creation and deletion of connection elements */ + avl_delete_tree(connection_tree); + free_connection(broadcast); +} 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; -} + connection_t *c; -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 -} + cp(); -/* - 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 -} + c = (connection_t *) xmalloc_and_zero(sizeof(connection_t)); -/* - free all elements of connection -*/ -void destroy_connection_tree(void) -{ -cp - avl_delete_tree(id_tree); - avl_delete_tree(connection_tree); -cp -} + if(!c) + return NULL; -/* Linked list management */ + gettimeofday(&c->start, NULL); -void connection_add(connection_t *cl) -{ -cp - avl_insert(connection_tree, cl); -cp + return c; } -void id_add(connection_t *cl) +void free_connection(connection_t *c) { -cp - avl_insert(id_tree, cl); -cp + cp(); + + 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); } -void connection_del(connection_t *cl) +void connection_add(connection_t *c) { -cp - avl_delete(id_tree, cl); - avl_delete(connection_tree, cl); -cp -} + cp(); -/* Lookup functions */ + avl_insert(connection_tree, c); +} -connection_t *lookup_connection(ipv4_t address, short unsigned int port) +void connection_del(connection_t *c) { - connection_t cl; -cp - cl.address = address; - cl.port = port; + cp(); - return avl_search(connection_tree, &cl); + avl_delete(connection_tree, c); } -connection_t *lookup_id(char *name) +void dump_connections(void) { - connection_t cl, *p; -cp - cl.name = name; - p = avl_search(id_tree, &cl); - if(p && p->status.active) - return p; - else - return NULL; -} + avl_node_t *node; + connection_t *c; -/* Debugging */ + cp(); -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 + syslog(LOG_DEBUG, _("Connections:")); + + for(node = connection_tree->head; node; node = node->next) { + c = (connection_t *) node->data; + syslog(LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x"), + c->name, c->hostname, c->options, c->socket, c->status); + } + + syslog(LOG_DEBUG, _("End of connections.")); } -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); - free(fname); -cp - return x; + char *fname; + int x; + + cp(); + + asprintf(&fname, "%s/hosts/%s", confbase, c->name); + x = read_config_file(c->config_tree, fname); + free(fname); + + return x; }