X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Ftincd.c;h=a13e2661046f58d2ca64df3a423e1e0a1e492f17;hp=27cd01ef05352a7540055334b83a86013afd61e7;hb=73d77dd416b87b7c4e9b6aa450f64846235cd2b4;hpb=41c10c5a966000531099c79d6006429253ff8fd6

diff --git a/src/tincd.c b/src/tincd.c
index 27cd01ef..a13e2661 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -337,7 +337,7 @@ static bool keygen(int bits)
 	} else
 		fprintf(stderr, _("Done.\n"));
 
-	asprintf(&filename, "%s/rsa_key.priv", confbase);
+	xasprintf(&filename, "%s/rsa_key.priv", confbase);
 	f = ask_and_open(filename, _("private RSA key"));
 
 	if(!f)
@@ -356,9 +356,9 @@ static bool keygen(int bits)
 	free(filename);
 
 	if(name)
-		asprintf(&filename, "%s/hosts/%s", confbase, name);
+		xasprintf(&filename, "%s/hosts/%s", confbase, name);
 	else
-		asprintf(&filename, "%s/rsa_key.pub", confbase);
+		xasprintf(&filename, "%s/rsa_key.pub", confbase);
 
 	f = ask_and_open(filename, _("public RSA key"));
 
@@ -389,7 +389,7 @@ static void make_names(void)
 #endif
 
 	if(netname)
-		asprintf(&identname, "tinc.%s", netname);
+		xasprintf(&identname, "tinc.%s", netname);
 	else
 		identname = xstrdup("tinc");
 
@@ -397,12 +397,12 @@ 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)
-				asprintf(&logfilename, "%s/log/%s.log", identname);
+				xasprintf(&logfilename, "%s/log/%s.log", identname);
 			if(!confbase) {
 				if(netname)
-					asprintf(&confbase, "%s/%s", installdir, netname);
+					xasprintf(&confbase, "%s/%s", installdir, netname);
 				else
-					asprintf(&confbase, "%s", installdir);
+					xasprintf(&confbase, "%s", installdir);
 			}
 		}
 		RegCloseKey(key);
@@ -412,19 +412,19 @@ static void make_names(void)
 #endif
 
 	if(!pidfilename)
-		asprintf(&pidfilename, LOCALSTATEDIR "/run/%s.pid", identname);
+		xasprintf(&pidfilename, LOCALSTATEDIR "/run/%s.pid", identname);
 
 	if(!logfilename)
-		asprintf(&logfilename, LOCALSTATEDIR "/log/%s.log", identname);
+		xasprintf(&logfilename, LOCALSTATEDIR "/log/%s.log", identname);
 
 	if(netname) {
 		if(!confbase)
-			asprintf(&confbase, CONFDIR "/tinc/%s", netname);
+			xasprintf(&confbase, CONFDIR "/tinc/%s", netname);
 		else
 			logger(LOG_INFO, _("Both netname and configuration directory given, using the latter..."));
 	} else {
 		if(!confbase)
-			asprintf(&confbase, CONFDIR "/tinc");
+			xasprintf(&confbase, CONFDIR "/tinc");
 	}
 }
 
@@ -484,6 +484,15 @@ static bool drop_privs() {
 	return true;
 }
 
+#ifdef HAVE_MINGW
+# define setpriority(level) SetPriorityClass(GetCurrentProcess(), level)
+#else
+# define NORMAL_PRIORITY_CLASS 0
+# define BELOW_NORMAL_PRIORITY_CLASS 10
+# define HIGH_PRIORITY_CLASS -10
+# define setpriority(level) nice(level)
+#endif
+
 int main(int argc, char **argv)
 {
 	program_name = argv[0];
@@ -580,30 +589,22 @@ int main2(int argc, char **argv)
 	if(!setup_network())
 		goto end;
 
-        /* Change process priority */
+	/* Initiate all outgoing connections. */
+
+	try_outgoing_connections();
+
+	/* Change process priority */
 
         char *priority = 0;
 
         if(get_config_string(lookup_config(config_tree, "ProcessPriority"), &priority)) {
-                if(!strcasecmp(priority, "Normal")) {
-#ifdef HAVE_MINGW
-                        SetPriorityClass(GetCurrentProcess(), NORMAL_PRIORITY_CLASS);
-#else
-                        nice(0);
-#endif
-                } else if(!strcasecmp(priority, "Low")) {
-#ifdef HAVE_MINGW
-                        SetPriorityClass(GetCurrentProcess(), BELOW_NORMAL_PRIORITY_CLASS);
-#else
-                        nice(10);
-#endif
-                } else if(!strcasecmp(priority, "High")) {
-#ifdef HAVE_MINGW
-                        SetPriorityClass(GetCurrentProcess(), HIGH_PRIORITY_CLASS);
-#else
-                        nice(-10);
-#endif
-                } else {
+                if(!strcasecmp(priority, "Normal"))
+                        setpriority(NORMAL_PRIORITY_CLASS);
+                else if(!strcasecmp(priority, "Low"))
+                        setpriority(BELOW_NORMAL_PRIORITY_CLASS);
+                else if(!strcasecmp(priority, "High"))
+                        setpriority(HIGH_PRIORITY_CLASS);
+                else {
                         logger(LOG_ERR, _("Invalid priority `%s`!"), priority);
                         goto end;
                 }
@@ -613,10 +614,6 @@ int main2(int argc, char **argv)
 	if (!drop_privs())
 		goto end;
 
-	/* Initiate all outgoing connections. */
-
-	try_outgoing_connections();
-
 	/* Start main loop. It only exits when tinc is killed. */
 
 	status = main_loop();