X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;fp=src%2Fprocess.c;h=362b678c714a27bd38652ca866a041ec561266e3;hp=262b092c165404dd2e78f8e586a6661fac611b8a;hb=6dfdb323612184529b4b83c1be914dda8262de47;hpb=c4940a5c888d85b4c477b6face5e9a618e64718d

diff --git a/src/process.c b/src/process.c
index 262b092c..362b678c 100644
--- a/src/process.c
+++ b/src/process.c
@@ -22,12 +22,12 @@
 
 #include "conf.h"
 #include "connection.h"
+#include "control.h"
 #include "device.h"
 #include "edge.h"
 #include "logger.h"
 #include "net.h"
 #include "node.h"
-#include "pidfile.h"
 #include "process.h"
 #include "subnet.h"
 #include "utils.h"
@@ -35,25 +35,12 @@
 
 /* If zero, don't detach from the terminal. */
 bool do_detach = true;
-bool sighup = false;
 bool sigalrm = false;
 
 extern char *identname;
-extern char *pidfilename;
 extern char **g_argv;
 extern bool use_logfile;
 
-#ifndef HAVE_MINGW
-static sigset_t emptysigset;
-#endif
-
-static int saved_debug_level = -1;
-
-static void memory_full(int size) {
-	logger(LOG_ERR, "Memory exhausted (couldn't allocate %d bytes), exitting.", size);
-	exit(1);
-}
-
 /* Some functions the less gifted operating systems might lack... */
 
 #ifdef HAVE_MINGW
@@ -66,7 +53,7 @@ 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;
@@ -74,7 +61,7 @@ bool install_service(void) {
 
 	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;
 	}
 
@@ -106,51 +93,22 @@ bool install_service(void) {
 	
 	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);
-
-	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);
+		logger(DEBUG_ALWAYS, LOG_INFO, "%s service started", identname);
 
 	return true;
 }
@@ -161,29 +119,21 @@ 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", 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);
-	}
-
+	event_loopexit(NULL);
+	status.dwWaitHint = 30000; 
+	status.dwCurrentState = SERVICE_STOP_PENDING; 
+	SetServiceStatus(statushandle, &status);
+	return NO_ERROR;
 }
 
 VOID WINAPI run_service(DWORD argc, LPTSTR* argv) {
@@ -200,7 +150,7 @@ VOID WINAPI run_service(DWORD argc, LPTSTR* argv) {
 	statushandle = RegisterServiceCtrlHandlerEx(identname, controlhandler, NULL); 
 
 	if (!statushandle) {
-		logger(LOG_ERR, "System call `%s' failed: %s", "RegisterServiceCtrlHandlerEx", winerror(GetLastError()));
+		logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "RegisterServiceCtrlHandlerEx", winerror(GetLastError()));
 		err = 1;
 	} else {
 		status.dwWaitHint = 30000; 
@@ -233,92 +183,22 @@ 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;
 }
 #endif
 
-#ifndef HAVE_MINGW
-/*
-  check for an existing tinc for this net, and write pid to pidfile
-*/
-static bool write_pidfile(void) {
-	pid_t pid;
-
-	pid = check_pid(pidfilename);
-
-	if(pid) {
-		if(netname)
-			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 %ld.\n", (long)pid);
-		return false;
-	}
-
-	/* if it's locked, write-protected, or whatever */
-	if(!write_pid(pidfilename)) {
-		fprintf(stderr, "Could write pid file %s: %s\n", pidfilename, strerror(errno));
-		return false;
-	}
-
-	return true;
-}
-#endif
-
-/*
-  kill older tincd for this net
-*/
-bool kill_other(int signal) {
-#ifndef HAVE_MINGW
-	pid_t pid;
-
-	pid = read_pid(pidfilename);
-
-	if(!pid) {
-		if(netname)
-			fprintf(stderr, "No other tincd is running for net `%s'.\n",
-					netname);
-		else
-			fprintf(stderr, "No other tincd is running.\n");
-		return false;
-	}
-
-	errno = 0;					/* No error, sometimes errno is only changed on error */
-
-	/* ESRCH is returned when no process with that pid is found */
-	if(kill(pid, signal) && errno == ESRCH) {
-		if(netname)
-			fprintf(stderr, "The tincd for net `%s' is no longer running. ",
-					netname);
-		else
-			fprintf(stderr, "The tincd is no longer running. ");
-
-		fprintf(stderr, "Removing stale lock file.\n");
-		remove_pid(pidfilename);
-	}
-
-	return true;
-#else
-	return remove_service();
-#endif
-}
-
 /*
-  Detach from current terminal, write pidfile, kill parent
+  Detach from current terminal
 */
 bool detach(void) {
-	setup_signals();
-
-	/* First check if we can open a fresh new pidfile */
-
 #ifndef HAVE_MINGW
-	if(!write_pidfile())
-		return false;
-
-	/* If we succeeded in doing that, detach */
+	signal(SIGPIPE, SIG_IGN);
+	signal(SIGUSR1, SIG_IGN);
+	signal(SIGUSR2, SIG_IGN);
+	signal(SIGWINCH, SIG_IGN);
 
 	closelogger();
 #endif
@@ -330,26 +210,17 @@ bool detach(void) {
 					strerror(errno));
 			return false;
 		}
-
-		/* Now UPDATE the pid in the pidfile, because we changed it... */
-
-		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());
+			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",
+	logger(DEBUG_ALWAYS, LOG_NOTICE, "tincd %s (%s %s) starting, debug level %d",
 			   VERSION, __DATE__, __TIME__, debug_level);
 
-	xalloc_fail_func = memory_full;
-
 	return true;
 }
 
@@ -361,9 +232,9 @@ bool execute_script(const char *name, char **envp) {
 	char *interpreter = NULL;
 
 #ifndef HAVE_MINGW
-	len = xasprintf(&scriptname, "\"%s/%s\"", confbase, name);
+	len = xasprintf(&scriptname, "\"%s" SLASH "%s\"", confbase, name);
 #else
-	len = xasprintf(&scriptname, "\"%s/%s.bat\"", confbase, name);
+	len = xasprintf(&scriptname, "\"%s" SLASH "%s.bat\"", confbase, name);
 #endif
 	if(len < 0)
 		return false;
@@ -389,7 +260,8 @@ bool execute_script(const char *name, char **envp) {
 			return false;
 	}
 
-	ifdebug(STATUS) logger(LOG_INFO, "Executing script %s", name);
+	logger(DEBUG_STATUS, LOG_INFO, "Executing script %s", name);
+
 
 #ifdef HAVE_PUTENV
 	/* Set environment */
@@ -419,181 +291,23 @@ bool execute_script(const char *name, char **envp) {
 	if(status != -1) {
 		if(WIFEXITED(status)) {	/* Child exited by itself */
 			if(WEXITSTATUS(status)) {
-				logger(LOG_ERR, "Script %s exited with non-zero status %d",
+				logger(DEBUG_ALWAYS, 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)",
+			logger(DEBUG_ALWAYS, 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);
+			logger(DEBUG_ALWAYS, LOG_ERR, "Script %s terminated abnormally", name);
 			return false;
 		}
 	} else {
-		logger(LOG_ERR, "System call `%s' failed: %s", "system", strerror(errno));
+		logger(DEBUG_ALWAYS, LOG_ERR, "System call `%s' failed: %s", "system", strerror(errno));
 		return false;
 	}
 #endif
 #endif
 	return true;
 }
-
-
-/*
-  Signal handlers.
-*/
-
-#ifndef HAVE_MINGW
-static RETSIGTYPE sigterm_handler(int a) {
-	logger(LOG_NOTICE, "Got %s signal", "TERM");
-	if(running)
-		running = false;
-	else
-		exit(1);
-}
-
-static RETSIGTYPE sigquit_handler(int a) {
-	logger(LOG_NOTICE, "Got %s signal", "QUIT");
-	if(running)
-		running = false;
-	else
-		exit(1);
-}
-
-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);
-		remove_pid(pidfilename);
-		execvp(g_argv[0], g_argv);
-	} else {
-		logger(LOG_NOTICE, "Not restarting.");
-		exit(1);
-	}
-}
-
-static RETSIGTYPE sighup_handler(int a) {
-	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);
-		debug_level = saved_debug_level;
-		saved_debug_level = -1;
-	} else {
-		logger(LOG_NOTICE,
-			"Temporarily setting debug level to 5.  Kill me with SIGINT again to go back to level %d.",
-			debug_level);
-		saved_debug_level = debug_level;
-		debug_level = 5;
-	}
-}
-
-static RETSIGTYPE sigalrm_handler(int a) {
-	logger(LOG_NOTICE, "Got %s signal", "ALRM");
-	sigalrm = true;
-}
-
-static RETSIGTYPE sigusr1_handler(int a) {
-	dump_connections();
-}
-
-static RETSIGTYPE sigusr2_handler(int a) {
-	devops.dump_stats();
-	dump_nodes();
-	dump_edges();
-	dump_subnets();
-}
-
-static RETSIGTYPE sigwinch_handler(int a) {
-	do_purge = true;
-}
-
-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[] = {
-	{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},
-	{SIGABRT, SIG_DFL},
-	{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[3].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
-}