X-Git-Url: https://www.tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fprocess.c;h=babdf43653de17636a30e82de4768f41812b5345;hp=547c51ade101649491fc8a1c630ff0e05f7cb39c;hb=62a7fa9a7bfd1cd1592fd7c381ea28aac0ed7936;hpb=f08fc359a0b7f638e73a8f866119b016b7dff8de

diff --git a/src/process.c b/src/process.c
index 547c51ad..babdf436 100644
--- a/src/process.c
+++ b/src/process.c
@@ -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.61 2003/08/02 20:50:38 guus Exp $
+    $Id: process.c,v 1.1.2.63 2003/08/03 21:45:13 guus Exp $
 */
 
 #include "system.h"
@@ -165,6 +165,11 @@ DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
 			return ERROR_CALL_NOT_IMPLEMENTED;
 	}
 
+	if(!running) {
+		status.dwCurrentState = SERVICE_STOP_PENDING; 
+		SetServiceStatus(statushandle, &status);
+	}
+
 	return NO_ERROR;
 }
 
@@ -175,7 +180,6 @@ VOID WINAPI run_service(DWORD argc, LPTSTR* argv)
 
 
 	status.dwServiceType = SERVICE_WIN32; 
-	status.dwCurrentState = SERVICE_RUNNING; 
 	status.dwControlsAccepted = SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN;
 	status.dwWin32ExitCode = 0; 
 	status.dwServiceSpecificExitCode = 0; 
@@ -188,13 +192,16 @@ VOID WINAPI run_service(DWORD argc, LPTSTR* argv)
 		logger(LOG_ERR, _("System call `%s' failed: %s"), "RegisterServiceCtrlHandlerEx", winerror(GetLastError()));
 		err = 1;
 	} else {
+		status.dwCurrentState = SERVICE_START_PENDING; 
+		SetServiceStatus(statushandle, &status);
+
+		status.dwCurrentState = SERVICE_RUNNING;
 		SetServiceStatus(statushandle, &status);
 
 		err = main2(argc, argv);
 
 		status.dwCurrentState = SERVICE_STOPPED; 
-		status.dwWin32ExitCode = err; 
-
+		//status.dwWin32ExitCode = err; 
 		SetServiceStatus(statushandle, &status);
 	}
 
@@ -447,13 +454,13 @@ bool execute_script(const char *name, char **envp)
 #ifndef HAVE_MINGW
 static RETSIGTYPE sigterm_handler(int a)
 {
-	logger(LOG_NOTICE, _("Got TERM signal"));
+	logger(LOG_NOTICE, _("Got %s signal"), "TERM");
 	running = false;
 }
 
 static RETSIGTYPE sigquit_handler(int a)
 {
-	logger(LOG_NOTICE, _("Got QUIT signal"));
+	logger(LOG_NOTICE, _("Got %s signal"), "QUIT");
 	running = false;
 }
 
@@ -491,12 +498,14 @@ static RETSIGTYPE fatal_signal_handler(int a)
 
 static RETSIGTYPE sighup_handler(int a)
 {
-	logger(LOG_NOTICE, _("Got HUP signal"));
+	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);
@@ -513,7 +522,7 @@ static RETSIGTYPE sigint_handler(int a)
 
 static RETSIGTYPE sigalrm_handler(int a)
 {
-	logger(LOG_NOTICE, _("Got ALRM signal"));
+	logger(LOG_NOTICE, _("Got %s signal"), "ALRM");
 	sigalrm = true;
 }