The "active" bit in node.status is not used.

[oweals/tinc.git] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index e0f156969486351f762f627acf8353762afee8b8..4bac3f0b0d637498f68b2f0ba84c1d7cae422f2f 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -1,7 +1,7 @@
 /*
     net_setup.c -- Setup.
-    Copyright (C) 1998-2005 Ivo Timmermans <ivo@tinc-vpn.org>,
-                  2000-2005 Guus Sliepen <guus@tinc-vpn.org>
+    Copyright (C) 1998-2005 Ivo Timmermans,
+                  2000-2006 Guus Sliepen <guus@tinc-vpn.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -368,7 +368,7 @@ bool setup_myself(void)
        myself->connection->outcipher = EVP_bf_ofb();
 
        myself->key = xmalloc(myself->keylength);
-       RAND_pseudo_bytes(myself->key, myself->keylength);
+       RAND_pseudo_bytes((unsigned char *)myself->key, myself->keylength);
 
        if(!get_config_int(lookup_config(config_tree, "KeyExpire"), &keylifetime))
                keylifetime = 3600;
@@ -377,7 +377,7 @@ bool setup_myself(void)
        
        if(myself->cipher) {
                EVP_CIPHER_CTX_init(&packet_ctx);
-               if(!EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len)) {
+               if(!EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, (unsigned char *)myself->key, (unsigned char *)myself->key + myself->cipher->key_len)) {
                        logger(LOG_ERR, _("Error during initialisation of cipher for %s (%s): %s"),
                                        myself->name, myself->hostname, ERR_error_string(ERR_get_error(), NULL));
                        return false;
@@ -437,7 +437,6 @@ bool setup_myself(void)
 
        myself->nexthop = myself;
        myself->via = myself;
-       myself->status.active = true;
        myself->status.reachable = true;
        node_add(myself);
 
@@ -502,7 +501,7 @@ bool setup_myself(void)
                        free(hostname);
                }
 
-               listen_socket[listen_sockets].sa.sa = *aip->ai_addr;
+               memcpy(&listen_socket[listen_sockets].sa, aip->ai_addr, aip->ai_addrlen);
                listen_sockets++;
        }