X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fconnection.c;h=4d036edf3f94c5d9542295786cdae1b450552e5f;hb=refs%2Fheads%2F1.0-gnutls;hp=65bf8966374e43f4145d63fabfa55e8d69a00894;hpb=714fb32d0377ed9f5643ed8f0bd914843d12266b;p=tinc

diff --git a/src/connection.c b/src/connection.c
index 65bf8966..4d036edf 100644
--- a/src/connection.c
+++ b/src/connection.c
@@ -17,7 +17,7 @@
     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.43 2003/07/29 10:50:15 guus Exp $
+    $Id: connection.c,v 1.1.2.44 2003/08/28 21:05:10 guus Exp $
 */
 
 #include "system.h"
@@ -64,7 +64,7 @@ connection_t *new_connection(void)
 
 	cp();
 
-	c = (connection_t *) xmalloc_and_zero(sizeof(connection_t));
+	c = xmalloc_and_zero(sizeof(connection_t));
 
 	if(!c)
 		return NULL;
@@ -78,21 +78,6 @@ void free_connection(connection_t *c)
 {
 	cp();
 
-	if(c->hostname)
-		free(c->hostname);
-
-	if(c->inkey)
-		free(c->inkey);
-
-	if(c->outkey)
-		free(c->outkey);
-
-	if(c->mychallenge)
-		free(c->mychallenge);
-
-	if(c->hischallenge)
-		free(c->hischallenge);
-
 	free(c);
 }
 
@@ -120,9 +105,14 @@ void dump_connections(void)
 	logger(LOG_DEBUG, _("Connections:"));
 
 	for(node = connection_tree->head; node; node = node->next) {
-		c = (connection_t *) 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);
+		c = node->data;
+		logger(LOG_DEBUG, _(" %s at %s options %lx socket %d cipher %s digest %s compression %s kx method %s status %04x"),
+				c->name, c->hostname, c->options, c->socket,
+				c->session ? gnutls_cipher_get_name(gnutls_cipher_get(c->session)) : "-",
+				c->session ? gnutls_mac_get_name(gnutls_mac_get(c->session)) : "-",
+				c->session ? gnutls_compression_get_name(gnutls_compression_get(c->session)) : "-",
+				c->session ? gnutls_kx_get_name(gnutls_kx_get(c->session)) : "-",
+			   *(uint32_t *)&c->status);
 	}
 
 	logger(LOG_DEBUG, _("End of connections."));