X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fconnection.c;h=9cc64914cd4ba217a85d824f9ff378e5f41884b1;hb=eaea9a2ea3c80478a6aa4e502afaed5b5b6bbfde;hp=dee0472a2ac2b82c5d357ebf09fc6cbebbdfbb60;hpb=408ca91766088b6c2d38e198b0692bf394b41248;p=meshlink diff --git a/src/connection.c b/src/connection.c index dee0472a..9cc64914 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,7 +1,6 @@ /* connection.c -- connection list management - Copyright (C) 2000 Guus Sliepen , - 2000 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,168 +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.1 2000/11/20 19:12:11 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 "system.h" -#include "net.h" /* Don't ask. */ -#include "netutl.h" -#include "config.h" +#include "list.h" #include "conf.h" -#include - +#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 */ - -rbltree_t *connection_tree; -connection_t *myself = NULL; -/* Initialization and callbacks */ +void init_connections(meshlink_handle_t *mesh) { + assert(!mesh->connections); + assert(!mesh->everyone); -int connection_compare(connection_t *a, connection_t *b) -{ - return strcmp(a->name, b->name); + mesh->connections = list_alloc((list_action_t) free_connection); + mesh->everyone = new_connection(); + mesh->everyone->name = xstrdup("mesh->everyone"); } -void init_connections(void) -{ - connection_tree = new_rbltree((rbl_compare_t)connection_compare, (rbl_action_t)free_connection); -} +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(sizeof(*p)); -cp - /* initialise all those stupid pointers at once */ - memset(p, '\0', sizeof(*p)); -cp - return p; + mesh->connections = NULL; + mesh->everyone = NULL; } -void free_connection(connection_t *p) -{ -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); -cp +connection_t *new_connection(void) { + return xzalloc(sizeof(connection_t)); } -/* - remove all marked connections -*/ -void prune_connection_tree(void) -{ - rbl_t *rbl; - connection_t *cl; -cp - RBL_FOREACH(connection_tree, rbl) - { - cl = (connection_t *) rbl->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 - rbl_delete_rbltree(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 - rbl_insert(connection_tree, cl); -cp -} + if(c->io.cb) { + abort(); + } -void connection_del(connection_t *cl) -{ -cp - rbl_delete(connection_tree, cl); -cp -} + if(c->socket > 0) { + closesocket(c->socket); + } -/* Lookup functions */ + free(c->name); -connection_t *lookup_id(char *name) -{ - connection_t cl; -cp - cl.name = name; - return rbl_search(connection_tree, &cl); -cp + free(c); } -/* Debugging */ - -void dump_connection_list(void) -{ - rbl_t *rbl; - 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); - - RBL_FOREACH(connection_tree, rbl) - { - 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); - } - - syslog(LOG_DEBUG, _("End of connection list.")); -cp +void connection_add(meshlink_handle_t *mesh, connection_t *c) { + assert(c); + + 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); }