Refactor crypto RNG; add getrandom() support
[tinc] / src / tincd.c
index dee38ef..947e7b3 100644 (file)
@@ -1,7 +1,7 @@
 /*
     tincd.c -- the main file for tincd
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2021 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2022 Guus Sliepen <guus@tinc-vpn.org>
                   2008      Max Rijevski <maksuf@gmail.com>
                   2009      Michael Tokarev <mjt@tls.msk.ru>
                   2010      Julien Muchembled <jm@jmuchemb.eu>
 #define _P1003_1B_VISIBLE
 #endif
 
-#ifdef HAVE_SYS_MMAN_H
-#include <sys/mman.h>
-#endif
-
 #ifdef HAVE_LZO
 #include LZO1X_H
 #endif
 
-#ifdef LZ4_H
-#include LZ4_H
+#ifdef HAVE_LZ4
+#include <lz4.h>
 #endif
 
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
 #include <pwd.h>
 #include <grp.h>
 #include <time.h>
@@ -58,6 +54,7 @@
 #include "utils.h"
 #include "xalloc.h"
 #include "version.h"
+#include "random.h"
 
 /* If nonzero, display usage information and exit. */
 static bool show_help = false;
@@ -65,15 +62,12 @@ static bool show_help = false;
 /* If nonzero, print the version on standard output and exit.  */
 static bool show_version = false;
 
-/* If nonzero, use null ciphers and skip all key exchanges. */
-bool bypass_security = false;
-
 #ifdef HAVE_MLOCKALL
 /* If nonzero, disable swapping for this process. */
 static bool do_mlock = false;
 #endif
 
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
 /* If nonzero, chroot to netdir after startup. */
 static bool do_chroot = false;
 
@@ -81,12 +75,6 @@ static bool do_chroot = false;
 static const char *switchuser = NULL;
 #endif
 
-/* If nonzero, write log entries to a separate file. */
-bool use_logfile = false;
-
-/* If nonzero, use syslog instead of stderr in no-detach mode. */
-bool use_syslog = false;
-
 char **g_argv;                  /* a copy of the cmdline arguments */
 
 static int status = 1;
@@ -109,7 +97,7 @@ static struct option const long_options[] = {
        {NULL, 0, NULL, 0}
 };
 
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
 static struct WSAData wsa_state;
 int main2(int argc, char **argv);
 #endif
@@ -119,26 +107,31 @@ static void usage(bool status) {
                fprintf(stderr, "Try `%s --help\' for more information.\n",
                        program_name);
        else {
-               printf("Usage: %s [option]...\n\n", program_name);
-               printf("  -c, --config=DIR              Read configuration options from DIR.\n"
-                      "  -D, --no-detach               Don't fork and detach.\n"
-                      "  -d, --debug[=LEVEL]           Increase debug level or set it to LEVEL.\n"
-                      "  -n, --net=NETNAME             Connect to net NETNAME.\n"
+               static const char *message =
+                       "Usage: %s [option]...\n"
+                       "\n"
+                       "  -c, --config=DIR              Read configuration options from DIR.\n"
+                       "  -D, --no-detach               Don't fork and detach.\n"
+                       "  -d, --debug[=LEVEL]           Increase debug level or set it to LEVEL.\n"
+                       "  -n, --net=NETNAME             Connect to net NETNAME.\n"
 #ifdef HAVE_MLOCKALL
-                      "  -L, --mlock                   Lock tinc into main memory.\n"
-#endif
-                      "      --logfile[=FILENAME]      Write log entries to a logfile.\n"
-                      "  -s  --syslog                  Use syslog instead of stderr with --no-detach.\n"
-                      "      --pidfile=FILENAME        Write PID and control socket cookie to FILENAME.\n"
-                      "      --bypass-security         Disables meta protocol security, for debugging.\n"
-                      "  -o, --option[HOST.]KEY=VALUE  Set global/host configuration value.\n"
-#ifndef HAVE_MINGW
-                      "  -R, --chroot                  chroot to NET dir at startup.\n"
-                      "  -U, --user=USER               setuid to given USER at startup.\n"
-#endif
-                      "      --help                    Display this help and exit.\n"
-                      "      --version                 Output version information and exit.\n\n");
-               printf("Report bugs to tinc@tinc-vpn.org.\n");
+                       "  -L, --mlock                   Lock tinc into main memory.\n"
+#endif
+                       "      --logfile[=FILENAME]      Write log entries to a logfile.\n"
+                       "  -s  --syslog                  Use syslog instead of stderr with --no-detach.\n"
+                       "      --pidfile=FILENAME        Write PID and control socket cookie to FILENAME.\n"
+                       "      --bypass-security         Disables meta protocol security, for debugging.\n"
+                       "  -o, --option[HOST.]KEY=VALUE  Set global/host configuration value.\n"
+#ifndef HAVE_WINDOWS
+                       "  -R, --chroot                  chroot to NET dir at startup.\n"
+                       "  -U, --user=USER               setuid to given USER at startup.\n"
+#endif
+                       "      --help                    Display this help and exit.\n"
+                       "      --version                 Output version information and exit.\n"
+                       "\n"
+                       "Report bugs to tinc@tinc-vpn.org.\n";
+
+               printf(message, program_name);
        }
 }
 
@@ -204,7 +197,7 @@ static bool parse_options(int argc, char **argv) {
                        list_insert_tail(&cmdline_conf, cfg);
                        break;
 
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
 
                case 'R':
                case 'U':
@@ -297,7 +290,7 @@ exit_fail:
 }
 
 static bool drop_privs(void) {
-#ifndef HAVE_MINGW
+#ifndef HAVE_WINDOWS
        uid_t uid = 0;
 
        if(switchuser) {
@@ -350,7 +343,7 @@ static bool drop_privs(void) {
        return true;
 }
 
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
 # define setpriority(level) !SetPriorityClass(GetCurrentProcess(), (level))
 
 static void stop_handler(void *data, int flags) {
@@ -378,11 +371,8 @@ static BOOL WINAPI console_ctrl_handler(DWORD type) {
 # define setpriority(level) (setpriority(PRIO_PROCESS, 0, (level)))
 #endif
 
-static void cleanup() {
-       if(config_tree) {
-               exit_configuration(&config_tree);
-       }
-
+static void cleanup(void) {
+       splay_empty_tree(&config_tree);
        list_empty_list(&cmdline_conf);
        free_names();
 }
@@ -395,49 +385,51 @@ int main(int argc, char **argv) {
        }
 
        if(show_version) {
-               printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
-                      BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
-               printf("Features:"
+               static const char *message =
+                       "%s version %s (built %s %s, protocol %d.%d)\n"
+                       "Features:"
 #ifdef HAVE_OPENSSL
-                      " openssl"
+                       " openssl"
 #endif
 #ifdef HAVE_LIBGCRYPT
-                      " libgcrypt"
+                       " libgcrypt"
 #endif
 #ifdef HAVE_LZO
-                      " comp_lzo"
+                       " comp_lzo"
 #endif
 #ifdef HAVE_ZLIB
-                      " comp_zlib"
+                       " comp_zlib"
 #endif
 #ifdef HAVE_LZ4
-                      " comp_lz4"
+                       " comp_lz4"
 #endif
 #ifndef DISABLE_LEGACY
-                      " legacy_protocol"
+                       " legacy_protocol"
 #endif
 #ifdef ENABLE_JUMBOGRAMS
-                      " jumbograms"
+                       " jumbograms"
 #endif
 #ifdef ENABLE_TUNEMU
-                      " tunemu"
+                       " tunemu"
 #endif
 #ifdef HAVE_MINIUPNPC
-                      " miniupnpc"
+                       " miniupnpc"
 #endif
 #ifdef ENABLE_UML
-                      " uml"
+                       " uml"
 #endif
 #ifdef ENABLE_VDE
-                      " vde"
+                       " vde"
 #endif
-                      "\n\n");
-               printf("Copyright (C) 1998-2021 Ivo Timmermans, Guus Sliepen and others.\n"
-                      "See the AUTHORS file for a complete list.\n\n"
-                      "tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
-                      "and you are welcome to redistribute it under certain conditions;\n"
-                      "see the file COPYING for details.\n");
+                       "\n\n"
+                       "Copyright (C) 1998-2021 Ivo Timmermans, Guus Sliepen and others.\n"
+                       "See the AUTHORS file for a complete list.\n"
+                       "\n"
+                       "tinc comes with ABSOLUTELY NO WARRANTY.  This is free software,\n"
+                       "and you are welcome to redistribute it under certain conditions;\n"
+                       "see the file COPYING for details.\n";
 
+               printf(message, PACKAGE, BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
                return 0;
        }
 
@@ -449,9 +441,12 @@ int main(int argc, char **argv) {
        make_names(true);
        atexit(cleanup);
 
-       chdir(confbase);
+       if(chdir(confbase) == -1) {
+               logger(DEBUG_ALWAYS, LOG_ERR, "Could not change to configuration directory: %s", strerror(errno));
+               return 1;
+       }
 
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
 
        if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) {
                logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "WSAStartup", winerror(GetLastError()));
@@ -492,22 +487,19 @@ int main(int argc, char **argv) {
        unsetenv("LISTEN_PID");
 #endif
 
-       init_configuration(&config_tree);
-
-       /* Slllluuuuuuurrrrp! */
-
        gettimeofday(&now, NULL);
-       srand(now.tv_sec + now.tv_usec);
+       random_init();
        crypto_init();
+       prng_init();
 
-       if(!read_server_config(config_tree)) {
+       if(!read_server_config(&config_tree)) {
                return 1;
        }
 
        if(debug_level == DEBUG_NOTHING) {
                int level = 0;
 
-               if(get_config_int(lookup_config(config_tree, "LogLevel"), &level)) {
+               if(get_config_int(lookup_config(&config_tree, "LogLevel"), &level)) {
                        debug_level = level;
                }
        }
@@ -521,7 +513,7 @@ int main(int argc, char **argv) {
 
 #endif
 
-#ifdef HAVE_MINGW
+#ifdef HAVE_WINDOWS
        io_add_event(&stop_io, stop_handler, NULL, WSACreateEvent());
 
        if(stop_io.event == FALSE) {
@@ -576,7 +568,7 @@ int main2(int argc, char **argv) {
 
        /* Change process priority */
 
-       if(get_config_string(lookup_config(config_tree, "ProcessPriority"), &priority)) {
+       if(get_config_string(lookup_config(&config_tree, "ProcessPriority"), &priority)) {
                if(!strcasecmp(priority, "Normal")) {
                        if(setpriority(NORMAL_PRIORITY_CLASS) != 0) {
                                logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "setpriority", strerror(errno));
@@ -608,7 +600,10 @@ int main2(int argc, char **argv) {
        logger(DEBUG_ALWAYS, LOG_NOTICE, "Ready");
 
        if(umbilical) { // snip!
-               write(umbilical, "", 1);
+               if(write(umbilical, "", 1) != 1) {
+                       // Pipe full or broken, nothing we can do about it.
+               }
+
                close(umbilical);
                umbilical = 0;
        }
@@ -626,7 +621,7 @@ end:
 
        free(priority);
 
-       crypto_exit();
+       random_exit();
 
        return status;
 }