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

diff --git a/src/tincd.c b/src/tincd.c
index 27cd01ef..da3c33fa 100644
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -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();