X-Git-Url: https://tinc-vpn.org/git/browse?a=blobdiff_plain;f=src%2Fprocess.c;h=dcc6cb334a5b764fadb4fc17e97cb45a74c51fe7;hb=f02d3ed3e135b5326003e7f69f8331ff6a3cc219;hp=3071b02a5750d8ba54daf52695677d14fff57d0c;hpb=d798b8b3d832f8c69769e08cfd64a4d8355faf0e;p=tinc

diff --git a/src/process.c b/src/process.c
index 3071b02a..dcc6cb33 100644
--- a/src/process.c
+++ b/src/process.c
@@ -1,7 +1,7 @@
 /*
     process.c -- process management functions
-    Copyright (C) 1999-2003 Ivo Timmermans <ivo@o2w.nl>,
-                  2000-2003 Guus Sliepen <guus@sliepen.eu.org>
+    Copyright (C) 1999-2005 Ivo Timmermans,
+                  2000-2006 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
@@ -17,7 +17,7 @@
     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.59 2003/07/30 21:52:41 guus Exp $
+    $Id$
 */
 
 #include "system.h"
@@ -36,7 +36,6 @@
 
 /* If zero, don't detach from the terminal. */
 bool do_detach = true;
-bool sighup = false;
 bool sigalrm = false;
 
 extern char *identname;
@@ -48,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);
@@ -57,44 +55,180 @@ 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;
+#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) {
+	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()));
+		return false;
+	}
+
+	if(!strchr(program_name, '\\')) {
+		GetCurrentDirectory(sizeof command - 1, command + 1);
+		strncat(command, "\\", sizeof command - strlen(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 - strlen(command));
+		
+		if(space)
+			strncat(command, "\"", sizeof command - strlen(command));
+		
+		strncat(command, *argp, sizeof command - strlen(command));
+
+		if(space)
+			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, NULL, NULL, NULL, NULL, NULL);
+	
+	if(!service) {
+		logger(LOG_ERR, _("Could not create %s service: %s"), identname, winerror(GetLastError()));
+		return false;
+	}
+
+	ChangeServiceConfig2(service, SERVICE_CONFIG_DESCRIPTION, &description);
+
+	logger(LOG_INFO, _("%s service installed"), identname);
+
+	if(!StartService(service, 0, NULL))
+		logger(LOG_WARNING, _("Could not start %s service: %s"), identname, winerror(GetLastError()));
+	else
+		logger(LOG_INFO, _("%s service started"), identname);
+
+	return true;
 }
-#endif
 
-/*
-  Close network connections, and terminate neatly
-*/
-void cleanup_and_exit(int c)
-{
-	cp();
+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;
+	}
 
-	close_network_connections();
+	service = OpenService(manager, identname, SERVICE_ALL_ACCESS);
 
-	ifdebug(CONNECTIONS)
-		dump_device_stats();
+	if(!service) {
+		logger(LOG_ERR, _("Could not open %s service: %s"), identname, winerror(GetLastError()));
+		return false;
+	}
 
-	logger(LOG_NOTICE, _("Terminating"));
+	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);
 
-	closelogger();
-	exit(c);
+	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;
+}
+
+DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
+	switch(request) {
+		case 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");
+			break;
+		default:
+			logger(LOG_WARNING, _("Got unexpected request %d"), request);
+			return ERROR_CALL_NOT_IMPLEMENTED;
+	}
+
+	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) {
+	int err = 1;
+	extern int main2(int argc, char **argv);
+
+
+	status.dwServiceType = SERVICE_WIN32; 
+	status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
+	status.dwWin32ExitCode = 0; 
+	status.dwServiceSpecificExitCode = 0; 
+	status.dwCheckPoint = 0; 
+
+	statushandle = RegisterServiceCtrlHandlerEx(identname, controlhandler, NULL); 
+
+	if (!statushandle) {
+		logger(LOG_ERR, _("System call `%s' failed: %s"), "RegisterServiceCtrlHandlerEx", winerror(GetLastError()));
+		err = 1;
+	} else {
+		status.dwWaitHint = 30000; 
+		status.dwCurrentState = SERVICE_START_PENDING; 
+		SetServiceStatus(statushandle, &status);
+
+		status.dwWaitHint = 0; 
+		status.dwCurrentState = SERVICE_RUNNING;
+		SetServiceStatus(statushandle, &status);
+
+		err = main2(argc, argv);
+
+		status.dwWaitHint = 0;
+		status.dwCurrentState = SERVICE_STOPPED; 
+		//status.dwWin32ExitCode = err; 
+		SetServiceStatus(statushandle, &status);
+	}
+
+	return;
 }
 
+bool init_service(void) {
+	SERVICE_TABLE_ENTRY services[] = {
+		{identname, run_service},
+		{NULL, NULL}
+	};
+
+	if(!StartServiceCtrlDispatcher(services)) {
+		if(GetLastError() == ERROR_FAILED_SERVICE_CONTROLLER_CONNECT) {
+			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)
-{
-	int pid;
+static bool write_pidfile(void) {
+	pid_t pid;
 
 	cp();
 
@@ -102,16 +236,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;
 }
@@ -120,10 +256,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();
 
@@ -151,16 +286,17 @@ bool kill_other(int signal)
 		fprintf(stderr, _("Removing stale lock file.\n"));
 		remove_pid(pidfilename);
 	}
-#endif
 
 	return true;
+#else
+	return remove_service();
+#endif
 }
 
 /*
   Detach from current terminal, write pidfile, kill parent
 */
-bool detach(void)
-{
+bool detach(void) {
 	cp();
 
 	setup_signals();
@@ -170,14 +306,14 @@ bool detach(void)
 #ifndef HAVE_MINGW
 	if(!write_pidfile())
 		return false;
-#endif
 
 	/* If we succeeded in doing that, detach */
 
 	closelogger();
+#endif
 
-#ifdef HAVE_FORK
 	if(do_detach) {
+#ifndef HAVE_MINGW
 		if(daemon(0, 0)) {
 			fprintf(stderr, _("Couldn't detach from terminal: %s"),
 					strerror(errno));
@@ -186,10 +322,15 @@ 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());
 #endif
+	}
 
 	openlogger(identname, use_logfile?LOGMODE_FILE:(do_detach?LOGMODE_SYSLOG:LOGMODE_STDERR));
 
@@ -201,106 +342,81 @@ bool detach(void)
 	return true;
 }
 
-#ifdef HAVE_FORK
-/*
-  Execute the program name, with sane environment.
-*/
-static void _execute_script(const char *scriptname, char **envp)
-	__attribute__ ((__noreturn__));
-static void _execute_script(const char *scriptname, char **envp)
-{
-	int save_errno;
+bool execute_script(const char *name, char **envp) {
+#ifdef HAVE_SYSTEM
+	int status, len;
+	struct stat s;
+	char *scriptname, *p;
+	int i;
 
 	cp();
 
-	while(*envp)
-		putenv(*envp++);
-
-	chdir("/");
+#ifndef HAVE_MINGW
+	len = asprintf(&scriptname, "\"%s/%s\"", confbase, name);
+#else
+	len = asprintf(&scriptname, "\"%s/%s.bat\"", confbase, name);
+#endif
+	if(len < 0)
+		return false;
 
-	closelogger();
+	scriptname[len - 1] = '\0';
 
-	/* Close all file descriptors */
-	fcloseall();
+	/* First check if there is a script */
 
-	execl(scriptname, NULL);
-	/* No return on success */
+	if(stat(scriptname + 1, &s)) {
+		free(scriptname);
+		return true;
+	}
 
-	save_errno = errno;
+	ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
 
-	openlogger(identname, use_logfile?LOGMODE_FILE:(do_detach?LOGMODE_SYSLOG:LOGMODE_STDERR));
-	logger(LOG_ERR, _("Could not execute `%s': %s"), scriptname,
-		   strerror(save_errno));
-	exit(save_errno);
-}
+#ifdef HAVE_PUTENV
+	/* Set environment */
+	
+	for(i = 0; envp[i]; i++)
+		putenv(envp[i]);
 #endif
 
-/*
-  Fork and execute the program pointed to by name.
-*/
-bool execute_script(const char *name, char **envp)
-{
-#ifdef HAVE_FORK
-	pid_t pid;
-	int status;
-	struct stat s;
-	char *scriptname;
+	scriptname[len - 1] = '\"';
+	status = system(scriptname);
 
-	cp();
+	free(scriptname);
 
-	asprintf(&scriptname, "%s/%s", confbase, name);
+	/* Unset environment */
 
-	/* First check if there is a script */
-
-	if(stat(scriptname, &s))
-		return true;
-
-	pid = fork();
-
-	if(pid < 0) {
-		logger(LOG_ERR, _("System call `%s' failed: %s"), "fork",
-			   strerror(errno));
-		return false;
+	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);
+		}
 	}
 
-	if(pid) {
-		ifdebug(STATUS) logger(LOG_INFO, _("Executing script %s"), name);
-
-		free(scriptname);
-
-		if(waitpid(pid, &status, 0) == pid) {
-			if(WIFEXITED(status)) {	/* Child exited by itself */
-				if(WEXITSTATUS(status)) {
-					logger(LOG_ERR, _("Process %d (%s) exited with non-zero status %d"),
-						   pid, name, WEXITSTATUS(status));
-					return false;
-				} else
-					return true;
-			} else if(WIFSIGNALED(status)) {	/* Child was killed by a signal */
-				logger(LOG_ERR, _("Process %d (%s) was killed by signal %d (%s)"), pid,
-					   name, WTERMSIG(status), strsignal(WTERMSIG(status)));
-				return false;
-			} else {			/* Something strange happened */
-				logger(LOG_ERR, _("Process %d (%s) terminated abnormally"), pid,
-					   name);
+#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 (errno != EINTR) {
-			logger(LOG_ERR, _("System call `%s' failed: %s"), "waitpid",
-				   strerror(errno));
+		} 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;
 		}
-
-		/* Why do we get EINTR? */
-		return true;
+	} else {
+		logger(LOG_ERR, _("System call `%s' failed: %s"), "system", strerror(errno));
+		return false;
 	}
-
-	/* Child here */
-
-	_execute_script(scriptname, envp);
-#else
-	return true;
 #endif
+#endif
+	return true;
 }
 
 
@@ -309,29 +425,14 @@ bool execute_script(const char *name, char **envp)
 */
 
 #ifndef HAVE_MINGW
-static RETSIGTYPE sigterm_handler(int a)
-{
-	logger(LOG_NOTICE, _("Got TERM signal"));
-
-	cleanup_and_exit(0);
-}
-
-static RETSIGTYPE sigquit_handler(int a)
-{
-	logger(LOG_NOTICE, _("Got QUIT signal"));
-	cleanup_and_exit(0);
-}
-
-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();
@@ -354,60 +455,12 @@ static RETSIGTYPE fatal_signal_handler(int a)
 	}
 }
 
-static RETSIGTYPE sighup_handler(int a)
-{
-	logger(LOG_NOTICE, _("Got HUP signal"));
-	sighup = true;
-}
-
-static RETSIGTYPE sigint_handler(int a)
-{
-	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 ALRM signal"));
-	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)
-{
+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));
 }
 
@@ -415,25 +468,16 @@ 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
 
-void setup_signals(void)
-{
+void setup_signals(void) {
 #ifndef HAVE_MINGW
 	int i;
 	struct sigaction act;
@@ -455,7 +499,7 @@ 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. */