Tell windows to be patient.

[tinc] / src / process.c

diff --git a/src/process.c b/src/process.c
index 2ec0bcd..3c7164b 100644 (file)
--- 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.62 2003/08/03 12:38:18 guus Exp $
+    $Id: process.c,v 1.1.2.64 2003/08/08 12:55:05 guus Exp $
 */
 
 #include "system.h"
@@ -166,6 +166,7 @@ DWORD WINAPI controlhandler(DWORD request, DWORD type, LPVOID boe, LPVOID bah) {
        }
 
        if(!running) {
+               status.dwWaitHint = 30000; 
                status.dwCurrentState = SERVICE_STOP_PENDING; 
                SetServiceStatus(statushandle, &status);
        }
@@ -184,7 +185,6 @@ VOID WINAPI run_service(DWORD argc, LPTSTR* argv)
        status.dwWin32ExitCode = 0; 
        status.dwServiceSpecificExitCode = 0; 
        status.dwCheckPoint = 0; 
-       status.dwWaitHint = 0; 
 
        statushandle = RegisterServiceCtrlHandlerEx(identname, controlhandler, NULL); 
 
@@ -192,14 +192,17 @@ VOID WINAPI run_service(DWORD argc, LPTSTR* argv)
                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);
@@ -454,13 +457,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;
 }
 
@@ -498,12 +501,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);
@@ -520,7 +525,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;
 }