X-Git-Url: https://www.tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprocess.c;h=77454f755d05dc46481ee8cf7ca735d407302e90;hb=a22041922f160667573e9a5ae3f4195e1668906a;hp=406661031628f55e2ef56f51e345fe2a43b2c892;hpb=5dde6461a321ee47b06e33f8203f2acf00a31a51;p=tinc

diff --git a/src/process.c b/src/process.c
index 40666103..77454f75 100644
--- a/src/process.c
+++ b/src/process.c
@@ -22,11 +22,11 @@
 
 #include "conf.h"
 #include "connection.h"
+#include "control.h"
 #include "device.h"
 #include "edge.h"
 #include "logger.h"
 #include "node.h"
-#include "pidfile.h"
 #include "process.h"
 #include "subnet.h"
 #include "utils.h"
@@ -34,22 +34,18 @@
 
 /* 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;
-extern volatile bool running;
 
+#ifndef HAVE_MINGW
 sigset_t emptysigset;
-
-static int saved_debug_level = -1;
+#endif
 
 static void memory_full(int size) {
-	logger(LOG_ERR, _("Memory exhausted (couldn't allocate %d bytes), exitting."), size);
-	cp_trace();
+	logger(LOG_ERR, "Memory exhausted (couldn't allocate %d bytes), exitting.", size);
 	exit(1);
 }
 
@@ -73,7 +69,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(LOG_ERR, "Could not open service manager: %s", winerror(GetLastError()));
 		return false;
 	}
 
@@ -104,18 +100,23 @@ bool install_service(void) {
 			command, NULL, NULL, NULL, NULL, NULL);
 	
 	if(!service) {
-		logger(LOG_ERR, _("Could not create %s service: %s"), identname, winerror(GetLastError()));
-		return false;
+		DWORD lasterror = GetLastError();
+		logger(LOG_ERR, "Could not create %s service: %s", identname, winerror(lasterror));
+		if(lasterror != ERROR_SERVICE_EXISTS)
+			return false;
 	}
 
-	ChangeServiceConfig2(service, SERVICE_CONFIG_DESCRIPTION, &description);
-
-	logger(LOG_INFO, _("%s service installed"), identname);
+	if(service) {
+		ChangeServiceConfig2(service, SERVICE_CONFIG_DESCRIPTION, &description);
+		logger(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(LOG_WARNING, "Could not start %s service: %s", identname, winerror(GetLastError()));
 	else
-		logger(LOG_INFO, _("%s service started"), identname);
+		logger(LOG_INFO, "%s service started", identname);
 
 	return true;
 }
@@ -123,28 +124,28 @@ bool install_service(void) {
 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()));
+		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()));
+		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()));
+		logger(LOG_ERR, "Could not stop %s service: %s", identname, winerror(GetLastError()));
 	else
-		logger(LOG_INFO, _("%s service stopped"), identname);
+		logger(LOG_INFO, "%s service stopped", identname);
 
 	if(!DeleteService(service)) {
-		logger(LOG_ERR, _("Could not remove %s service: %s"), identname, winerror(GetLastError()));
+		logger(LOG_ERR, "Could not remove %s service: %s", identname, winerror(GetLastError()));
 		return false;
 	}
 
-	logger(LOG_INFO, _("%s service removed"), identname);
+	logger(LOG_INFO, "%s service removed", identname);
 
 	return true;
 }
@@ -155,29 +156,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(LOG_NOTICE, "Got %s request", "SERVICE_CONTROL_STOP");
 			break;
 		case SERVICE_CONTROL_SHUTDOWN:
-			logger(LOG_NOTICE, _("Got %s request"), "SERVICE_CONTROL_SHUTDOWN");
+			logger(LOG_NOTICE, "Got %s request", "SERVICE_CONTROL_SHUTDOWN");
 			break;
 		default:
-			logger(LOG_WARNING, _("Got unexpected request %d"), request);
+			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);
-	}
-
+	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) {
@@ -194,7 +187,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(LOG_ERR, "System call `%s' failed: %s", "RegisterServiceCtrlHandlerEx", winerror(GetLastError()));
 		err = 1;
 	} else {
 		status.dwWaitHint = 30000; 
@@ -227,37 +220,7 @@ bool init_service(void) {
 			return false;
 		}
 		else
-			logger(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;
-
-	cp();
-
-	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;
+			logger(LOG_ERR, "System call `%s' failed: %s", "StartServiceCtrlDispatcher", winerror(GetLastError()));
 	}
 
 	return true;
@@ -265,78 +228,22 @@ static bool write_pidfile(void) {
 #endif
 
 /*
-  kill older tincd for this net
-*/
-bool kill_other(int signal) {
-#ifndef HAVE_MINGW
-	pid_t pid;
-
-	cp();
-
-	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) {
-	cp();
-
 	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 */
-
 	closelogger();
 #endif
 
 	if(do_detach) {
 #ifndef HAVE_MINGW
 		if(daemon(0, 0)) {
-			fprintf(stderr, _("Couldn't detach from terminal: %s"),
+			fprintf(stderr, "Couldn't detach from terminal: %s",
 					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());
@@ -345,7 +252,7 @@ bool detach(void) {
 
 	openlogger(identname, use_logfile?LOGMODE_FILE:(do_detach?LOGMODE_SYSLOG:LOGMODE_STDERR));
 
-	logger(LOG_NOTICE, _("tincd %s (%s %s) starting, debug level %d"),
+	logger(LOG_NOTICE, "tincd %s (%s %s) starting, debug level %d",
 			   VERSION, __DATE__, __TIME__, debug_level);
 
 	xalloc_fail_func = memory_full;
@@ -359,8 +266,6 @@ bool execute_script(const char *name, char **envp) {
 	char *scriptname, *p;
 	int i;
 
-	cp();
-
 #ifndef HAVE_MINGW
 	len = xasprintf(&scriptname, "\"%s/%s\"", confbase, name);
 #else
@@ -380,7 +285,7 @@ bool execute_script(const char *name, char **envp) {
 	}
 #endif
 
-	ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
+	ifdebug(STATUS) logger(LOG_INFO, "Executing script %s", name);
 
 #ifdef HAVE_PUTENV
 	/* Set environment */
@@ -410,20 +315,20 @@ 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(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(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(LOG_ERR, "Script %s terminated abnormally", name);
 			return false;
 		}
 	} else {
-		logger(LOG_ERR, _("System call `%s' failed: %s"), "system", strerror(errno));
+		logger(LOG_ERR, "System call `%s' failed: %s", "system", strerror(errno));
 		return false;
 	}
 #endif
@@ -437,36 +342,18 @@ bool execute_script(const char *name, char **envp) {
 */
 
 #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,
+	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) {
 	struct sigaction act;
-	logger(LOG_ERR, _("Got fatal signal %d (%s)"), a, strsignal(a));
-	cp_trace();
+	logger(LOG_ERR, "Got fatal signal %d (%s)", a, strsignal(a));
 
 	if(do_detach) {
-		logger(LOG_NOTICE, _("Trying to re-execute in 5 seconds..."));
+		logger(LOG_NOTICE, "Trying to re-execute in 5 seconds...");
 
 		act.sa_handler = fatal_signal_square;
 		act.sa_mask = emptysigset;
@@ -475,82 +362,31 @@ static RETSIGTYPE fatal_signal_handler(int a) {
 
 		close_network_connections();
 		sleep(5);
-		remove_pid(pidfilename);
+		exit_control();
 		execvp(g_argv[0], g_argv);
 	} else {
-		logger(LOG_NOTICE, _("Not restarting."));
+		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) {
-	dump_device_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));
-	cp_trace();
+	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));
+	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},
 	{0, NULL}
 };
 #endif
@@ -577,14 +413,14 @@ void setup_signals(void) {
 
 	/* If we didn't detach, allow coredumps */
 	if(!do_detach)
-		sighandlers[3].handler = SIG_DFL;
+		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"),
+			fprintf(stderr, "Installing signal handler for signal %d (%s) failed: %s\n",
 					sighandlers[i].signal, strsignal(sighandlers[i].signal),
 					strerror(errno));
 	}