tinc-gui: Reformat codebase according to PEP8

[tinc] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index 83fbc2d..23dd252 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,
-                  2000-2014 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2015 Guus Sliepen <guus@tinc-vpn.org>
                   2006      Scott Lamb <slamb@slamb.org>
                   2010      Brandon Black <blblack@gmail.com>
 
@@ -148,9 +148,6 @@ bool read_ecdsa_public_key(connection_t *c) {
 
 #ifndef DISABLE_LEGACY
 bool read_rsa_public_key(connection_t *c) {
-       if(ecdsa_active(c->ecdsa))
-               return true;
-
        FILE *fp;
        char *fname;
        char *n;
@@ -229,14 +226,14 @@ static bool read_ecdsa_private_key(void) {
 
 static bool read_invitation_key(void) {
        FILE *fp;
-       char *fname;
+       char fname[PATH_MAX];
 
        if(invitation_key) {
                ecdsa_free(invitation_key);
                invitation_key = NULL;
        }
 
-       xasprintf(&fname, "%s" SLASH "invitations" SLASH "ed25519_key.priv", confbase);
+       snprintf(fname, sizeof fname, "%s" SLASH "invitations" SLASH "ed25519_key.priv", confbase);
 
        fp = fopen(fname, "r");
 
@@ -247,7 +244,6 @@ static bool read_invitation_key(void) {
                        logger(DEBUG_ALWAYS, LOG_ERR, "Reading Ed25519 private key file `%s' failed", fname);
        }
 
-       free(fname);
        return invitation_key;
 }
 
@@ -330,13 +326,12 @@ void regenerate_key(void) {
 void load_all_subnets(void) {
        DIR *dir;
        struct dirent *ent;
-       char *dname;
+       char dname[PATH_MAX];
 
-       xasprintf(&dname, "%s" SLASH "hosts", confbase);
+       snprintf(dname, sizeof dname, "%s" SLASH "hosts", confbase);
        dir = opendir(dname);
        if(!dir) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s", dname, strerror(errno));
-               free(dname);
                return;
        }
 
@@ -369,6 +364,7 @@ void load_all_subnets(void) {
 
                        if((s2 = lookup_subnet(n, s))) {
                                s2->expires = -1;
+                               free(s);
                        } else {
                                subnet_add(n, s);
                        }
@@ -383,13 +379,12 @@ void load_all_subnets(void) {
 void load_all_nodes(void) {
        DIR *dir;
        struct dirent *ent;
-       char *dname;
+       char dname[PATH_MAX];
 
-       xasprintf(&dname, "%s" SLASH "hosts", confbase);
+       snprintf(dname, sizeof dname, "%s" SLASH "hosts", confbase);
        dir = opendir(dname);
        if(!dir) {
                logger(DEBUG_ALWAYS, LOG_ERR, "Could not open %s: %s", dname, strerror(errno));
-               free(dname);
                return;
        }
 
@@ -667,7 +662,7 @@ static bool add_listen_address(char *address, bool bindto) {
        hint.ai_protocol = IPPROTO_TCP;
        hint.ai_flags = AI_PASSIVE;
 
-#ifdef HAVE_DECL_RES_INIT
+#if HAVE_DECL_RES_INIT
        res_init();
 #endif
        int err = getaddrinfo(address && *address ? address : NULL, port, &hint, &ai);
@@ -857,14 +852,14 @@ static bool setup_myself(void) {
        }
 
        if(get_config_int(lookup_config(config_tree, "UDPRcvBuf"), &udp_rcvbuf)) {
-               if(udp_rcvbuf <= 0) {
+               if(udp_rcvbuf < 0) {
                        logger(DEBUG_ALWAYS, LOG_ERR, "UDPRcvBuf cannot be negative!");
                        return false;
                }
        }
 
        if(get_config_int(lookup_config(config_tree, "UDPSndBuf"), &udp_sndbuf)) {
-               if(udp_sndbuf <= 0) {
+               if(udp_sndbuf < 0) {
                        logger(DEBUG_ALWAYS, LOG_ERR, "UDPSndBuf cannot be negative!");
                        return false;
                }
@@ -967,6 +962,7 @@ static bool setup_myself(void) {
                else if(!strcasecmp(type, "vde"))
                        devops = vde_devops;
 #endif
+               free(type);
        }
 
        get_config_bool(lookup_config(config_tree, "DeviceStandby"), &device_standby);