X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=b8bb82147485b0b2c5f05f5a4ff3986f6ec0d54a;hp=4eb1cd84cbc60880e3cbcf35d8f9d3e911bc77ed;hb=a227843b739d279b63adcf3736ebb03d856080c4;hpb=0b5e6cf04ec0c7e3c54c74a54a32b30e6e3c1f83 diff --git a/src/process.c b/src/process.c index 4eb1cd84..b8bb8214 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.77 2003/11/27 23:24:59 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,10 +47,8 @@ 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); } @@ -81,30 +77,30 @@ bool install_service(void) { } if(!strchr(program_name, '\\')) { - GetCurrentDirectory(sizeof(command) - 1, command + 1); - 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)); + 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())); @@ -154,6 +150,9 @@ 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"); break; @@ -180,8 +179,7 @@ DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) { } -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); @@ -239,12 +237,9 @@ bool init_service(void) { /* check for an existing tinc for this net, and write pid to pidfile */ -static bool write_pidfile(void) -{ +static bool write_pidfile(void) { pid_t pid; - cp(); - pid = check_pid(pidfilename); if(pid) { @@ -269,13 +264,10 @@ static bool write_pidfile(void) /* kill older tincd for this net */ -bool kill_other(int signal) -{ +bool kill_other(int signal) { #ifndef HAVE_MINGW pid_t pid; - cp(); - pid = read_pid(pidfilename); if(!pid) { @@ -310,10 +302,7 @@ bool kill_other(int signal) /* Detach from current terminal, write pidfile, kill parent */ -bool detach(void) -{ - cp(); - +bool detach(void) { setup_signals(); /* First check if we can open a fresh new pidfile */ @@ -338,7 +327,7 @@ bool detach(void) /* Now UPDATE the pid in the pidfile, because we changed it... */ if(!write_pid(pidfilename)) { - fprintf(stderr, _("Could not write pidfile %s: %s\n"), pidfilename, strerror(errno)); + fprintf(stderr, _("Could not write pid file %s: %s\n"), pidfilename, strerror(errno)); return false; } #else @@ -357,37 +346,38 @@ 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, len; - struct stat s; - char *scriptname; - - cp(); + char *scriptname, *p; + int i; #ifndef HAVE_MINGW - len = asprintf(&scriptname, "\"%s/%s\"", confbase, name); + len = xasprintf(&scriptname, "\"%s/%s\"", confbase, name); #else - len = asprintf(&scriptname, "\"%s/%s.bat\"", confbase, name); + 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 + 1, &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++); + for(i = 0; envp[i]; i++) + putenv(envp[i]); #endif scriptname[len - 1] = '\"'; @@ -395,7 +385,17 @@ bool execute_script(const char *name, char **envp) 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) { @@ -428,31 +428,31 @@ 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(); if(do_detach) { logger(LOG_NOTICE, _("Trying to re-execute in 5 seconds...")); @@ -472,14 +472,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) { @@ -496,38 +494,31 @@ 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)); } @@ -552,8 +543,7 @@ static struct { }; #endif -void setup_signals(void) -{ +void setup_signals(void) { #ifndef HAVE_MINGW int i; struct sigaction act; @@ -565,7 +555,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