X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fconnection.c;h=a2a188a60e327db520bdc6fec141fefca1ff8c97;hp=9e5d145ea200295ae989c27bc1cb1d16a995e56f;hb=73d77dd416b87b7c4e9b6aa450f64846235cd2b4;hpb=56c36a14d87b58c14dbc48df4d3d977207e2c06e diff --git a/src/connection.c b/src/connection.c index 9e5d145e..a2a188a6 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,7 +1,7 @@ /* connection.c -- connection list management - Copyright (C) 2000-2004 Guus Sliepen , - 2000-2004 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 @@ -78,6 +78,9 @@ void free_connection(connection_t *c) { cp(); + if(c->name) + free(c->name); + if(c->hostname) free(c->hostname); @@ -87,12 +90,31 @@ void free_connection(connection_t *c) if(c->outkey) free(c->outkey); + if(c->inctx) { + EVP_CIPHER_CTX_cleanup(c->inctx); + free(c->inctx); + } + + if(c->outctx) { + EVP_CIPHER_CTX_cleanup(c->outctx); + free(c->outctx); + } + if(c->mychallenge) free(c->mychallenge); if(c->hischallenge) free(c->hischallenge); + if(c->config_tree) + exit_configuration(&c->config_tree); + + if(c->outbuf) + free(c->outbuf); + + if(c->rsa_key) + RSA_free(c->rsa_key); + free(c); } @@ -121,8 +143,9 @@ void dump_connections(void) for(node = connection_tree->head; node; node = node->next) { c = node->data; - logger(LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x"), - c->name, c->hostname, c->options, c->socket, *(uint32_t *)&c->status); + logger(LOG_DEBUG, _(" %s at %s options %lx socket %d status %04x outbuf %d/%d/%d"), + c->name, c->hostname, c->options, c->socket, c->status.value, + c->outbufsize, c->outbufstart, c->outbuflen); } logger(LOG_DEBUG, _("End of connections.")); @@ -135,7 +158,7 @@ bool read_connection_config(connection_t *c) cp(); - asprintf(&fname, "%s/hosts/%s", confbase, c->name); + xasprintf(&fname, "%s/hosts/%s", confbase, c->name); x = read_config_file(c->config_tree, fname); free(fname);