Fix not reading Port statement from host config file.

[tinc] / src / net_setup.c

diff --git a/src/net_setup.c b/src/net_setup.c
index ecffed9..1c9a952 100644 (file)
--- a/src/net_setup.c
+++ b/src/net_setup.c
@@ -229,7 +229,7 @@ static bool read_rsa_private_key(void) {
                result = rsa_set_hex_private_key(&myself->connection->rsa, n, "FFFF", d);
                free(n);
                free(d);
-               return true;
+               return result;
        }
 
        /* Else, check for PrivateKeyFile statement and read it */
@@ -571,11 +571,22 @@ static bool setup_myself(void) {
        int i, err;
        int replaywin_int;
 
+       if(!(name = get_name())) {
+               logger(DEBUG_ALWAYS, LOG_ERR, "Name for tinc daemon required!");
+               return false;
+       }
+
        myself = new_node();
        myself->connection = new_connection();
+       myself->name = name;
+       myself->connection->name = xstrdup(name);
+       xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
+       read_config_options(config_tree, name);
+       read_config_file(config_tree, fname);
+       free(fname);
 
        if(!get_config_string(lookup_config(config_tree, "Port"), &myport))
-               myport = xstrdup("655");
+               abort(); //myport = xstrdup("655");
 
        xasprintf(&myself->hostname, "MYSELF port %s", myport);
        myself->connection->hostname = xstrdup(myself->hostname);
@@ -586,18 +597,6 @@ static bool setup_myself(void) {
 
        myself->options |= PROT_MINOR << 24;
 
-       if(!(name = get_name())) {
-               logger(DEBUG_ALWAYS, LOG_ERR, "Name for tinc daemon required!");
-               return false;
-       }
-
-       myself->name = name;
-       myself->connection->name = xstrdup(name);
-       xasprintf(&fname, "%s" SLASH "hosts" SLASH "%s", confbase, name);
-       read_config_options(config_tree, name);
-       read_config_file(config_tree, fname);
-       free(fname);
-
        get_config_bool(lookup_config(config_tree, "ExperimentalProtocol"), &experimental);
 
        if(experimental && !read_ecdsa_private_key())
@@ -916,6 +915,8 @@ static bool setup_myself(void) {
                return false;
        }
 
+       last_config_check = time(NULL);
+
        return true;
 }