From 1871cffdc4fe5e6c762a84fc012906abc84807f6 Mon Sep 17 00:00:00 2001 From: Martin Willi Date: Thu, 15 Nov 2007 18:34:05 +0000 Subject: [PATCH] be less agressive, but more verbose in killing charon --- src/starter/invokecharon.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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;