X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=406661031628f55e2ef56f51e345fe2a43b2c892;hp=d08f70ffd0a029ae525873ff74f996d90cd5ab6a;hb=5dde6461a321ee47b06e33f8203f2acf00a31a51;hpb=ae070b917066f612e9aba8611c7a5da88e19a51a diff --git a/src/process.c b/src/process.c index d08f70ff..40666103 100644 --- a/src/process.c +++ b/src/process.c @@ -1,7 +1,7 @@ /* process.c -- process management functions - Copyright (C) 1999-2003 Ivo Timmermans , - 2000-2003 Guus Sliepen + Copyright (C) 1999-2005 Ivo Timmermans, + 2000-2009 Guus Sliepen 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 @@ -13,11 +13,9 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. - You should have received a copy of the GNU General Public License - 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.71 2003/08/10 13:35:05 guus Exp $ + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ #include "system.h" @@ -49,8 +47,7 @@ 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 +55,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,7 +66,7 @@ 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"}; @@ -94,27 +78,30 @@ 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)); + strncat(command, " ", sizeof command - strlen(command)); if(space) - strncat(command, "\"", sizeof(command)); + strncat(command, "\"", sizeof command - strlen(command)); - strncat(command, *argp, sizeof(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())); @@ -164,30 +151,36 @@ 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) { + 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); } - 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); @@ -245,9 +238,8 @@ bool init_service(void) { /* check for an existing tinc for this net, and write pid to pidfile */ -static bool write_pidfile(void) -{ - int pid; +static bool write_pidfile(void) { + pid_t pid; cp(); @@ -255,16 +247,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; } @@ -273,10 +267,9 @@ static bool write_pidfile(void) /* kill older tincd for this net */ -bool kill_other(int signal) -{ +bool kill_other(int signal) { #ifndef HAVE_MINGW - int pid; + pid_t pid; cp(); @@ -314,8 +307,7 @@ bool kill_other(int signal) /* Detach from current terminal, write pidfile, kill parent */ -bool detach(void) -{ +bool detach(void) { cp(); setup_signals(); @@ -341,8 +333,10 @@ 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()); @@ -359,41 +353,58 @@ bool detach(void) return true; } -bool execute_script(const char *name, char **envp) -{ +bool execute_script(const char *name, char **envp) { #ifdef HAVE_SYSTEM - int status; - struct stat s; - char *scriptname; + int status, len; + char *scriptname, *p; + int i; cp(); #ifndef HAVE_MINGW - asprintf(&scriptname, "%s/%s", confbase, name); + 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); - free(scriptname); -#endif - #ifdef HAVE_PUTENV /* Set environment */ - while(*envp) - putenv(*envp++); + for(i = 0; envp[i]; i++) + putenv(envp[i]); #endif - asprintf(&scriptname, "\"%s/%s\"", confbase, name); + 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) { @@ -426,28 +437,30 @@ bool execute_script(const char *name, char **envp) */ #ifndef HAVE_MINGW -static RETSIGTYPE sigterm_handler(int a) -{ +static RETSIGTYPE sigterm_handler(int a) { logger(LOG_NOTICE, _("Got %s signal"), "TERM"); - running = false; + if(running) + running = false; + else + exit(1); } -static RETSIGTYPE sigquit_handler(int a) -{ +static RETSIGTYPE sigquit_handler(int a) { logger(LOG_NOTICE, _("Got %s signal"), "QUIT"); - running = false; + if(running) + running = false; + else + exit(1); } -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(); @@ -470,14 +483,12 @@ static RETSIGTYPE fatal_signal_handler(int a) } } -static RETSIGTYPE sighup_handler(int a) -{ +static RETSIGTYPE sighup_handler(int a) { logger(LOG_NOTICE, _("Got %s signal"), "HUP"); sighup = true; } -static RETSIGTYPE sigint_handler(int a) -{ +static RETSIGTYPE sigint_handler(int a) { logger(LOG_NOTICE, _("Got %s signal"), "INT"); if(saved_debug_level != -1) { @@ -494,38 +505,32 @@ static RETSIGTYPE sigint_handler(int a) } } -static RETSIGTYPE sigalrm_handler(int a) -{ +static RETSIGTYPE sigalrm_handler(int a) { logger(LOG_NOTICE, _("Got %s signal"), "ALRM"); sigalrm = true; } -static RETSIGTYPE sigusr1_handler(int a) -{ +static RETSIGTYPE sigusr1_handler(int a) { dump_connections(); } -static RETSIGTYPE sigusr2_handler(int a) -{ +static RETSIGTYPE sigusr2_handler(int a) { dump_device_stats(); dump_nodes(); dump_edges(); dump_subnets(); } -static RETSIGTYPE sigwinch_handler(int a) -{ +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)); } @@ -550,8 +555,7 @@ static struct { }; #endif -void setup_signals(void) -{ +void setup_signals(void) { #ifndef HAVE_MINGW int i; struct sigaction act; @@ -563,7 +567,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