projects
/
tinc
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6dfdb32
)
Fix not reading Port statement from host config file.
author
Guus Sliepen
<guus@tinc-vpn.org>
Sun, 30 Sep 2012 20:43:48 +0000
(22:43 +0200)
committer
Guus Sliepen
<guus@tinc-vpn.org>
Sun, 30 Sep 2012 20:43:48 +0000
(22:43 +0200)
src/net_setup.c
patch
|
blob
|
history
diff --git
a/src/net_setup.c
b/src/net_setup.c
index
c033e22
..
1c9a952
100644
(file)
--- 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;
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 = 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))
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);
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;
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())
get_config_bool(lookup_config(config_tree, "ExperimentalProtocol"), &experimental);
if(experimental && !read_ecdsa_private_key())