X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=5d78c2954b4604fc447668470e7b72a175d4f451;hp=09fd63e1071a0da957a44d9eff04acb1f16b72b1;hb=c2dc3784f127ef6db6e9960a4abecc1aab6f4e31;hpb=103543aa2c15d9f1e2aa313a2e593a7524cce484

diff --git a/src/process.c b/src/process.c
index 09fd63e1..5d78c295 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1,7 +1,7 @@
 /*
     process.c -- process management functions
     Copyright (C) 1999-2005 Ivo Timmermans,
-                  2000-2009 Guus Sliepen <guus@tinc-vpn.org>
+                  2000-2013 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
@@ -25,49 +25,40 @@
 #include "control.h"
 #include "device.h"
 #include "edge.h"
+#include "event.h"
 #include "logger.h"
+#include "names.h"
+#include "net.h"
 #include "node.h"
 #include "process.h"
 #include "subnet.h"
 #include "utils.h"
 #include "xalloc.h"
+#include "version.h"
 
 /* If zero, don't detach from the terminal. */
 bool do_detach = true;
 bool sigalrm = false;
 
-extern char *identname;
 extern char **g_argv;
 extern bool use_logfile;
-
-sigset_t emptysigset;
-
-static void memory_full(int size) {
-	logger(LOG_ERR, "Memory exhausted (couldn't allocate %d bytes), exitting.", size);
-	exit(1);
-}
+extern bool use_syslog;
 
 /* Some functions the less gifted operating systems might lack... */
 
 #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) {
+static 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()));
+		logger(DEBUG_ALWAYS, LOG_ERR, "Could not open service manager: %s", winerror(GetLastError()));
 		return false;
 	}
 
@@ -80,13 +71,13 @@ bool install_service(void) {
 
 	strncat(command, "\"", sizeof command - strlen(command));
 
-	for(argp = g_argv + 1; *argp; argp++) {
-		space = strchr(*argp, ' ');
+	for(char **argp = g_argv + 1; *argp; argp++) {
+		char *space = strchr(*argp, ' ');
 		strncat(command, " ", sizeof command - strlen(command));
-		
+
 		if(space)
 			strncat(command, "\"", sizeof command - strlen(command));
-		
+
 		strncat(command, *argp, sizeof command - strlen(command));
 
 		if(space)
@@ -96,57 +87,30 @@ bool install_service(void) {
 	service = CreateService(manager, identname, identname,
 			SERVICE_ALL_ACCESS, SERVICE_WIN32_OWN_PROCESS, SERVICE_AUTO_START, SERVICE_ERROR_NORMAL,
 			command, NULL, NULL, NULL, NULL, NULL);
-	
+
 	if(!service) {
 		DWORD lasterror = GetLastError();
-		logger(LOG_ERR, "Could not create %s service: %s", identname, winerror(lasterror));
+		logger(DEBUG_ALWAYS, LOG_ERR, "Could not create %s service: %s", identname, winerror(lasterror));
 		if(lasterror != ERROR_SERVICE_EXISTS)
 			return false;
 	}
 
 	if(service) {
 		ChangeServiceConfig2(service, SERVICE_CONFIG_DESCRIPTION, &description);
-		logger(LOG_INFO, "%s service installed", identname);
+		logger(DEBUG_ALWAYS, LOG_INFO, "%s service installed", identname);
 	} else {
 		service = OpenService(manager, identname, SERVICE_ALL_ACCESS);
 	}
 
 	if(!StartService(service, 0, NULL))
-		logger(LOG_WARNING, "Could not start %s service: %s", identname, winerror(GetLastError()));
+		logger(DEBUG_ALWAYS, LOG_WARNING, "Could not start %s service: %s", identname, winerror(GetLastError()));
 	else
-		logger(LOG_INFO, "%s service started", identname);
+		logger(DEBUG_ALWAYS, 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;
-}
+io_t stop_io;
 
 DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
 	switch(request) {
@@ -154,53 +118,50 @@ DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
 			SetServiceStatus(statushandle, &status);
 			return NO_ERROR;
 		case SERVICE_CONTROL_STOP:
-			logger(LOG_NOTICE, "Got %s request", "SERVICE_CONTROL_STOP");
+			logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s request", "SERVICE_CONTROL_STOP");
 			break;
 		case SERVICE_CONTROL_SHUTDOWN:
-			logger(LOG_NOTICE, "Got %s request", "SERVICE_CONTROL_SHUTDOWN");
+			logger(DEBUG_ALWAYS, LOG_NOTICE, "Got %s request", "SERVICE_CONTROL_SHUTDOWN");
 			break;
 		default:
-			logger(LOG_WARNING, "Got unexpected request %d", request);
+			logger(DEBUG_ALWAYS, LOG_WARNING, "Got unexpected request %d", (int)request);
 			return ERROR_CALL_NOT_IMPLEMENTED;
 	}
 
-	event_loopexit(NULL);
-	status.dwWaitHint = 30000; 
-	status.dwCurrentState = SERVICE_STOP_PENDING; 
+	status.dwWaitHint = 1000;
+	status.dwCurrentState = SERVICE_STOP_PENDING;
 	SetServiceStatus(statushandle, &status);
+	if (WSASetEvent(stop_io.event) == FALSE)
+		abort();
 	return NO_ERROR;
 }
 
 VOID WINAPI run_service(DWORD argc, LPTSTR* argv) {
-	int err = 1;
 	extern int main2(int argc, char **argv);
 
-
-	status.dwServiceType = SERVICE_WIN32; 
+	status.dwServiceType = SERVICE_WIN32;
 	status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
-	status.dwWin32ExitCode = 0; 
-	status.dwServiceSpecificExitCode = 0; 
-	status.dwCheckPoint = 0; 
+	status.dwWin32ExitCode = 0;
+	status.dwServiceSpecificExitCode = 0;
+	status.dwCheckPoint = 0;
 
-	statushandle = RegisterServiceCtrlHandlerEx(identname, controlhandler, NULL); 
+	statushandle = RegisterServiceCtrlHandlerEx(identname, controlhandler, NULL);
 
 	if (!statushandle) {
-		logger(LOG_ERR, "System call `%s' failed: %s", "RegisterServiceCtrlHandlerEx", winerror(GetLastError()));
-		err = 1;
+		logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "RegisterServiceCtrlHandlerEx", winerror(GetLastError()));
 	} else {
-		status.dwWaitHint = 30000; 
-		status.dwCurrentState = SERVICE_START_PENDING; 
+		status.dwWaitHint = 30000;
+		status.dwCurrentState = SERVICE_START_PENDING;
 		SetServiceStatus(statushandle, &status);
 
-		status.dwWaitHint = 0; 
+		status.dwWaitHint = 0;
 		status.dwCurrentState = SERVICE_RUNNING;
 		SetServiceStatus(statushandle, &status);
 
-		err = main2(argc, argv);
+		main2(argc, argv);
 
 		status.dwWaitHint = 0;
-		status.dwCurrentState = SERVICE_STOPPED; 
-		//status.dwWin32ExitCode = err; 
+		status.dwCurrentState = SERVICE_STOPPED;
 		SetServiceStatus(statushandle, &status);
 	}
 
@@ -218,7 +179,7 @@ bool init_service(void) {
 			return false;
 		}
 		else
-			logger(LOG_ERR, "System call `%s' failed: %s", "StartServiceCtrlDispatcher", winerror(GetLastError()));
+			logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "StartServiceCtrlDispatcher", winerror(GetLastError()));
 	}
 
 	return true;
@@ -229,198 +190,40 @@ bool init_service(void) {
   Detach from current terminal
 */
 bool detach(void) {
-	setup_signals();
+	logmode_t logmode;
 
 #ifndef HAVE_MINGW
+	signal(SIGPIPE, SIG_IGN);
+	signal(SIGUSR1, SIG_IGN);
+	signal(SIGUSR2, SIG_IGN);
+	signal(SIGWINCH, SIG_IGN);
+
 	closelogger();
 #endif
 
 	if(do_detach) {
 #ifndef HAVE_MINGW
-		if(daemon(0, 0)) {
-			fprintf(stderr, "Couldn't detach from terminal: %s",
-					strerror(errno));
+		if(daemon(1, 0)) {
+			logger(DEBUG_ALWAYS, LOG_ERR, "Couldn't detach from terminal: %s", strerror(errno));
 			return false;
 		}
 #else
 		if(!statushandle)
-			exit(install_service());
-#endif
-	}
-
-	openlogger(identname, use_logfile?LOGMODE_FILE:(do_detach?LOGMODE_SYSLOG:LOGMODE_STDERR));
-
-	logger(LOG_NOTICE, "tincd %s (%s %s) starting, debug level %d",
-			   VERSION, __DATE__, __TIME__, debug_level);
-
-	xalloc_fail_func = memory_full;
-
-	return true;
-}
-
-bool execute_script(const char *name, char **envp) {
-#ifdef HAVE_SYSTEM
-	int status, len;
-	char *scriptname, *p;
-	int i;
-
-#ifndef HAVE_MINGW
-	len = xasprintf(&scriptname, "\"%s/%s\"", confbase, name);
-#else
-	len = xasprintf(&scriptname, "\"%s/%s.bat\"", confbase, name);
+			exit(!install_service());
 #endif
-	if(len < 0)
-		return false;
-
-	scriptname[len - 1] = '\0';
-
-#ifndef HAVE_TUNEMU
-	/* First check if there is a script */
-
-	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 */
-	
-	for(i = 0; envp[i]; i++)
-		putenv(envp[i]);
-#endif
-
-	scriptname[len - 1] = '\"';
-	status = system(scriptname);
 
-	free(scriptname);
+	if(use_logfile)
+		logmode = LOGMODE_FILE;
+	else if(use_syslog || do_detach)
+		logmode = LOGMODE_SYSLOG;
+	else
+		logmode = LOGMODE_STDERR;
 
-	/* Unset environment */
+	openlogger(identname, logmode);
 
-	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);
-		}
-	}
+	logger(DEBUG_ALWAYS, LOG_NOTICE, "tincd %s (%s %s) starting, debug level %d",
+			   BUILD_VERSION, BUILD_DATE, BUILD_TIME, debug_level);
 
-#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(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;
-		}
-	} else {
-		logger(LOG_ERR, "System call `%s' failed: %s", "system", strerror(errno));
-		return false;
-	}
-#endif
-#endif
 	return true;
 }
-
-
-/*
-  Signal handlers.
-*/
-
-#ifndef HAVE_MINGW
-static RETSIGTYPE fatal_signal_square(int a) {
-	logger(LOG_ERR, "Got another fatal signal %d (%s): not restarting.", a,
-		   strsignal(a));
-	exit(1);
-}
-
-static RETSIGTYPE fatal_signal_handler(int a) {
-	struct sigaction act;
-	logger(LOG_ERR, "Got fatal signal %d (%s)", a, strsignal(a));
-
-	if(do_detach) {
-		logger(LOG_NOTICE, "Trying to re-execute in 5 seconds...");
-
-		act.sa_handler = fatal_signal_square;
-		act.sa_mask = emptysigset;
-		act.sa_flags = 0;
-		sigaction(SIGSEGV, &act, NULL);
-
-		close_network_connections();
-		sleep(5);
-		exit_control();
-		execvp(g_argv[0], g_argv);
-	} else {
-		logger(LOG_NOTICE, "Not restarting.");
-		exit(1);
-	}
-}
-
-static RETSIGTYPE unexpected_signal_handler(int a) {
-	logger(LOG_WARNING, "Got unexpected signal %d (%s)", a, strsignal(a));
-}
-
-static RETSIGTYPE ignore_signal_handler(int a) {
-	ifdebug(SCARY_THINGS) logger(LOG_DEBUG, "Ignored signal %d (%s)", a, strsignal(a));
-}
-
-static struct {
-	int signal;
-	void (*handler)(int);
-} sighandlers[] = {
-	{SIGSEGV, fatal_signal_handler},
-	{SIGBUS, fatal_signal_handler},
-	{SIGILL, fatal_signal_handler},
-	{SIGPIPE, ignore_signal_handler},
-	{SIGCHLD, ignore_signal_handler},
-	{0, NULL}
-};
-#endif
-
-void setup_signals(void) {
-#ifndef HAVE_MINGW
-	int i;
-	struct sigaction act;
-
-	sigemptyset(&emptysigset);
-	act.sa_handler = NULL;
-	act.sa_mask = emptysigset;
-	act.sa_flags = 0;
-
-	/* Set a default signal handler for every signal, errors will be
-	   ignored. */
-	for(i = 1; i < NSIG; i++) {
-		if(!do_detach)
-			act.sa_handler = SIG_DFL;
-		else
-			act.sa_handler = unexpected_signal_handler;
-		sigaction(i, &act, NULL);
-	}
-
-	/* If we didn't detach, allow coredumps */
-	if(!do_detach)
-		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. */
-	for(i = 0; sighandlers[i].signal; i++) {
-		act.sa_handler = sighandlers[i].handler;
-		if(sigaction(sighandlers[i].signal, &act, NULL) < 0)
-			fprintf(stderr, "Installing signal handler for signal %d (%s) failed: %s\n",
-					sighandlers[i].signal, strsignal(sighandlers[i].signal),
-					strerror(errno));
-	}
-#endif
-}