X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;ds=sidebyside;f=src%2Fconnection.c;h=9cc64914cd4ba217a85d824f9ff378e5f41884b1;hb=963c5055505f2fc117cd5efa06eaa02c9b2bf85d;hp=c1acfeab1c4cbafc4cbe8dbc5e14d1ebc8dd91b7;hpb=34f9e6cf2d6d2b81eb63f9f28963b447a2157740;p=meshlink diff --git a/src/connection.c b/src/connection.c index c1acfeab..9cc64914 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,7 +1,6 @@ /* connection.c -- connection list management - Copyright (C) 2000,2001 Guus Sliepen , - 2000,2001 Ivo Timmermans + Copyright (C) 2000-2013 Guus Sliepen 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 @@ -13,207 +12,80 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - 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.10 2001/03/04 13:59:25 guus Exp $ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -#include "config.h" - -#include -#include - -#include -#include +#include "system.h" -#include "net.h" /* Don't ask. */ -#include "netutl.h" -#include "config.h" +#include "list.h" #include "conf.h" -#include -#include "subnet.h" - +#include "connection.h" +#include "list.h" +#include "logger.h" +#include "meshlink_internal.h" +#include "utils.h" #include "xalloc.h" -#include "system.h" - -/* Root of the connection list */ -avl_tree_t *connection_tree; -avl_tree_t *id_tree; +void init_connections(meshlink_handle_t *mesh) { + assert(!mesh->connections); + assert(!mesh->everyone); -/* Pointer to connection describing myself */ - -connection_t *myself = NULL; - -/* Initialization and callbacks */ - -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; + mesh->connections = list_alloc((list_action_t) free_connection); + mesh->everyone = new_connection(); + mesh->everyone->name = xstrdup("mesh->everyone"); } -int id_compare(connection_t *a, connection_t *b) -{ - return strcmp(a->name, b->name); -} - -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); -} +void exit_connections(meshlink_handle_t *mesh) { + if(mesh->connections) { + list_delete_list(mesh->connections); + } -/* Creation and deletion of connection elements */ + if(mesh->everyone) { + free_connection(mesh->everyone); + } -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; + mesh->connections = NULL; + mesh->everyone = NULL; } -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 +connection_t *new_connection(void) { + return xzalloc(sizeof(connection_t)); } -/* - 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 -} +void free_connection(connection_t *c) { + assert(c); -/* - free all elements of connection -*/ -void destroy_connection_tree(void) -{ -cp - avl_delete_tree(id_tree); - avl_delete_tree(connection_tree); -cp -} + sptps_stop(&c->sptps); + ecdsa_free(c->ecdsa); -/* Linked list management */ + buffer_clear(&c->inbuf); + buffer_clear(&c->outbuf); -void connection_add(connection_t *cl) -{ -cp - avl_insert(connection_tree, cl); -cp -} + if(c->io.cb) { + abort(); + } -void id_add(connection_t *cl) -{ -cp - avl_insert(id_tree, cl); -cp -} - -void connection_del(connection_t *cl) -{ -cp - avl_delete(id_tree, cl); - avl_delete(connection_tree, cl); -cp -} + if(c->socket > 0) { + closesocket(c->socket); + } -/* Lookup functions */ + free(c->name); -connection_t *lookup_connection(ipv4_t address, short unsigned int port) -{ - connection_t cl; -cp - cl.address = address; - cl.port = port; - - return avl_search(connection_tree, &cl); + free(c); } -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; -} +void connection_add(meshlink_handle_t *mesh, connection_t *c) { + assert(c); -/* 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 options %ld sockets %d, %d status %04x"), - myself->name, myself->hostname, myself->port, myself->options, - 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 options %ld sockets %d, %d status %04x"), - cl->name, cl->hostname, cl->port, cl->options, - cl->socket, cl->meta_socket, cl->status); - } - - syslog(LOG_DEBUG, _("End of connection list.")); -cp + c->mesh = mesh; + list_insert_tail(mesh->connections, c); } -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; +void connection_del(meshlink_handle_t *mesh, connection_t *c) { + assert(c); + + io_del(&mesh->loop, &c->io); + list_delete(mesh->connections, c); }