Fix memory leaks found by Valgrind.

[tinc] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index c4f2127..a7ed3a8 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -44,6 +44,7 @@
 #include "xalloc.h"
 
 char *myport;
+static char *myname;
 static io_t device_io;
 devops_t devops;
 bool device_standby = false;
@@ -402,41 +403,16 @@ void load_all_nodes(void) {
 
 char *get_name(void) {
        char *name = NULL;
+       char *returned_name;
 
        get_config_string(lookup_config(config_tree, "Name"), &name);
 
        if(!name)
                return NULL;
 
-       if(*name == '$') {
-               char *envname = getenv(name + 1);
-               char hostname[32] = "";
-               if(!envname) {
-                       if(strcmp(name + 1, "HOST")) {
-                               logger(DEBUG_ALWAYS, LOG_ERR, "Invalid Name: environment variable %s does not exist\n", name + 1);
-                               return false;
-                       }
-                       if(gethostname(hostname, sizeof hostname) || !*hostname) {
-                               logger(DEBUG_ALWAYS, LOG_ERR, "Could not get hostname: %s\n", sockstrerror(sockerrno));
-                               return false;
-                       }
-                       hostname[31] = 0;
-                       envname = hostname;
-               }
-               free(name);
-               name = xstrdup(envname);
-               for(char *c = name; *c; c++)
-                       if(!isalnum(*c))
-                               *c = '_';
-       }
-
-       if(!check_id(name)) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Invalid name for myself!");
-               free(name);
-               return false;
-       }
-
-       return name;
+       returned_name = replace_name(name);
+       free(name);
+       return returned_name;
 }
 
 bool setup_myself_reloadable(void) {
@@ -445,7 +421,6 @@ bool setup_myself_reloadable(void) {
        char *fmode = NULL;
        char *bmode = NULL;
        char *afname = NULL;
-       char *address = NULL;
        char *space;
        bool choice;
 
@@ -741,7 +716,7 @@ void device_enable(void) {
        xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
        xasprintf(&envp[1], "DEVICE=%s", device ? : "");
        xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
-       xasprintf(&envp[3], "NAME=%s", myself->name);
+       xasprintf(&envp[3], "NAME=%s", myname);
 
        execute_script("tinc-up", envp);
 
@@ -754,7 +729,7 @@ void device_disable(void) {
        xasprintf(&envp[0], "NETNAME=%s", netname ? : "");
        xasprintf(&envp[1], "DEVICE=%s", device ? : "");
        xasprintf(&envp[2], "INTERFACE=%s", iface ? : "");
-       xasprintf(&envp[3], "NAME=%s", myself->name);
+       xasprintf(&envp[3], "NAME=%s", myname);
 
        execute_script("tinc-down", envp);
 
@@ -778,6 +753,7 @@ static bool setup_myself(void) {
                return false;
        }
 
+       myname = xstrdup(name);
        myself = new_node();
        myself->connection = new_connection();
        myself->name = name;
@@ -1138,13 +1114,18 @@ void close_network_connections(void) {
        if (!device_standby)
                device_disable();
 
-       if(myport) free(myport);
+       free(myport);
 
        if (device_fd >= 0)
                io_del(&device_io);
-       devops.close();
+       if (devops.close)
+               devops.close();
 
        exit_control();
 
+       free(myname);
+       free(scriptextension);
+       free(scriptinterpreter);
+
        return;
 }