Better optional argument handling.

[tinc] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index 0211845..fd7ae84 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,6 +1,6 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000-2009 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2012 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
                   2008      Max Rijevski <maksuf@gmail.com>
 
@@ -60,44 +60,65 @@ connection_t *new_connection(void) {
        return c;
 }
 
-void free_connection(connection_t *c) {
-       if(c->name)
-               free(c->name);
-
-       if(c->hostname)
-               free(c->hostname);
-
-       if(c->inkey)
-               free(c->inkey);
-
-       if(c->outkey)
-               free(c->outkey);
+void free_connection_partially(connection_t *c) {
+       free(c->inkey);
+       free(c->outkey);
+       free(c->mychallenge);
+       free(c->hischallenge);
+       free(c->outbuf);
+
+       c->inkey = NULL;
+       c->outkey = NULL;
+       c->mychallenge = NULL;
+       c->hischallenge = NULL;
+       c->outbuf = NULL;
+
+       c->status.pinged = false;
+       c->status.active = false;
+       c->status.connecting = false;
+       c->status.timeout = false;
+       c->status.encryptout = false;
+       c->status.decryptin = false;
+       c->status.mst = false;
+
+       c->options = 0;
+       c->buflen = 0;
+       c->reqlen = 0;
+       c->tcplen = 0;
+       c->allow_request = 0;
+       c->outbuflen = 0;
+       c->outbufsize = 0;
+       c->outbufstart = 0;
+       c->last_ping_time = 0;
+       c->last_flushed_time = 0;
 
        if(c->inctx) {
                EVP_CIPHER_CTX_cleanup(c->inctx);
                free(c->inctx);
+               c->inctx = NULL;
        }
 
        if(c->outctx) {
                EVP_CIPHER_CTX_cleanup(c->outctx);
                free(c->outctx);
+               c->outctx = NULL;
+       }
+
+       if(c->rsa_key) {
+               RSA_free(c->rsa_key);
+               c->rsa_key = NULL;
        }
+}
 
-       if(c->mychallenge)
-               free(c->mychallenge);
+void free_connection(connection_t *c) {
+       free_connection_partially(c);
 
-       if(c->hischallenge)
-               free(c->hischallenge);
+       free(c->name);
+       free(c->hostname);
 
        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);
 }