]> git.meshlink.io Git - meshlink/blobdiff - src/process.c
Merge branch 'master' into 1.1
[meshlink] / src / process.c
index 5566510d4e7dec693cdebbfb1b8c86c4b7aa3eb6..546570aa59f4dc3066ff1b26cfbd99ea646fe661 100644 (file)
@@ -1,7 +1,7 @@
 /*
     process.c -- process management functions
-    Copyright (C) 1999-2003 Ivo Timmermans <ivo@o2w.nl>,
-                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1999-2005 Ivo Timmermans,
+                  2000-2007 Guus Sliepen <guus@tinc-vpn.org>
 
     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
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
-    $Id: process.c,v 1.1.2.66 2003/08/08 17:17:13 guus Exp $
+    $Id$
 */
 
 #include "system.h"
 
 #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)
-{
+static void memory_full(int size) {
        logger(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exitting."), size);
        cp_trace();
        exit(1);
@@ -58,19 +52,6 @@ static void memory_full(int size)
 
 /* Some functions the less gifted operating systems might lack... */
 
-#ifndef HAVE_FCLOSEALL
-static int fcloseall(void)
-{
-       fflush(stdin);
-       fflush(stdout);
-       fflush(stderr);
-       fclose(stdin);
-       fclose(stdout);
-       fclose(stderr);
-       return 0;
-}
-#endif
-
 #ifdef HAVE_MINGW
 extern char *identname;
 extern char *program_name;
@@ -82,9 +63,10 @@ static SERVICE_STATUS status = {0};
 static SERVICE_STATUS_HANDLE statushandle = 0;
 
 bool install_service(void) {
-       char command[4096] = "";
+       char command[4096] = "\"";
        char **argp;
        bool space;
+       SERVICE_DESCRIPTION description = {"Virtual Private Network daemon"};
 
        manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS);
        if(!manager) {
@@ -93,30 +75,38 @@ bool install_service(void) {
        }
 
        if(!strchr(program_name, '\\')) {
-               GetCurrentDirectory(sizeof(command), command);
-               strncat(command, "\\", sizeof(command));
+               GetCurrentDirectory(sizeof command - 1, command + 1);
+               strncat(command, "\\", sizeof command - strlen(command));
        }
 
-       strncat(command, program_name, sizeof(command));
+       strncat(command, program_name, sizeof command - strlen(command));
+
+       strncat(command, "\"", sizeof command - strlen(command));
+
        for(argp = g_argv + 1; *argp; argp++) {
-               space = strchr(*argp, " ");
-               strncat(command, " ", sizeof(command));
+               space = strchr(*argp, ' ');
+               strncat(command, " ", sizeof command - strlen(command));
+               
                if(space)
-                       strncat(command, "\"", sizeof(command));
-               strncat(command, *argp, sizeof(command));
+                       strncat(command, "\"", sizeof command - strlen(command));
+               
+               strncat(command, *argp, sizeof command - strlen(command));
+
                if(space)
-                       strncat(command, "\"", sizeof(command));
+                       strncat(command, "\"", sizeof command - strlen(command));
        }
 
        service = CreateService(manager, identname, identname,
                        SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL,
-                       command, "NDIS", NULL, NULL, NULL, NULL);
+                       command, NULL, NULL, NULL, NULL, NULL);
        
        if(!service) {
                logger(LOG_ERR, _("Could not create %s service: %s"), identname, winerror(GetLastError()));
                return false;
        }
 
+       ChangeServiceConfig2(service, SERVICE_CONFIG_DESCRIPTION, &description);
+
        logger(LOG_INFO, _("%s service installed"), identname);
 
        if(!StartService(service, 0, NULL))
@@ -158,30 +148,28 @@ bool remove_service(void) {
 
 DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
        switch(request) {
+               case SERVICE_CONTROL_INTERROGATE:
+                       SetServiceStatus(statushandle, &status);
+                       return NO_ERROR;
                case SERVICE_CONTROL_STOP:
                        logger(LOG_NOTICE, _("Got %s request"), "SERVICE_CONTROL_STOP");
-                       running = false;
                        break;
                case SERVICE_CONTROL_SHUTDOWN:
                        logger(LOG_NOTICE, _("Got %s request"), "SERVICE_CONTROL_SHUTDOWN");
-                       running = false;
                        break;
                default:
                        logger(LOG_WARNING, _("Got unexpected request %d"), request);
                        return ERROR_CALL_NOT_IMPLEMENTED;
        }
 
-       if(!running) {
-               status.dwWaitHint = 30000; 
-               status.dwCurrentState = SERVICE_STOP_PENDING; 
-               SetServiceStatus(statushandle, &status);
-       }
-
+       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)
-{
+VOID WINAPI run_service(DWORD argc, LPTSTR* argv) {
        int err = 1;
        extern int main2(int argc, char **argv);
 
@@ -235,93 +223,15 @@ bool init_service(void) {
 }
 #endif
 
-#ifndef HAVE_MINGW
 /*
-  check for an existing tinc for this net, and write pid to pidfile
+  Detach from current terminal
 */
-static bool write_pidfile(void)
-{
-       int pid;
-
-       cp();
-
-       pid = check_pid(pidfilename);
-
-       if(pid) {
-               if(netname)
-                       fprintf(stderr, _("A tincd is already running for net `%s' with pid %d.\n"),
-                                       netname, pid);
-               else
-                       fprintf(stderr, _("A tincd is already running with pid %d.\n"), pid);
-               return false;
-       }
-
-       /* if it's locked, write-protected, or whatever */
-       if(!write_pid(pidfilename))
-               return false;
-
-       return true;
-}
-#endif
-
-/*
-  kill older tincd for this net
-*/
-bool kill_other(int signal)
-{
-#ifndef HAVE_MINGW
-       int pid;
-
-       cp();
-
-       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
-*/
-bool detach(void)
-{
+bool detach(void) {
        cp();
 
        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
 
@@ -332,11 +242,6 @@ bool detach(void)
                                        strerror(errno));
                        return false;
                }
-
-               /* Now UPDATE the pid in the pidfile, because we changed it... */
-
-               if(!write_pid(pidfilename))
-                       return false;
 #else
                if(!statushandle)
                        exit(install_service());
@@ -353,57 +258,80 @@ bool detach(void)
        return true;
 }
 
-bool execute_script(const char *name, char **envp)
-{
+bool execute_script(const char *name, char **envp) {
 #ifdef HAVE_SYSTEM
-       pid_t pid;
-       int status;
-       struct stat s;
-       char *scriptname;
+       int status, len;
+       char *scriptname, *p;
+       int i;
 
        cp();
 
-       asprintf(&scriptname, "%s/%s", confbase, name);
+#ifndef HAVE_MINGW
+       len = xasprintf(&scriptname, "\"%s/%s\"", confbase, name);
+#else
+       len = xasprintf(&scriptname, "\"%s/%s.bat\"", confbase, name);
+#endif
+       if(len < 0)
+               return false;
 
+       scriptname[len - 1] = '\0';
+
+#ifndef HAVE_TUNEMU
        /* First check if there is a script */
 
-       if(stat(scriptname, &s))
+       if(access(scriptname + 1, F_OK)) {
+               free(scriptname);
                return true;
+       }
+#endif
 
+       ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
+
+#ifdef HAVE_PUTENV
        /* Set environment */
        
-       while(*envp)
-               putenv(*envp++);
-
-       ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
+       for(i = 0; envp[i]; i++)
+               putenv(envp[i]);
+#endif
 
+       scriptname[len - 1] = '\"';
        status = system(scriptname);
 
        free(scriptname);
 
-       /* Unset environment? */
+       /* Unset environment */
 
+       for(i = 0; envp[i]; i++) {
+               char *e = strchr(envp[i], '=');
+               if(e) {
+                       p = alloca(e - envp[i] + 1);
+                       strncpy(p, envp[i], e - envp[i]);
+                       p[e - envp[i]] = '\0';
+                       putenv(p);
+               }
+       }
+
+#ifdef WEXITSTATUS
        if(status != -1) {
                if(WIFEXITED(status)) { /* Child exited by itself */
                        if(WEXITSTATUS(status)) {
-                               logger(LOG_ERR, _("Process %d (%s) exited with non-zero status %d"),
-                                          pid, name, WEXITSTATUS(status));
+                               logger(LOG_ERR, _("Script %s exited with non-zero status %d"),
+                                          name, WEXITSTATUS(status));
                                return false;
                        }
                } else if(WIFSIGNALED(status)) {        /* Child was killed by a signal */
-                       logger(LOG_ERR, _("Process %d (%s) was killed by signal %d (%s)"), pid,
+                       logger(LOG_ERR, _("Script %s was killed by signal %d (%s)"),
                                   name, WTERMSIG(status), strsignal(WTERMSIG(status)));
                        return false;
                } else {                        /* Something strange happened */
-                       logger(LOG_ERR, _("Process %d (%s) terminated abnormally"), pid,
-                                  name);
+                       logger(LOG_ERR, _("Script %s terminated abnormally"), name);
                        return false;
                }
        } else {
-               logger(LOG_ERR, _("System call `%s' failed: %s"), "system",
-                          strerror(errno));
+               logger(LOG_ERR, _("System call `%s' failed: %s"), "system", strerror(errno));
                return false;
        }
+#endif
 #endif
        return true;
 }
@@ -414,28 +342,14 @@ bool execute_script(const char *name, char **envp)
 */
 
 #ifndef HAVE_MINGW
-static RETSIGTYPE sigterm_handler(int a)
-{
-       logger(LOG_NOTICE, _("Got %s signal"), "TERM");
-       running = false;
-}
-
-static RETSIGTYPE sigquit_handler(int a)
-{
-       logger(LOG_NOTICE, _("Got %s signal"), "QUIT");
-       running = false;
-}
-
-static RETSIGTYPE fatal_signal_square(int a)
-{
+static RETSIGTYPE fatal_signal_square(int a) {
        logger(LOG_ERR, _("Got another fatal signal %d (%s): not restarting."), a,
                   strsignal(a));
        cp_trace();
        exit(1);
 }
 
-static RETSIGTYPE fatal_signal_handler(int a)
-{
+static RETSIGTYPE fatal_signal_handler(int a) {
        struct sigaction act;
        logger(LOG_ERR, _("Got fatal signal %d (%s)"), a, strsignal(a));
        cp_trace();
@@ -450,7 +364,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."));
@@ -458,62 +372,12 @@ 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)
-{
+static RETSIGTYPE unexpected_signal_handler(int a) {
        logger(LOG_WARNING, _("Got unexpected signal %d (%s)"), a, strsignal(a));
        cp_trace();
 }
 
-static RETSIGTYPE ignore_signal_handler(int a)
-{
+static RETSIGTYPE ignore_signal_handler(int a) {
        ifdebug(SCARY_THINGS) logger(LOG_DEBUG, _("Ignored signal %d (%s)"), a, strsignal(a));
 }
 
@@ -521,25 +385,16 @@ 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
 
-void setup_signals(void)
-{
+void setup_signals(void) {
 #ifndef HAVE_MINGW
        int i;
        struct sigaction act;
@@ -551,7 +406,7 @@ void setup_signals(void)
 
        /* Set a default signal handler for every signal, errors will be
           ignored. */
-       for(i = 0; i < NSIG; i++) {
+       for(i = 1; i < NSIG; i++) {
                if(!do_detach)
                        act.sa_handler = SIG_DFL;
                else
@@ -561,7 +416,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. */