Make sure connection->name is never NULL.

[tinc] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index c1a1b69..53c0fd0 100644 (file)
--- a/src/connection.c
+++ b/src/connection.c
@@ -1,6 +1,6 @@
 /*
     connection.c -- connection list management
-    Copyright (C) 2000-2006 Guus Sliepen <guus@tinc-vpn.org>,
+    Copyright (C) 2000-2007 Guus Sliepen <guus@tinc-vpn.org>,
                   2000-2005 Ivo Timmermans
 
     This program is free software; you can redistribute it and/or modify
@@ -78,6 +78,9 @@ void free_connection(connection_t *c)
 {
        cp();
 
+       if(c->name)
+               free(c->name);
+
        if(c->hostname)
                free(c->hostname);
 
@@ -122,7 +125,7 @@ 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 outbuf %d/%d/%d"),
-                          c->name, c->hostname, c->options, c->socket, *(uint32_t *)&c->status,
+                          c->name, c->hostname, c->options, c->socket, c->status.value,
                           c->outbufsize, c->outbufstart, c->outbuflen);
        }