X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=b82e951f143ef55ab93709bc7573ffbff39dcb94;hp=36b214615490e6f3f1299a6fa3e5ec10f28a4066;hb=a3cd273751fdcef90a43108a5d2e669877b0bccb;hpb=0e945413315c9d15a3eb013fa3731dd978a8c7b8 diff --git a/src/process.c b/src/process.c index 36b21461..b82e951f 100644 --- a/src/process.c +++ b/src/process.c @@ -17,7 +17,7 @@ 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.58 2003/07/28 22:06:09 guus Exp $ + $Id: process.c,v 1.1.2.78 2003/12/07 14:29:02 guus Exp $ */ #include "system.h" @@ -43,6 +43,7 @@ extern char *identname; extern char *pidfilename; extern char **g_argv; extern bool use_logfile; +extern volatile bool running; sigset_t emptysigset; @@ -57,36 +58,182 @@ 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; +#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; + SERVICE_DESCRIPTION description = {"Virtual Private Network daemon"}; + + 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) - 1, command + 1); + strncat(command, "\\", sizeof(command)); + } + + strncat(command, program_name, sizeof(command)); + + strncat(command, "\"", 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; + } + + ChangeServiceConfig2(service, SERVICE_CONFIG_DESCRIPTION, &description); + + 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; } -#endif -/* - Close network connections, and terminate neatly -*/ -void cleanup_and_exit(int c) +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"); + break; + case SERVICE_CONTROL_SHUTDOWN: + logger(LOG_NOTICE, _("Got %s request"), "SERVICE_CONTROL_SHUTDOWN"); + break; + default: + logger(LOG_WARNING, _("Got unexpected request %d"), request); + 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); + } + +} + +VOID WINAPI run_service(DWORD argc, LPTSTR* argv) { - cp(); + int err = 1; + extern int main2(int argc, char **argv); - close_network_connections(); - ifdebug(CONNECTIONS) - dump_device_stats(); + status.dwServiceType = SERVICE_WIN32; + status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN; + status.dwWin32ExitCode = 0; + status.dwServiceSpecificExitCode = 0; + status.dwCheckPoint = 0; - logger(LOG_NOTICE, _("Terminating")); + statushandle = RegisterServiceCtrlHandlerEx(identname, controlhandler, NULL); - closelogger(); - exit(c); + 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); + + status.dwWaitHint = 0; + status.dwCurrentState = SERVICE_STOPPED; + //status.dwWin32ExitCode = err; + SetServiceStatus(statushandle, &status); + } + + return; +} + +bool init_service(void) { + SERVICE_TABLE_ENTRY services[] = { + {identname, run_service}, + {NULL, NULL} + }; + + 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 /* @@ -94,7 +241,7 @@ void cleanup_and_exit(int c) */ static bool write_pidfile(void) { - int pid; + pid_t pid; cp(); @@ -102,16 +249,18 @@ static bool write_pidfile(void) if(pid) { if(netname) - fprintf(stderr, _("A tincd is already running for net `%s' with pid %d.\n"), - netname, pid); + 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 %d.\n"), pid); + 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)) + if(!write_pid(pidfilename)) { + fprintf(stderr, _("Could write pid file %s: %s\n"), pidfilename, strerror(errno)); return false; + } return true; } @@ -123,7 +272,7 @@ static bool write_pidfile(void) bool kill_other(int signal) { #ifndef HAVE_MINGW - int pid; + pid_t pid; cp(); @@ -151,9 +300,11 @@ bool kill_other(int signal) fprintf(stderr, _("Removing stale lock file.\n")); remove_pid(pidfilename); } -#endif return true; +#else + return remove_service(); +#endif } /* @@ -170,14 +321,14 @@ bool detach(void) #ifndef HAVE_MINGW if(!write_pidfile()) return false; -#endif /* If we succeeded in doing that, detach */ closelogger(); +#endif -#ifdef HAVE_FORK if(do_detach) { +#ifndef HAVE_MINGW if(daemon(0, 0)) { fprintf(stderr, _("Couldn't detach from terminal: %s"), strerror(errno)); @@ -186,10 +337,15 @@ bool detach(void) /* Now UPDATE the pid in the pidfile, because we changed it... */ - if(!write_pid(pidfilename)) + 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()); #endif + } openlogger(identname, use_logfile?LOGMODE_FILE:(do_detach?LOGMODE_SYSLOG:LOGMODE_STDERR)); @@ -201,106 +357,69 @@ bool detach(void) return true; } -#ifdef HAVE_FORK -/* - 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); -} -#endif - -/* - Fork and execute the program pointed to by name. -*/ bool execute_script(const char *name, char **envp) { -#ifdef HAVE_FORK - pid_t pid; - int status; +#ifdef HAVE_SYSTEM + int status, len; struct stat s; char *scriptname; cp(); - asprintf(&scriptname, "%s/%s", confbase, name); +#ifndef HAVE_MINGW + len = asprintf(&scriptname, "\"%s/%s\"", confbase, name); +#else + len = asprintf(&scriptname, "\"%s/%s.bat\"", confbase, name); +#endif + if(len < 0) + return false; + + scriptname[len - 1] = '\0'; /* First check if there is a script */ - if(stat(scriptname, &s)) + if(stat(scriptname + 1, &s)) return true; - pid = fork(); + ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name); - if(pid < 0) { - logger(LOG_ERR, _("System call `%s' failed: %s"), "fork", - strerror(errno)); - return false; - } +#ifdef HAVE_PUTENV + /* Set environment */ + + while(*envp) + putenv(*envp++); +#endif - 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 false; - } else - return true; - } 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); + scriptname[len - 1] = '\"'; + status = system(scriptname); + + free(scriptname); + + /* Unset environment? */ + +#ifdef WEXITSTATUS + if(status != -1) { + if(WIFEXITED(status)) { /* Child exited by itself */ + if(WEXITSTATUS(status)) { + logger(LOG_ERR, _("Script %s exited with non-zero status %d"), + name, WEXITSTATUS(status)); return false; } - } else if (errno != EINTR) { - logger(LOG_ERR, _("System call `%s' failed: %s"), "waitpid", - strerror(errno)); + } else if(WIFSIGNALED(status)) { /* Child was killed by a signal */ + 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, _("Script %s terminated abnormally"), name); return false; } - - /* Why do we get EINTR? */ - return true; + } else { + logger(LOG_ERR, _("System call `%s' failed: %s"), "system", strerror(errno)); + return false; } - - /* Child here */ - - _execute_script(scriptname, envp); -#else - return true; #endif +#endif + return true; } @@ -311,15 +430,20 @@ bool execute_script(const char *name, char **envp) #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"); + if(running) + running = false; + else + exit(1); } static RETSIGTYPE sigquit_handler(int a) { - logger(LOG_NOTICE, _("Got QUIT signal")); - cleanup_and_exit(0); + logger(LOG_NOTICE, _("Got %s signal"), "QUIT"); + if(running) + running = false; + else + exit(1); } static RETSIGTYPE fatal_signal_square(int a) @@ -356,12 +480,14 @@ static RETSIGTYPE fatal_signal_handler(int a) static RETSIGTYPE sighup_handler(int a) { - logger(LOG_NOTICE, _("Got HUP signal")); + 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); @@ -378,7 +504,7 @@ static RETSIGTYPE sigint_handler(int a) static RETSIGTYPE sigalrm_handler(int a) { - logger(LOG_NOTICE, _("Got ALRM signal")); + logger(LOG_NOTICE, _("Got %s signal"), "ALRM"); sigalrm = true; }