be less agressive, but more verbose in killing charon
authorMartin Willi <martin@strongswan.org>
Thu, 15 Nov 2007 18:34:05 +0000 (18:34 -0000)
committerMartin Willi <martin@strongswan.org>
Thu, 15 Nov 2007 18:34:05 +0000 (18:34 -0000)
src/starter/invokecharon.c

index c07de18..3da407d 100644 (file)
@@ -78,9 +78,14 @@ starter_stop_charon (void)
                        kill(pid, SIGINT);
            else if (i < 10)
                        kill(pid, SIGTERM);
+           else if (i == 10)
+           {
+                       kill(pid, SIGKILL);
+                       plog("starter_stop_charon(): charon does not respond, sending KILL");
+           }
            else
                        kill(pid, SIGKILL);
-           usleep(20000);
+           usleep(200000);
        }
        if (_charon_pid == 0)
            return 0;