Releasing 1.1pre12.
[tinc] / src / tincd.c
index 8c2b12d..4da9bd5 100644 (file)
@@ -1,9 +1,11 @@
 /*
     tincd.c -- the main file for tincd
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2016 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>
+                  2010      Timothy Redaelli <timothy@redaelli.eu>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
 #include <sys/mman.h>
 #endif
 
-#include <openssl/rand.h>
-#include <openssl/rsa.h>
-#include <openssl/pem.h>
-#include <openssl/evp.h>
-#include <openssl/engine.h>
-
+#ifdef HAVE_LZO
 #include LZO1X_H
+#endif
 
 #ifndef HAVE_MINGW
 #include <pwd.h>
 #include <time.h>
 #endif
 
-#include <getopt.h>
-#include "pidfile.h"
-
 #include "conf.h"
+#include "control.h"
+#include "crypto.h"
 #include "device.h"
+#include "event.h"
 #include "logger.h"
+#include "names.h"
 #include "net.h"
 #include "netutl.h"
 #include "process.h"
 #include "protocol.h"
 #include "utils.h"
 #include "xalloc.h"
-
-/* The name this program was run with. */
-char *program_name = NULL;
+#include "version.h"
 
 /* If nonzero, display usage information and exit. */
-bool show_help = false;
+static bool show_help = false;
 
 /* If nonzero, print the version on standard output and exit.  */
-bool show_version = false;
-
-/* If nonzero, it will attempt to kill a running tincd and exit. */
-int kill_tincd = 0;
-
-/* If nonzero, generate public/private keypair for this host/net. */
-int generate_keys = 0;
+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. */
-bool do_mlock = false;
+static bool do_mlock = false;
+#endif
 
+#ifndef HAVE_MINGW
 /* If nonzero, chroot to netdir after startup. */
 static bool do_chroot = false;
 
 /* If !NULL, do setuid to given user after startup */
 static const char *switchuser = NULL;
+#endif
 
 /* If nonzero, write log entries to a separate file. */
 bool use_logfile = false;
 
-char *identname = NULL;                                /* program name for syslog */
-char *pidfilename = NULL;                      /* pid file location */
-char *logfilename = NULL;                      /* log file location */
-char **g_argv;                                 /* a copy of the cmdline arguments */
+/* 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;
+static int status = 1;
 
 static struct option const long_options[] = {
        {"config", required_argument, NULL, 'c'},
-       {"kill", optional_argument, NULL, 'k'},
        {"net", required_argument, NULL, 'n'},
        {"help", no_argument, NULL, 1},
        {"version", no_argument, NULL, 2},
        {"no-detach", no_argument, NULL, 'D'},
-       {"generate-keys", optional_argument, NULL, 'K'},
        {"debug", optional_argument, NULL, 'd'},
        {"bypass-security", no_argument, NULL, 3},
        {"mlock", no_argument, NULL, 'L'},
        {"chroot", no_argument, NULL, 'R'},
        {"user", required_argument, NULL, 'U'},
        {"logfile", optional_argument, NULL, 4},
+       {"syslog", no_argument, NULL, 's'},
        {"pidfile", required_argument, NULL, 5},
+       {"option", required_argument, NULL, 'o'},
        {NULL, 0, NULL, 0}
 };
 
 #ifdef HAVE_MINGW
 static struct WSAData wsa_state;
-CRITICAL_SECTION mutex;
+int main2(int argc, char **argv);
 #endif
 
 static void usage(bool status) {
@@ -124,143 +119,124 @@ static void usage(bool status) {
                                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"
-                               "  -k, --kill[=SIGNAL]        Attempt to kill a running tincd and exit.\n"
-                               "  -n, --net=NETNAME          Connect to net NETNAME.\n"
-                               "  -K, --generate-keys[=BITS] Generate public/private RSA keypair.\n"
-                               "  -L, --mlock                Lock tinc into main memory.\n"
-                               "      --logfile[=FILENAME]   Write log entries to a logfile.\n"
-                               "      --pidfile=FILENAME     Write PID to FILENAME.\n"
-                               "  -R, --chroot               chroot to NET dir at startup.\n"
-                               "  -U, --user=USER            setuid to given USER at startup.\n"
-                               "      --help                 Display this help and exit.\n"
-                               "      --version              Output version information and exit.\n\n");
+               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"
+#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");
        }
 }
 
 static bool parse_options(int argc, char **argv) {
+       config_t *cfg;
        int r;
        int option_index = 0;
+       int lineno = 0;
 
-       while((r = getopt_long(argc, argv, "c:DLd::k::n:K::RU:", long_options, &option_index)) != EOF) {
+       cmdline_conf = list_alloc((list_action_t)free_config);
+
+       while((r = getopt_long(argc, argv, "c:DLd::n:so:RU:", long_options, &option_index)) != EOF) {
                switch (r) {
-                       case 0:                         /* long option */
+                       case 0:   /* long option */
                                break;
 
-                       case 'c':                               /* config file */
+                       case 'c': /* config file */
                                confbase = xstrdup(optarg);
                                break;
 
-                       case 'D':                               /* no detach */
+                       case 'D': /* no detach */
                                do_detach = false;
                                break;
 
-                       case 'L':                               /* no detach */
+                       case 'L': /* no detach */
 #ifndef HAVE_MLOCKALL
-                               logger(LOG_ERR, "%s not supported on this platform", "mlockall()");
+                               logger(DEBUG_ALWAYS, LOG_ERR, "The %s option is not supported on this platform.", argv[optind - 1]);
                                return false;
 #else
                                do_mlock = true;
                                break;
 #endif
 
-                       case 'd':                               /* inc debug level */
+                       case 'd': /* increase debug level */
+                               if(!optarg && optind < argc && *argv[optind] != '-')
+                                       optarg = argv[optind++];
                                if(optarg)
                                        debug_level = atoi(optarg);
                                else
                                        debug_level++;
                                break;
 
-                       case 'k':                               /* kill old tincds */
-#ifndef HAVE_MINGW
-                               if(optarg) {
-                                       if(!strcasecmp(optarg, "HUP"))
-                                               kill_tincd = SIGHUP;
-                                       else if(!strcasecmp(optarg, "TERM"))
-                                               kill_tincd = SIGTERM;
-                                       else if(!strcasecmp(optarg, "KILL"))
-                                               kill_tincd = SIGKILL;
-                                       else if(!strcasecmp(optarg, "USR1"))
-                                               kill_tincd = SIGUSR1;
-                                       else if(!strcasecmp(optarg, "USR2"))
-                                               kill_tincd = SIGUSR2;
-                                       else if(!strcasecmp(optarg, "WINCH"))
-                                               kill_tincd = SIGWINCH;
-                                       else if(!strcasecmp(optarg, "INT"))
-                                               kill_tincd = SIGINT;
-                                       else if(!strcasecmp(optarg, "ALRM"))
-                                               kill_tincd = SIGALRM;
-                                       else {
-                                               kill_tincd = atoi(optarg);
-
-                                               if(!kill_tincd) {
-                                                       fprintf(stderr, "Invalid argument `%s'; SIGNAL must be a number or one of HUP, TERM, KILL, USR1, USR2, WINCH, INT or ALRM.\n",
-                                                                       optarg);
-                                                       usage(true);
-                                                       return false;
-                                               }
-                                       }
-                               } else
-                                       kill_tincd = SIGTERM;
-#else
-                                       kill_tincd = 1;
-#endif
-                               break;
-
-                       case 'n':                               /* net name given */
+                       case 'n': /* net name given */
                                netname = xstrdup(optarg);
                                break;
 
-                       case 'K':                               /* generate public/private keypair */
-                               if(optarg) {
-                                       generate_keys = atoi(optarg);
-
-                                       if(generate_keys < 512) {
-                                               fprintf(stderr, "Invalid argument `%s'; BITS must be a number equal to or greater than 512.\n",
-                                                               optarg);
-                                               usage(true);
-                                               return false;
-                                       }
+                       case 's': /* syslog */
+                               use_logfile = false;
+                               use_syslog = true;
+                               break;
 
-                                       generate_keys &= ~7;    /* Round it to bytes */
-                               } else
-                                       generate_keys = 2048;
+                       case 'o': /* option */
+                               cfg = parse_config_line(optarg, NULL, ++lineno);
+                               if (!cfg)
+                                       return false;
+                               list_insert_tail(cmdline_conf, cfg);
                                break;
 
-                       case 'R':                               /* chroot to NETNAME dir */
+#ifdef HAVE_MINGW
+                       case 'R':
+                       case 'U':
+                               logger(DEBUG_ALWAYS, LOG_ERR, "The %s option is not supported on this platform.", argv[optind - 1]);
+                               return false;
+#else
+                       case 'R': /* chroot to NETNAME dir */
                                do_chroot = true;
                                break;
 
-                       case 'U':                               /* setuid to USER */
+                       case 'U': /* setuid to USER */
                                switchuser = optarg;
                                break;
+#endif
 
-                       case 1:                                 /* show help */
+                       case 1:   /* show help */
                                show_help = true;
                                break;
 
-                       case 2:                                 /* show version */
+                       case 2:   /* show version */
                                show_version = true;
                                break;
 
-                       case 3:                                 /* bypass security */
+                       case 3:   /* bypass security */
                                bypass_security = true;
                                break;
 
-                       case 4:                                 /* write log entries to a file */
+                       case 4:   /* write log entries to a file */
+                               use_syslog = false;
                                use_logfile = true;
+                               if(!optarg && optind < argc && *argv[optind] != '-')
+                                       optarg = argv[optind++];
                                if(optarg)
                                        logfilename = xstrdup(optarg);
                                break;
 
-                       case 5:                                 /* write PID to a file */
+                       case 5:   /* open control socket here */
                                pidfilename = xstrdup(optarg);
                                break;
 
-                       case '?':
+                       case '?': /* wrong options */
                                usage(true);
                                return false;
 
@@ -269,201 +245,59 @@ static bool parse_options(int argc, char **argv) {
                }
        }
 
-       return true;
-}
-
-/* This function prettyprints the key generation process */
-
-static void indicator(int a, int b, void *p) {
-       switch (a) {
-               case 0:
-                       fprintf(stderr, ".");
-                       break;
-
-               case 1:
-                       fprintf(stderr, "+");
-                       break;
-
-               case 2:
-                       fprintf(stderr, "-");
-                       break;
-
-               case 3:
-                       switch (b) {
-                               case 0:
-                                       fprintf(stderr, " p\n");
-                                       break;
-
-                               case 1:
-                                       fprintf(stderr, " q\n");
-                                       break;
-
-                               default:
-                                       fprintf(stderr, "?");
-                       }
-                       break;
-
-               default:
-                       fprintf(stderr, "?");
-       }
-}
-
-/*
-  Generate a public/private RSA keypair, and ask for a file to store
-  them in.
-*/
-static bool keygen(int bits) {
-       RSA *rsa_key;
-       FILE *f;
-       char *name = NULL;
-       char *filename;
-
-       get_config_string(lookup_config(config_tree, "Name"), &name);
-
-       if(name && !check_id(name)) {
-               fprintf(stderr, "Invalid name for myself!\n");
+       if(optind < argc) {
+               fprintf(stderr, "%s: unrecognized argument '%s'\n", argv[0], argv[optind]);
+               usage(true);
                return false;
        }
 
-       fprintf(stderr, "Generating %d bits keys:\n", bits);
-       rsa_key = RSA_generate_key(bits, 0x10001, indicator, NULL);
-
-       if(!rsa_key) {
-               fprintf(stderr, "Error during key generation!\n");
-               return false;
-       } else
-               fprintf(stderr, "Done.\n");
-
-       xasprintf(&filename, "%s/rsa_key.priv", confbase);
-       f = ask_and_open(filename, "private RSA key");
+       if(!netname && (netname = getenv("NETNAME")))
+               netname = xstrdup(netname);
 
-       if(!f)
-               return false;
-
-       if(disable_old_keys(f))
-               fprintf(stderr, "Warning: old key(s) found and disabled.\n");
-  
-#ifdef HAVE_FCHMOD
-       /* Make it unreadable for others. */
-       fchmod(fileno(f), 0600);
-#endif
-               
-       PEM_write_RSAPrivateKey(f, rsa_key, NULL, NULL, 0, NULL, NULL);
-       fclose(f);
-       free(filename);
-
-       if(name)
-               xasprintf(&filename, "%s/hosts/%s", confbase, name);
-       else
-               xasprintf(&filename, "%s/rsa_key.pub", confbase);
+       /* netname "." is special: a "top-level name" */
 
-       f = ask_and_open(filename, "public RSA key");
+       if(netname && (!*netname || !strcmp(netname, "."))) {
+               free(netname);
+               netname = NULL;
+       }
 
-       if(!f)
+       if(netname && !check_netname(netname, false)) {
+               fprintf(stderr, "Invalid character in netname!\n");
                return false;
-
-       if(disable_old_keys(f))
-               fprintf(stderr, "Warning: old key(s) found and disabled.\n");
-
-       PEM_write_RSAPublicKey(f, rsa_key);
-       fclose(f);
-       free(filename);
-       if(name)
-               free(name);
-
-       return true;
-}
-
-/*
-  Set all files and paths according to netname
-*/
-static void make_names(void) {
-#ifdef HAVE_MINGW
-       HKEY key;
-       char installdir[1024] = "";
-       long len = sizeof(installdir);
-#endif
-
-       if(netname)
-               xasprintf(&identname, "tinc.%s", netname);
-       else
-               identname = xstrdup("tinc");
-
-#ifdef HAVE_MINGW
-       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);
-                       if(!confbase) {
-                               if(netname)
-                                       xasprintf(&confbase, "%s/%s", installdir, netname);
-                               else
-                                       xasprintf(&confbase, "%s", installdir);
-                       }
-               }
-               RegCloseKey(key);
-               if(*installdir)
-                       return;
        }
-#endif
-
-       if(!pidfilename)
-               xasprintf(&pidfilename, LOCALSTATEDIR "/run/%s.pid", identname);
-
-       if(!logfilename)
-               xasprintf(&logfilename, LOCALSTATEDIR "/log/%s.log", identname);
 
-       if(netname) {
-               if(!confbase)
-                       xasprintf(&confbase, CONFDIR "/tinc/%s", netname);
-               else
-                       logger(LOG_INFO, "Both netname and configuration directory given, using the latter...");
-       } else {
-               if(!confbase)
-                       xasprintf(&confbase, CONFDIR "/tinc");
-       }
-}
+       if(netname && !check_netname(netname, true))
+               fprintf(stderr, "Warning: unsafe character in netname!\n");
 
-static void free_names() {
-       if (identname) free(identname);
-       if (netname) free(netname);
-       if (pidfilename) free(pidfilename);
-       if (logfilename) free(logfilename);
-       if (confbase) free(confbase);
+       return true;
 }
 
-static bool drop_privs() {
-#ifdef HAVE_MINGW
-       if (switchuser) {
-               logger(LOG_ERR, "%s not supported on this platform", "-U");
-               return false;
-       }
-       if (do_chroot) {
-               logger(LOG_ERR, "%s not supported on this platform", "-R");
-               return false;
-       }
-#else
+static bool drop_privs(void) {
+#ifndef HAVE_MINGW
        uid_t uid = 0;
        if (switchuser) {
                struct passwd *pw = getpwnam(switchuser);
                if (!pw) {
-                       logger(LOG_ERR, "unknown user `%s'", switchuser);
+                       logger(DEBUG_ALWAYS, LOG_ERR, "unknown user `%s'", switchuser);
                        return false;
                }
                uid = pw->pw_uid;
                if (initgroups(switchuser, pw->pw_gid) != 0 ||
                    setgid(pw->pw_gid) != 0) {
-                       logger(LOG_ERR, "System call `%s' failed: %s",
+                       logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s",
                               "initgroups", strerror(errno));
                        return false;
                }
+#ifndef __ANDROID__
+// Not supported in android NDK
                endgrent();
                endpwent();
+#endif
        }
        if (do_chroot) {
-               tzset();        /* for proper timestamps in logs */
+               tzset();        /* for proper timestamps in logs */
                if (chroot(confbase) != 0 || chdir("/") != 0) {
-                       logger(LOG_ERR, "System call `%s' failed: %s",
+                       logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s",
                               "chroot", strerror(errno));
                        return false;
                }
@@ -472,7 +306,7 @@ static bool drop_privs() {
        }
        if (switchuser)
                if (setuid(uid) != 0) {
-                       logger(LOG_ERR, "System call `%s' failed: %s",
+                       logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s",
                               "setuid", strerror(errno));
                        return false;
                }
@@ -481,12 +315,23 @@ static bool drop_privs() {
 }
 
 #ifdef HAVE_MINGW
-# define setpriority(level) SetPriorityClass(GetCurrentProcess(), level)
+# define setpriority(level) !SetPriorityClass(GetCurrentProcess(), (level))
+
+static void stop_handler(void *data, int flags) {
+       event_exit();
+}
+
+static BOOL WINAPI console_ctrl_handler(DWORD type) {
+       logger(DEBUG_ALWAYS, LOG_NOTICE, "Got console shutdown request");
+       if (WSASetEvent(stop_io.event) == FALSE)
+               abort();
+       return TRUE;
+}
 #else
 # define NORMAL_PRIORITY_CLASS 0
 # define BELOW_NORMAL_PRIORITY_CLASS 10
 # define HIGH_PRIORITY_CLASS -10
-# define setpriority(level) nice(level)
+# define setpriority(level) (setpriority(PRIO_PROCESS, 0, (level)))
 #endif
 
 int main(int argc, char **argv) {
@@ -494,13 +339,14 @@ int main(int argc, char **argv) {
 
        if(!parse_options(argc, argv))
                return 1;
-       
-       make_names();
+
+       make_names(true);
+       chdir(confbase);
 
        if(show_version) {
-               printf("%s version %s (built %s %s, protocol %d)\n", PACKAGE,
-                          VERSION, __DATE__, __TIME__, PROT_CURRENT);
-               printf("Copyright (C) 1998-2009 Ivo Timmermans, Guus Sliepen and others.\n"
+               printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
+                          BUILD_VERSION, BUILD_DATE, BUILD_TIME, PROT_MAJOR, PROT_MINOR);
+               printf("Copyright (C) 1998-2016 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"
@@ -514,53 +360,74 @@ int main(int argc, char **argv) {
                return 0;
        }
 
-       if(kill_tincd)
-               return !kill_other(kill_tincd);
+#ifdef HAVE_MINGW
+       if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) {
+               logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "WSAStartup", winerror(GetLastError()));
+               return 1;
+       }
+#else
+       // Check if we got an umbilical fd from the process that started us
+       char *umbstr = getenv("TINC_UMBILICAL");
+       if(umbstr) {
+               umbilical = atoi(umbstr);
+               if(fcntl(umbilical, F_GETFL) < 0)
+                       umbilical = 0;
+#ifdef FD_CLOEXEC
+               if(umbilical)
+                       fcntl(umbilical, F_SETFD, FD_CLOEXEC);
+#endif
+       }
+#endif
 
        openlogger("tinc", use_logfile?LOGMODE_FILE:LOGMODE_STDERR);
 
        g_argv = argv;
 
+       if(getenv("LISTEN_PID") && atoi(getenv("LISTEN_PID")) == getpid())
+               do_detach = false;
+#ifdef HAVE_UNSETENV
+       unsetenv("LISTEN_PID");
+#endif
+
        init_configuration(&config_tree);
 
        /* Slllluuuuuuurrrrp! */
 
-       RAND_load_file("/dev/urandom", 1024);
-
-       ENGINE_load_builtin_engines();
-       ENGINE_register_all_complete();
-
-       OpenSSL_add_all_algorithms();
-
-       if(generate_keys) {
-               read_server_config();
-               return !keygen(generate_keys);
-       }
+       gettimeofday(&now, NULL);
+       srand(now.tv_sec + now.tv_usec);
+       crypto_init();
 
        if(!read_server_config())
                return 1;
 
+#ifdef HAVE_LZO
        if(lzo_init() != LZO_E_OK) {
-               logger(LOG_ERR, "Error initializing LZO compressor!");
+               logger(DEBUG_ALWAYS, LOG_ERR, "Error initializing LZO compressor!");
                return 1;
        }
+#endif
 
 #ifdef HAVE_MINGW
-       if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) {
-               logger(LOG_ERR, "System call `%s' failed: %s", "WSAStartup", winerror(GetLastError()));
-               return 1;
-       }
+       io_add_event(&stop_io, stop_handler, NULL, WSACreateEvent());
+       if (stop_io.event == FALSE)
+               abort();
+
+       int result;
+       if(!do_detach || !init_service()) {
+               SetConsoleCtrlHandler(console_ctrl_handler, TRUE);
+               result = main2(argc, argv);
+       } else
+               result = 1;
 
-       if(!do_detach || !init_service())
-               return main2(argc, argv);
-       else
-               return 1;
+       if (WSACloseEvent(stop_io.event) == FALSE)
+               abort();
+       io_del(&stop_io);
+       return result;
 }
 
 int main2(int argc, char **argv) {
-       InitializeCriticalSection(&mutex);
-       EnterCriticalSection(&mutex);
 #endif
+       char *priority = NULL;
 
        if(!detach())
                return 1;
@@ -570,7 +437,7 @@ int main2(int argc, char **argv) {
         * 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",
+               logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "mlockall",
                   strerror(errno));
                return 1;
        }
@@ -581,26 +448,29 @@ int main2(int argc, char **argv) {
        if(!setup_network())
                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;
-                }
-        }
+       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));
+                               goto end;
+                       }
+               } else if(!strcasecmp(priority, "Low")) {
+                       if (setpriority(BELOW_NORMAL_PRIORITY_CLASS) != 0) {
+                                      logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "setpriority", strerror(errno));
+                               goto end;
+                       }
+               } else if(!strcasecmp(priority, "High")) {
+                       if (setpriority(HIGH_PRIORITY_CLASS) != 0) {
+                               logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "setpriority", strerror(errno));
+                               goto end;
+                       }
+               } else {
+                       logger(DEBUG_ALWAYS, LOG_ERR, "Invalid priority `%s`!", priority);
+                       goto end;
+               }
+       }
 
        /* drop privileges */
        if (!drop_privs())
@@ -608,29 +478,31 @@ int main2(int argc, char **argv) {
 
        /* Start main loop. It only exits when tinc is killed. */
 
+       logger(DEBUG_ALWAYS, LOG_NOTICE, "Ready");
+
+       if(umbilical) { // snip!
+               write(umbilical, "", 1);
+               close(umbilical);
+               umbilical = 0;
+       }
+
+       try_outgoing_connections();
+
        status = main_loop();
 
        /* Shutdown properly. */
 
-       ifdebug(CONNECTIONS)
-               dump_device_stats();
-
+end:
        close_network_connections();
 
-end:
-       logger(LOG_NOTICE, "Terminating");
+       logger(DEBUG_ALWAYS, LOG_NOTICE, "Terminating");
 
-#ifndef HAVE_MINGW
-       remove_pid(pidfilename);
-#endif
+       free(priority);
 
-       EVP_cleanup();
-       ENGINE_cleanup();
-       CRYPTO_cleanup_all_ex_data();
-       ERR_remove_state(0);
-       ERR_free_strings();
+       crypto_exit();
 
        exit_configuration(&config_tree);
+       free(cmdline_conf);
        free_names();
 
        return status;