X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=5566510d4e7dec693cdebbfb1b8c86c4b7aa3eb6;hp=326d3ff915f3e28328740da9464a08a6b3749311;hb=691907caaeb348dee3dbe8a85f3590241f2cc992;hpb=5db596c6844169f1eb5f804b72abe99d067aaa5a diff --git a/src/process.c b/src/process.c index 326d3ff9..5566510d 100644 --- a/src/process.c +++ b/src/process.c @@ -17,54 +17,38 @@ 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.54 2003/07/12 17:41:46 guus Exp $ + $Id: process.c,v 1.1.2.66 2003/08/08 17:17:13 guus Exp $ */ -#include "config.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include +#include "system.h" #include "conf.h" -#include "process.h" -#include "subnet.h" -#include "device.h" #include "connection.h" #include "device.h" +#include "edge.h" #include "logger.h" - -#include "system.h" +#include "node.h" +#include "pidfile.h" +#include "process.h" +#include "subnet.h" +#include "utils.h" +#include "xalloc.h" /* If zero, don't detach from the terminal. */ -int do_detach = 1; +bool do_detach = true; +bool sighup = false; +bool sigalrm = false; extern char *identname; extern char *pidfilename; extern char **g_argv; -extern int use_logfile; +extern bool use_logfile; +extern volatile bool running; sigset_t emptysigset; static int saved_debug_level = -1; -extern int sighup; -extern int sigalrm; -extern int do_purge; - static void memory_full(int size) { logger(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exitting."), size); @@ -87,28 +71,175 @@ static int fcloseall(void) } #endif -/* - Close network connections, and terminate neatly -*/ -void cleanup_and_exit(int c) +#ifdef HAVE_MINGW +extern char *identname; +extern char *program_name; +extern char **g_argv; + +static SC_HANDLE manager = NULL; +static SC_HANDLE service = NULL; +static SERVICE_STATUS status = {0}; +static SERVICE_STATUS_HANDLE statushandle = 0; + +bool install_service(void) { + char command[4096] = ""; + char **argp; + bool space; + + manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); + if(!manager) { + logger(LOG_ERR, _("Could not open service manager: %s"), winerror(GetLastError())); + return false; + } + + if(!strchr(program_name, '\\')) { + GetCurrentDirectory(sizeof(command), command); + strncat(command, "\\", sizeof(command)); + } + + strncat(command, program_name, sizeof(command)); + for(argp = g_argv + 1; *argp; argp++) { + space = strchr(*argp, " "); + strncat(command, " ", sizeof(command)); + if(space) + strncat(command, "\"", sizeof(command)); + strncat(command, *argp, sizeof(command)); + if(space) + strncat(command, "\"", sizeof(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); + + if(!service) { + logger(LOG_ERR, _("Could not create %s service: %s"), identname, winerror(GetLastError())); + return false; + } + + logger(LOG_INFO, _("%s service installed"), identname); + + if(!StartService(service, 0, NULL)) + logger(LOG_WARNING, _("Could not start %s service: %s"), identname, winerror(GetLastError())); + else + logger(LOG_INFO, _("%s service started"), identname); + + return true; +} + +bool remove_service(void) { + manager = OpenSCManager(NULL, NULL, SC_MANAGER_ALL_ACCESS); + if(!manager) { + logger(LOG_ERR, _("Could not open service manager: %s"), winerror(GetLastError())); + return false; + } + + service = OpenService(manager, identname, SERVICE_ALL_ACCESS); + + if(!service) { + logger(LOG_ERR, _("Could not open %s service: %s"), identname, winerror(GetLastError())); + return false; + } + + if(!ControlService(service, SERVICE_CONTROL_STOP, &status)) + logger(LOG_ERR, _("Could not stop %s service: %s"), identname, winerror(GetLastError())); + else + logger(LOG_INFO, _("%s service stopped"), identname); + + if(!DeleteService(service)) { + logger(LOG_ERR, _("Could not remove %s service: %s"), identname, winerror(GetLastError())); + return false; + } + + logger(LOG_INFO, _("%s service removed"), identname); + + return true; +} + +DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) { + switch(request) { + 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); + } + + return NO_ERROR; +} + +VOID WINAPI run_service(DWORD argc, LPTSTR* argv) { - cp(); + int err = 1; + extern int main2(int argc, char **argv); + + + status.dwServiceType = SERVICE_WIN32; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; + + statushandle = RegisterServiceCtrlHandlerEx(identname, controlhandler, NULL); + + if (!statushandle) { + logger(LOG_ERR, _("System call `%s' failed: %s"), "RegisterServiceCtrlHandlerEx", winerror(GetLastError())); + err = 1; + } else { + status.dwWaitHint = 30000; + status.dwCurrentState = SERVICE_START_PENDING; + SetServiceStatus(statushandle, &status); + + status.dwWaitHint = 0; + status.dwCurrentState = SERVICE_RUNNING; + SetServiceStatus(statushandle, &status); + + err = main2(argc, argv); - close_network_connections(); + status.dwWaitHint = 0; + status.dwCurrentState = SERVICE_STOPPED; + //status.dwWin32ExitCode = err; + SetServiceStatus(statushandle, &status); + } - ifdebug(CONNECTIONS) - dump_device_stats(); + return; +} - logger(LOG_NOTICE, _("Terminating")); +bool init_service(void) { + SERVICE_TABLE_ENTRY services[] = { + {identname, run_service}, + {NULL, NULL} + }; - closelog(); - exit(c); + if(!StartServiceCtrlDispatcher(services)) { + if(GetLastError() == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) { + return false; + } + else + logger(LOG_ERR, _("System call `%s' failed: %s"), "StartServiceCtrlDispatcher", winerror(GetLastError())); + } + + return true; } +#endif +#ifndef HAVE_MINGW /* check for an existing tinc for this net, and write pid to pidfile */ -static int write_pidfile(void) +static bool write_pidfile(void) { int pid; @@ -122,21 +253,23 @@ static int write_pidfile(void) netname, pid); else fprintf(stderr, _("A tincd is already running with pid %d.\n"), pid); - return 1; + return false; } /* if it's locked, write-protected, or whatever */ if(!write_pid(pidfilename)) - return 1; + return false; - return 0; + return true; } +#endif /* kill older tincd for this net */ -int kill_other(int signal) +bool kill_other(int signal) { +#ifndef HAVE_MINGW int pid; cp(); @@ -149,7 +282,7 @@ int kill_other(int signal) netname); else fprintf(stderr, _("No other tincd is running.\n")); - return 1; + return false; } errno = 0; /* No error, sometimes errno is only changed on error */ @@ -166,13 +299,16 @@ int kill_other(int signal) remove_pid(pidfilename); } - return 0; + return true; +#else + return remove_service(); +#endif } /* Detach from current terminal, write pidfile, kill parent */ -int detach(void) +bool detach(void) { cp(); @@ -180,24 +316,31 @@ int detach(void) /* First check if we can open a fresh new pidfile */ - if(write_pidfile()) - return -1; +#ifndef HAVE_MINGW + if(!write_pidfile()) + return false; /* If we succeeded in doing that, detach */ - closelog(); + closelogger(); +#endif if(do_detach) { - if(daemon(0, 0) < 0) { +#ifndef HAVE_MINGW + if(daemon(0, 0)) { fprintf(stderr, _("Couldn't detach from terminal: %s"), strerror(errno)); - return -1; + return false; } /* Now UPDATE the pid in the pidfile, because we changed it... */ if(!write_pid(pidfilename)) - return -1; + return false; +#else + if(!statushandle) + exit(install_service()); +#endif } openlogger(identname, use_logfile?LOGMODE_FILE:(do_detach?LOGMODE_SYSLOG:LOGMODE_STDERR)); @@ -207,46 +350,12 @@ int detach(void) xalloc_fail_func = memory_full; - return 0; + return true; } -/* - Execute the program name, with sane environment. -*/ -static void _execute_script(const char *scriptname, char **envp) - __attribute__ ((noreturn)); -static void _execute_script(const char *scriptname, char **envp) -{ - int save_errno; - - cp(); - - while(*envp) - putenv(*envp++); - - chdir("/"); - - closelogger(); - - /* Close all file descriptors */ - fcloseall(); - - execl(scriptname, NULL); - /* No return on success */ - - save_errno = errno; - - openlogger(identname, use_logfile?LOGMODE_FILE:(do_detach?LOGMODE_SYSLOG:LOGMODE_STDERR)); - logger(LOG_ERR, _("Could not execute `%s': %s"), scriptname, - strerror(save_errno)); - exit(save_errno); -} - -/* - Fork and execute the program pointed to by name. -*/ -int 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; @@ -259,51 +368,44 @@ int execute_script(const char *name, char **envp) /* First check if there is a script */ if(stat(scriptname, &s)) - return 0; + return true; - pid = fork(); + /* Set environment */ + + while(*envp) + putenv(*envp++); - if(pid < 0) { - logger(LOG_ERR, _("System call `%s' failed: %s"), "fork", - strerror(errno)); - return -1; - } + ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name); - if(pid) { - ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name); - - free(scriptname); - - if(waitpid(pid, &status, 0) == pid) { - 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)); - return -1; - } else - return 0; - } else if(WIFSIGNALED(status)) { /* Child was killed by a signal */ - logger(LOG_ERR, _("Process %d (%s) was killed by signal %d (%s)"), pid, - name, WTERMSIG(status), strsignal(WTERMSIG(status))); - return -1; - } else { /* Something strange happened */ - logger(LOG_ERR, _("Process %d (%s) terminated abnormally"), pid, - name); - return -1; - } - } else if (errno != EINTR) { - logger(LOG_ERR, _("System call `%s' failed: %s"), "waitpid", - strerror(errno)); - return -1; - } + status = system(scriptname); - /* Why do we get EINTR? */ - return 0; - } + free(scriptname); - /* Child here */ + /* Unset environment? */ - _execute_script(scriptname, envp); + 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)); + 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, + name, WTERMSIG(status), strsignal(WTERMSIG(status))); + return false; + } else { /* Something strange happened */ + logger(LOG_ERR, _("Process %d (%s) terminated abnormally"), pid, + name); + return false; + } + } else { + logger(LOG_ERR, _("System call `%s' failed: %s"), "system", + strerror(errno)); + return false; + } +#endif + return true; } @@ -311,17 +413,17 @@ int execute_script(const char *name, char **envp) Signal handlers. */ +#ifndef HAVE_MINGW static RETSIGTYPE sigterm_handler(int a) { - logger(LOG_NOTICE, _("Got TERM signal")); - - cleanup_and_exit(0); + logger(LOG_NOTICE, _("Got %s signal"), "TERM"); + running = false; } static RETSIGTYPE sigquit_handler(int a) { - logger(LOG_NOTICE, _("Got QUIT signal")); - cleanup_and_exit(0); + logger(LOG_NOTICE, _("Got %s signal"), "QUIT"); + running = false; } static RETSIGTYPE fatal_signal_square(int a) @@ -358,12 +460,14 @@ static RETSIGTYPE fatal_signal_handler(int a) static RETSIGTYPE sighup_handler(int a) { - logger(LOG_NOTICE, _("Got HUP signal")); - sighup = 1; + 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); @@ -380,8 +484,8 @@ static RETSIGTYPE sigint_handler(int a) static RETSIGTYPE sigalrm_handler(int a) { - logger(LOG_NOTICE, _("Got ALRM signal")); - sigalrm = 1; + logger(LOG_NOTICE, _("Got %s signal"), "ALRM"); + sigalrm = true; } static RETSIGTYPE sigusr1_handler(int a) @@ -399,8 +503,7 @@ static RETSIGTYPE sigusr2_handler(int a) static RETSIGTYPE sigwinch_handler(int a) { - extern int do_purge; - do_purge = 1; + do_purge = true; } static RETSIGTYPE unexpected_signal_handler(int a) @@ -418,25 +521,26 @@ 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} + {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) { +#ifndef HAVE_MINGW int i; struct sigaction act; @@ -468,4 +572,5 @@ void setup_signals(void) sighandlers[i].signal, strsignal(sighandlers[i].signal), strerror(errno)); } +#endif }