aboutsummaryrefslogtreecommitdiffstats
path: root/src/starter
diff options
context:
space:
mode:
authorMartin Willi <martin@strongswan.org>2007-11-15 18:34:05 +0000
committerMartin Willi <martin@strongswan.org>2007-11-15 18:34:05 +0000
commit1871cffdc4fe5e6c762a84fc012906abc84807f6 (patch)
tree93113519114bf692c92151ad9a092ec98afbf233 /src/starter
parent73294df5472894dfc6c37caa6ceb648525ce08bb (diff)
downloadstrongswan-1871cffdc4fe5e6c762a84fc012906abc84807f6.tar.bz2
strongswan-1871cffdc4fe5e6c762a84fc012906abc84807f6.tar.xz
be less agressive, but more verbose in killing charon
Diffstat (limited to 'src/starter')
-rw-r--r--src/starter/invokecharon.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/starter/invokecharon.c b/src/starter/invokecharon.c
index c07de182e..3da407d50 100644
--- a/src/starter/invokecharon.c
+++ b/src/starter/invokecharon.c
@@ -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;