Merge branch 'master' into 1.1
[tinc] / src / process.c
index 01ebe49..f0e5dd8 100644 (file)
 
 #include "conf.h"
 #include "connection.h"
+#include "control.h"
 #include "device.h"
 #include "edge.h"
 #include "logger.h"
 #include "node.h"
-#include "pidfile.h"
 #include "process.h"
 #include "subnet.h"
 #include "utils.h"
 
 /* If zero, don't detach from the terminal. */
 bool do_detach = true;
-bool sighup = false;
 bool sigalrm = false;
 
 extern char *identname;
-extern char *pidfilename;
 extern char **g_argv;
 extern bool use_logfile;
-extern volatile bool running;
 
 sigset_t emptysigset;
 
-static int saved_debug_level = -1;
-
 static void memory_full(int size) {
        logger(LOG_ERR, "Memory exhausted (couldn't allocate %d bytes), exitting.", size);
        exit(1);
@@ -164,19 +159,11 @@ DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
                        return ERROR_CALL_NOT_IMPLEMENTED;
        }
 
-       if(running) {
-               running = false;
-               status.dwWaitHint = 30000; 
-               status.dwCurrentState = SERVICE_STOP_PENDING; 
-               SetServiceStatus(statushandle, &status);
-               return NO_ERROR;
-       } else {
-               status.dwWaitHint = 0; 
-               status.dwCurrentState = SERVICE_STOPPED; 
-               SetServiceStatus(statushandle, &status);
-               exit(1);
-       }
-
+       event_loopexit(NULL);
+       status.dwWaitHint = 30000; 
+       status.dwCurrentState = SERVICE_STOP_PENDING; 
+       SetServiceStatus(statushandle, &status);
+       return NO_ERROR;
 }
 
 VOID WINAPI run_service(DWORD argc, LPTSTR* argv) {
@@ -233,86 +220,13 @@ bool init_service(void) {
 }
 #endif
 
-#ifndef HAVE_MINGW
-/*
-  check for an existing tinc for this net, and write pid to pidfile
-*/
-static bool write_pidfile(void) {
-       pid_t pid;
-
-       pid = check_pid(pidfilename);
-
-       if(pid) {
-               if(netname)
-                       fprintf(stderr, "A tincd is already running for net `%s' with pid %ld.\n",
-                                       netname, (long)pid);
-               else
-                       fprintf(stderr, "A tincd is already running with pid %ld.\n", (long)pid);
-               return false;
-       }
-
-       /* if it's locked, write-protected, or whatever */
-       if(!write_pid(pidfilename)) {
-               fprintf(stderr, "Could write pid file %s: %s\n", pidfilename, strerror(errno));
-               return false;
-       }
-
-       return true;
-}
-#endif
-
-/*
-  kill older tincd for this net
-*/
-bool kill_other(int signal) {
-#ifndef HAVE_MINGW
-       pid_t pid;
-
-       pid = read_pid(pidfilename);
-
-       if(!pid) {
-               if(netname)
-                       fprintf(stderr, "No other tincd is running for net `%s'.\n",
-                                       netname);
-               else
-                       fprintf(stderr, "No other tincd is running.\n");
-               return false;
-       }
-
-       errno = 0;                                      /* No error, sometimes errno is only changed on error */
-
-       /* ESRCH is returned when no process with that pid is found */
-       if(kill(pid, signal) && errno == ESRCH) {
-               if(netname)
-                       fprintf(stderr, "The tincd for net `%s' is no longer running. ",
-                                       netname);
-               else
-                       fprintf(stderr, "The tincd is no longer running. ");
-
-               fprintf(stderr, "Removing stale lock file.\n");
-               remove_pid(pidfilename);
-       }
-
-       return true;
-#else
-       return remove_service();
-#endif
-}
-
 /*
-  Detach from current terminal, write pidfile, kill parent
+  Detach from current terminal
 */
 bool detach(void) {
        setup_signals();
 
-       /* First check if we can open a fresh new pidfile */
-
 #ifndef HAVE_MINGW
-       if(!write_pidfile())
-               return false;
-
-       /* If we succeeded in doing that, detach */
-
        closelogger();
 #endif
 
@@ -323,13 +237,6 @@ bool detach(void) {
                                        strerror(errno));
                        return false;
                }
-
-               /* Now UPDATE the pid in the pidfile, because we changed it... */
-
-               if(!write_pid(pidfilename)) {
-                       fprintf(stderr, "Could not write pid file %s: %s\n", pidfilename, strerror(errno));
-                       return false;
-               }
 #else
                if(!statushandle)
                        exit(install_service());
@@ -428,22 +335,6 @@ bool execute_script(const char *name, char **envp) {
 */
 
 #ifndef HAVE_MINGW
-static RETSIGTYPE sigterm_handler(int a) {
-       logger(LOG_NOTICE, "Got %s signal", "TERM");
-       if(running)
-               running = false;
-       else
-               exit(1);
-}
-
-static RETSIGTYPE sigquit_handler(int a) {
-       logger(LOG_NOTICE, "Got %s signal", "QUIT");
-       if(running)
-               running = false;
-       else
-               exit(1);
-}
-
 static RETSIGTYPE fatal_signal_square(int a) {
        logger(LOG_ERR, "Got another fatal signal %d (%s): not restarting.", a,
                   strsignal(a));
@@ -464,7 +355,7 @@ static RETSIGTYPE fatal_signal_handler(int a) {
 
                close_network_connections();
                sleep(5);
-               remove_pid(pidfilename);
+               exit_control();
                execvp(g_argv[0], g_argv);
        } else {
                logger(LOG_NOTICE, "Not restarting.");
@@ -472,48 +363,6 @@ static RETSIGTYPE fatal_signal_handler(int a) {
        }
 }
 
-static RETSIGTYPE sighup_handler(int a) {
-       logger(LOG_NOTICE, "Got %s signal", "HUP");
-       sighup = true;
-}
-
-static RETSIGTYPE sigint_handler(int a) {
-       logger(LOG_NOTICE, "Got %s signal", "INT");
-
-       if(saved_debug_level != -1) {
-               logger(LOG_NOTICE, "Reverting to old debug level (%d)",
-                       saved_debug_level);
-               debug_level = saved_debug_level;
-               saved_debug_level = -1;
-       } else {
-               logger(LOG_NOTICE,
-                       "Temporarily setting debug level to 5.  Kill me with SIGINT again to go back to level %d.",
-                       debug_level);
-               saved_debug_level = debug_level;
-               debug_level = 5;
-       }
-}
-
-static RETSIGTYPE sigalrm_handler(int a) {
-       logger(LOG_NOTICE, "Got %s signal", "ALRM");
-       sigalrm = true;
-}
-
-static RETSIGTYPE sigusr1_handler(int a) {
-       dump_connections();
-}
-
-static RETSIGTYPE sigusr2_handler(int a) {
-       dump_device_stats();
-       dump_nodes();
-       dump_edges();
-       dump_subnets();
-}
-
-static RETSIGTYPE sigwinch_handler(int a) {
-       do_purge = true;
-}
-
 static RETSIGTYPE unexpected_signal_handler(int a) {
        logger(LOG_WARNING, "Got unexpected signal %d (%s)", a, strsignal(a));
 }
@@ -526,19 +375,11 @@ static struct {
        int signal;
        void (*handler)(int);
 } sighandlers[] = {
-       {SIGHUP, sighup_handler},
-       {SIGTERM, sigterm_handler},
-       {SIGQUIT, sigquit_handler},
        {SIGSEGV, fatal_signal_handler},
        {SIGBUS, fatal_signal_handler},
        {SIGILL, fatal_signal_handler},
        {SIGPIPE, ignore_signal_handler},
-       {SIGINT, sigint_handler},
-       {SIGUSR1, sigusr1_handler},
-       {SIGUSR2, sigusr2_handler},
        {SIGCHLD, ignore_signal_handler},
-       {SIGALRM, sigalrm_handler},
-       {SIGWINCH, sigwinch_handler},
        {0, NULL}
 };
 #endif
@@ -565,7 +406,7 @@ void setup_signals(void) {
 
        /* If we didn't detach, allow coredumps */
        if(!do_detach)
-               sighandlers[3].handler = SIG_DFL;
+               sighandlers[0].handler = SIG_DFL;
 
        /* Then, for each known signal that we want to catch, assign a
           handler to the signal, with error checking this time. */