X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Ftincd.c;h=98123feb3db07ee8910d245110eea696bba5d710;hb=aaff0ed08916f936b0a7b8a3d0607b8111b7a185;hp=3cbac4ba25f5daa4a29b2f0189dc8b466aff035a;hpb=268c8545aaf83b7433f43402f5c77e39e20006ef;p=tinc

diff --git a/src/tincd.c b/src/tincd.c
index 3cbac4ba..98123feb 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -177,9 +177,7 @@ static bool parse_options(int argc, char **argv) {
 				break;
 
 			case 'n':				/* net name given */
-				/* netname "." is special: a "top-level name" */
-				netname = strcmp(optarg, ".") != 0 ?
-						xstrdup(optarg) : NULL;
+				netname = xstrdup(optarg);
 				break;
 
 			case 'o':				/* option */
@@ -228,6 +226,16 @@ static bool parse_options(int argc, char **argv) {
 		}
 	}
 
+	if(!netname && (netname = getenv("NETNAME")))
+		netname = xstrdup(netname);
+
+	/* netname "." is special: a "top-level name" */
+
+	if(netname && !strcmp(netname, ".")) {
+		free(netname);
+		netname = NULL;
+	}
+
 	return true;
 }
 
@@ -250,15 +258,15 @@ static void make_names(void) {
 	if(!RegOpenKeyEx(HKEY_LOCAL_MACHINE, "SOFTWARE\\tinc", 0, KEY_READ, &key)) {
 		if(!RegQueryValueEx(key, NULL, 0, 0, installdir, &len)) {
 			if(!logfilename)
-				xasprintf(&logfilename, "%s/log/%s.log", identname);
+				xasprintf(&logfilename, "%s" SLASH "log" SLASH "%s.log", identname);
 			if(!confbase) {
 				if(netname)
-					xasprintf(&confbase, "%s/%s", installdir, netname);
+					xasprintf(&confbase, "%s" SLASH "%s", installdir, netname);
 				else
 					xasprintf(&confbase, "%s", installdir);
 			}
 			if(!pidfilename)
-				xasprintf(&pidfilename, "%s/pid", confbase);
+				xasprintf(&pidfilename, "%s" SLASH "pid", confbase);
 		}
 		RegCloseKey(key);
 		if(*installdir)
@@ -267,19 +275,19 @@ static void make_names(void) {
 #endif
 
 	if(!logfilename)
-		xasprintf(&logfilename, LOCALSTATEDIR "/log/%s.log", identname);
+		xasprintf(&logfilename, LOCALSTATEDIR SLASH "log" SLASH "%s.log", identname);
 
 	if(!pidfilename)
-		xasprintf(&pidfilename, LOCALSTATEDIR "/run/%s.pid", identname);
+		xasprintf(&pidfilename, LOCALSTATEDIR SLASH "run" SLASH "%s.pid", identname);
 
 	if(netname) {
 		if(!confbase)
-			xasprintf(&confbase, CONFDIR "/tinc/%s", netname);
+			xasprintf(&confbase, CONFDIR SLASH "tinc" SLASH "%s", netname);
 		else
 			logger(DEBUG_ALWAYS, LOG_INFO, "Both netname and configuration directory given, using the latter...");
 	} else {
 		if(!confbase)
-			xasprintf(&confbase, CONFDIR "/tinc");
+			xasprintf(&confbase, CONFDIR SLASH "tinc");
 	}
 }
 
@@ -382,11 +390,6 @@ int main(int argc, char **argv) {
 
 	openlogger("tinc", use_logfile?LOGMODE_FILE:LOGMODE_STDERR);
 
-	if(!event_init()) {
-		logger(DEBUG_ALWAYS, LOG_ERR, "Error initializing libevent!");
-		return 1;
-	}
-
 	g_argv = argv;
 
 	if(getenv("LISTEN_PID") && atoi(getenv("LISTEN_PID")) == getpid())
@@ -439,6 +442,11 @@ int main2(int argc, char **argv) {
 	}
 #endif
 
+	if(!event_init()) {
+		logger(DEBUG_ALWAYS, LOG_ERR, "Error initializing libevent!");
+		return 1;
+	}
+
 	/* Setup sockets and open device. */
 
 	if(!setup_network())