Check if the compiler knows about the __malloc__ attribute.

[tinc] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index 5a5564e..5bbaa79 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.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: net_setup.c,v 1.1.2.37 2003/07/22 20:55:20 guus Exp $
+    $Id: net_setup.c,v 1.1.2.41 2003/07/30 11:50:45 guus Exp $
 */
 
 #include "system.h"
@@ -201,9 +201,10 @@ bool setup_myself(void)
        subnet_t *subnet;
        char *name, *hostname, *mode, *afname, *cipher, *digest;
        char *address = NULL;
-       struct addrinfo hint, *ai, *aip;
+       char *envp[5];
+       struct addrinfo *ai, *aip, hint = {0};
        bool choice;
-       int err;
+       int i, err;
 
        cp();
 
@@ -361,8 +362,10 @@ bool setup_myself(void)
 
        keyexpires = now + keylifetime;
        
-       EVP_CIPHER_CTX_init(&packet_ctx);
-       EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len);
+       if(myself->cipher) {
+               EVP_CIPHER_CTX_init(&packet_ctx);
+               EVP_DecryptInit_ex(&packet_ctx, myself->cipher, NULL, myself->key, myself->key + myself->cipher->key_len);
+       }
 
        /* Check if we want to use message authentication codes... */
 
@@ -383,8 +386,7 @@ bool setup_myself(void)
 
        myself->connection->outdigest = EVP_sha1();
 
-       if(get_config_int
-          (lookup_config(myself->connection->config_tree, "MACLength"),
+       if(get_config_int(lookup_config(myself->connection->config_tree, "MACLength"),
                &myself->maclength)) {
                if(myself->digest) {
                        if(myself->maclength > myself->digest->md_size) {
@@ -402,8 +404,7 @@ bool setup_myself(void)
 
        /* Compression */
 
-       if(get_config_int
-          (lookup_config(myself->connection->config_tree, "Compression"),
+       if(get_config_int(lookup_config(myself->connection->config_tree, "Compression"),
                &myself->compression)) {
                if(myself->compression < 0 || myself->compression > 11) {
                        logger(LOG_ERR, _("Bogus compression level!"));
@@ -424,9 +425,24 @@ bool setup_myself(void)
 
        graph();
 
-       /* Open sockets */
+       /* Open device */
+
+       if(!setup_device())
+               return false;
 
-       memset(&hint, 0, sizeof(hint));
+       /* Run tinc-up script to further initialize the tap interface */
+       asprintf(&envp[0], "NETNAME=%s", netname ? : "");
+       asprintf(&envp[1], "DEVICE=%s", device ? : "");
+       asprintf(&envp[2], "INTERFACE=%s", iface ? : "");
+       asprintf(&envp[3], "NAME=%s", myself->name);
+       envp[4] = NULL;
+
+       execute_script("tinc-up", envp);
+
+       for(i = 0; i < 5; i++)
+               free(envp[i]);
+
+       /* Open sockets */
 
        get_config_string(lookup_config(config_tree, "BindToAddress"), &address);
 
@@ -485,9 +501,6 @@ bool setup_myself(void)
 */
 bool setup_network_connections(void)
 {
-       char *envp[5];
-       int i;
-
        cp();
 
        now = time(NULL);
@@ -506,24 +519,9 @@ bool setup_network_connections(void)
        } else
                pingtimeout = 60;
 
-       if(!setup_device())
-               return false;
-
        if(!setup_myself())
                return false;
 
-       /* Run tinc-up script to further initialize the tap interface */
-       asprintf(&envp[0], "NETNAME=%s", netname ? : "");
-       asprintf(&envp[1], "DEVICE=%s", device ? : "");
-       asprintf(&envp[2], "INTERFACE=%s", iface ? : "");
-       asprintf(&envp[3], "NAME=%s", myself->name);
-       envp[4] = NULL;
-
-       execute_script("tinc-up", envp);
-
-       for(i = 0; i < 5; i++)
-               free(envp[i]);
-
        try_outgoing_connections();
 
        return true;