Merge branch 'master' of git://tinc-vpn.org/tinc into 1.1

[meshlink] / src / tincd.c

diff --git a/src/tincd.c b/src/tincd.c
index 7970bcc9f2b67d1854df8fd0dece1ec2277ae774..3cbac4ba25f5daa4a29b2f0189dc8b466aff035a 100644 (file)
--- a/src/tincd.c
+++ b/src/tincd.c
@@ -1,7 +1,7 @@
 /*
     tincd.c -- the main file for tincd
     Copyright (C) 1998-2005 Ivo Timmermans
-                  2000-2011 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2012 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>
@@ -162,7 +162,7 @@ static bool parse_options(int argc, char **argv) {
 
                        case 'L':                               /* no detach */
 #ifndef HAVE_MLOCKALL
-                               logger(LOG_ERR, "%s not supported on this platform", "mlockall()");
+                               logger(DEBUG_ALWAYS, LOG_ERR, "%s not supported on this platform", "mlockall()");
                                return false;
 #else
                                do_mlock = true;
@@ -276,7 +276,7 @@ static void make_names(void) {
                if(!confbase)
                        xasprintf(&confbase, CONFDIR "/tinc/%s", netname);
                else
-                       logger(LOG_INFO, "Both netname and configuration directory given, using the latter...");
+                       logger(DEBUG_ALWAYS, LOG_INFO, "Both netname and configuration directory given, using the latter...");
        } else {
                if(!confbase)
                        xasprintf(&confbase, CONFDIR "/tinc");
@@ -294,11 +294,11 @@ static void free_names(void) {
 static bool drop_privs(void) {
 #ifdef HAVE_MINGW
        if (switchuser) {
-               logger(LOG_ERR, "%s not supported on this platform", "-U");
+               logger(DEBUG_ALWAYS, LOG_ERR, "%s not supported on this platform", "-U");
                return false;
        }
        if (do_chroot) {
-               logger(LOG_ERR, "%s not supported on this platform", "-R");
+               logger(DEBUG_ALWAYS, LOG_ERR, "%s not supported on this platform", "-R");
                return false;
        }
 #else
@@ -306,13 +306,13 @@ static bool drop_privs(void) {
        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;
                }
@@ -322,7 +322,7 @@ static bool drop_privs(void) {
        if (do_chroot) {
                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;
                }
@@ -331,7 +331,7 @@ static bool drop_privs(void) {
        }
        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;
                }
@@ -359,7 +359,7 @@ int main(int argc, char **argv) {
        if(show_version) {
                printf("%s version %s (built %s %s, protocol %d.%d)\n", PACKAGE,
                           VERSION, __DATE__, __TIME__, PROT_MAJOR, PROT_MINOR);
-               printf("Copyright (C) 1998-2011 Ivo Timmermans, Guus Sliepen and others.\n"
+               printf("Copyright (C) 1998-2012 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"
@@ -375,7 +375,7 @@ int main(int argc, char **argv) {
 
 #ifdef HAVE_MINGW
        if(WSAStartup(MAKEWORD(2, 2), &wsa_state)) {
-               logger(LOG_ERR, "System call `%s' failed: %s", "WSAStartup", winerror(GetLastError()));
+               logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "WSAStartup", winerror(GetLastError()));
                return 1;
        }
 #endif
@@ -383,12 +383,18 @@ int main(int argc, char **argv) {
        openlogger("tinc", use_logfile?LOGMODE_FILE:LOGMODE_STDERR);
 
        if(!event_init()) {
-               logger(LOG_ERR, "Error initializing libevent!");
+               logger(DEBUG_ALWAYS, LOG_ERR, "Error initializing libevent!");
                return 1;
        }
 
        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! */
@@ -401,7 +407,7 @@ int main(int argc, char **argv) {
 
 #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
@@ -427,7 +433,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;
        }
@@ -450,24 +456,24 @@ int main2(int argc, char **argv) {
         if(get_config_string(lookup_config(config_tree, "ProcessPriority"), &priority)) {
                 if(!strcasecmp(priority, "Normal")) {
                         if (setpriority(NORMAL_PRIORITY_CLASS) != 0) {
-                                logger(LOG_ERR, "System call `%s' failed: %s",
+                                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(LOG_ERR, "System call `%s' failed: %s",
+                                       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(LOG_ERR, "System call `%s' failed: %s",
+                                logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s",
                                        "setpriority", strerror(errno));
                                 goto end;
                         }
                 } else {
-                        logger(LOG_ERR, "Invalid priority `%s`!", priority);
+                        logger(DEBUG_ALWAYS, LOG_ERR, "Invalid priority `%s`!", priority);
                         goto end;
                 }
         }
@@ -482,7 +488,7 @@ int main2(int argc, char **argv) {
 
        /* Shutdown properly. */
 
-       ifdebug(CONNECTIONS)
+       if(debug_level >= DEBUG_CONNECTIONS)
                devops.dump_stats();
 
        close_network_connections();
@@ -491,7 +497,7 @@ end:
        exit_control();
 
 end_nonet:
-       logger(LOG_NOTICE, "Terminating");
+       logger(DEBUG_ALWAYS, LOG_NOTICE, "Terminating");
 
        free(priority);