From dd1b69e31f83e2cc200ecc10e6d927373823332b Mon Sep 17 00:00:00 2001 From: Guus Sliepen Date: Sun, 30 Sep 2012 22:43:48 +0200 Subject: [PATCH] Fix not reading Port statement from host config file. --- src/net_setup.c | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/src/net_setup.c b/src/net_setup.c index c033e220..1c9a952d 100644 --- a/src/net_setup.c +++ b/src/net_setup.c @@ -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()) -- 2.20.1