Raise default RSA key length to 2048 bits.

[tinc] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index a8a0146..602f18b 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -115,6 +115,7 @@ static struct option const long_options[] = {
 
 #ifdef HAVE_MINGW
 static struct WSAData wsa_state;
+CRITICAL_SECTION mutex;
 #endif
 
 static void usage(bool status)
@@ -160,8 +161,13 @@ static bool parse_options(int argc, char **argv)
                                break;
 
                        case 'L':                               /* no detach */
+#ifndef HAVE_MLOCKALL
+                               logger(LOG_ERR, _("%s not supported on this platform"), "mlockall()");
+                               return false;
+#else
                                do_mlock = true;
                                break;
+#endif
 
                        case 'd':                               /* inc debug level */
                                if(optarg)
@@ -223,7 +229,7 @@ static bool parse_options(int argc, char **argv)
 
                                        generate_keys &= ~7;    /* Round it to bytes */
                                } else
-                                       generate_keys = 1024;
+                                       generate_keys = 2048;
                                break;
 
                        case 'R':                               /* chroot to NETNAME dir */
@@ -332,7 +338,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)
@@ -351,9 +357,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"));
 
@@ -384,7 +390,7 @@ static void make_names(void)
 #endif
 
        if(netname)
-               asprintf(&identname, "tinc.%s", netname);
+               xasprintf(&identname, "tinc.%s", netname);
        else
                identname = xstrdup("tinc");
 
@@ -392,12 +398,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);
@@ -407,19 +413,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");
        }
 }
 
@@ -452,7 +458,8 @@ static bool drop_privs() {
                uid = pw->pw_uid;
                if (initgroups(switchuser, pw->pw_gid) != 0 ||
                    setgid(pw->pw_gid) != 0) {
-                       logger(LOG_ERR, _("%s failed"), "initgroups()");
+                       logger(LOG_ERR, _("System call `%s' failed: %s"),
+                              "initgroups", strerror(errno));
                        return false;
                }
                endgrent();
@@ -460,8 +467,9 @@ static bool drop_privs() {
        }
        if (do_chroot) {
                tzset();        /* for proper timestamps in logs */
-               if (chroot(confbase) != 0 || chdir(".") != 0) {
-                       logger(LOG_ERR, _("%s failed"), "chroot()");
+               if (chroot(confbase) != 0 || chdir("/") != 0) {
+                       logger(LOG_ERR, _("System call `%s' failed: %s"),
+                              "chroot", strerror(errno));
                        return false;
                }
                free(confbase);
@@ -469,13 +477,23 @@ static bool drop_privs() {
        }
        if (switchuser)
                if (setuid(uid) != 0) {
-                       logger(LOG_ERR, _("%s failed"), "setuid()");
+                       logger(LOG_ERR, _("System call `%s' failed: %s"),
+                              "setuid", strerror(errno));
                        return false;
                }
 #endif
        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];
@@ -511,20 +529,6 @@ int main(int argc, char **argv)
 
        openlogger("tinc", use_logfile?LOGMODE_FILE:LOGMODE_STDERR);
 
-       /* Lock all pages into memory if requested */
-
-       if(do_mlock)
-#ifdef HAVE_MLOCKALL
-               if(mlockall(MCL_CURRENT | MCL_FUTURE)) {
-                       logger(LOG_ERR, _("System call `%s' failed: %s"), "mlockall",
-                                  strerror(errno));
-#else
-       {
-               logger(LOG_ERR, _("mlockall() not supported on this platform!"));
-#endif
-               return -1;
-       }
-
        g_argv = argv;
 
        init_configuration(&config_tree);
@@ -565,24 +569,54 @@ int main(int argc, char **argv)
 
 int main2(int argc, char **argv)
 {
+       InitializeCriticalSection(&mutex);
+       EnterCriticalSection(&mutex);
 #endif
 
        if(!detach())
                return 1;
 
+#ifdef HAVE_MLOCKALL
+       /* Lock all pages into memory if requested.
+        * This has to be done after daemon()/fork() so it works for child.
+        * No need to do that in parent as it's very short-lived. */
+       if(do_mlock && mlockall(MCL_CURRENT | MCL_FUTURE) != 0) {
+               logger(LOG_ERR, _("System call `%s' failed: %s"), "mlockall",
+                  strerror(errno));
+               return 1;
+       }
+#endif
+
        /* Setup sockets and open device. */
 
        if(!setup_network())
                goto end;
 
-       /* drop privileges */
-       if (!drop_privs())
-               goto end;
-
        /* 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"))
+                        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;
+                }
+        }
+
+       /* drop privileges */
+       if (!drop_privs())
+               goto end;
+
        /* Start main loop. It only exits when tinc is killed. */
 
        status = main_loop();