Imported gnutls based branch.

[tinc] / src / connection.c

diff --git a/src/connection.c b/src/connection.c
index 9890f51..4d036ed 100644 (file)
--- 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.40 2003/07/17 15:06:26 guus Exp $
+    $Id: connection.c,v 1.1.2.44 2003/08/28 21:05:10 guus Exp $
 */
 
 #include "system.h"
@@ -35,7 +35,7 @@
 avl_tree_t *connection_tree;   /* Meta connections */
 connection_t *broadcast;
 
-static int connection_compare(connection_t *a, connection_t *b)
+static int connection_compare(const connection_t *a, const connection_t *b)
 {
        return (void *)a - (void *)b;
 }
@@ -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,15 +105,20 @@ 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, 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."));
 }
 
-int read_connection_config(connection_t *c)
+bool read_connection_config(connection_t *c)
 {
        char *fname;
        int x;
@@ -139,5 +129,5 @@ int read_connection_config(connection_t *c)
        x = read_config_file(c->config_tree, fname);
        free(fname);
 
-       return x;
+       return x == 0;
 }