X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.c;h=29ad04ee789075672792f5c21ebb1838f1d47715;hb=268c8545aaf83b7433f43402f5c77e39e20006ef;hp=ee44e539acabadccf7a5818519a593eaec0b5495;hpb=40c28589328a2aa96c2ce1419c5d90616c758b3d;p=tinc diff --git a/src/connection.c b/src/connection.c index ee44e539..29ad04ee 100644 --- a/src/connection.c +++ b/src/connection.c @@ -1,6 +1,6 @@ /* connection.c -- connection list management - Copyright (C) 2000-2009 Guus Sliepen , + Copyright (C) 2000-2012 Guus Sliepen , 2000-2005 Ivo Timmermans 2008 Max Rijevski @@ -54,16 +54,7 @@ connection_t *new_connection(void) { return xmalloc_and_zero(sizeof(connection_t)); } -void free_connection(connection_t *c) { - if(!c) - return; - - if(c->name) - free(c->name); - - if(c->hostname) - free(c->hostname); - +void free_connection_partially(connection_t *c) { cipher_close(&c->incipher); digest_close(&c->indigest); cipher_close(&c->outcipher); @@ -73,11 +64,10 @@ void free_connection(connection_t *c) { ecdsa_free(&c->ecdsa); rsa_free(&c->rsa); - if(c->hischallenge) + if(c->hischallenge) { free(c->hischallenge); - - if(c->config_tree) - exit_configuration(&c->config_tree); + c->hischallenge = NULL; + } buffer_clear(&c->inbuf); buffer_clear(&c->outbuf); @@ -91,6 +81,25 @@ void free_connection(connection_t *c) { if(c->socket > 0) closesocket(c->socket); + c->socket = -1; + + c->protocol_major = 0; + c->protocol_minor = 0; + c->allow_request = 0; +} + +void free_connection(connection_t *c) { + if(!c) + return; + + free_connection_partially(c); + + free(c->name); + free(c->hostname); + + if(c->config_tree) + exit_configuration(&c->config_tree); + free(c); }