diff options
| author | Rene Mayrhofer <rene@mayrhofer.eu.org> | 2008-02-07 13:56:17 +0000 |
|---|---|---|
| committer | Rene Mayrhofer <rene@mayrhofer.eu.org> | 2008-02-07 13:56:17 +0000 |
| commit | bcc8f7ca7fd8e8ff6e8a4d579251458313133598 (patch) | |
| tree | a86b42b486c954937b32ffeaaa725804cb1458ec /src/starter/invokecharon.c | |
| parent | 49104abddf3d71d5abf5cf75dc7f95fa6c55fa63 (diff) | |
| download | vyos-strongswan-bcc8f7ca7fd8e8ff6e8a4d579251458313133598.tar.gz vyos-strongswan-bcc8f7ca7fd8e8ff6e8a4d579251458313133598.zip | |
[svn-upgrade] Integrating new upstream version, strongswan (4.1.10)
Diffstat (limited to 'src/starter/invokecharon.c')
| -rw-r--r-- | src/starter/invokecharon.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/starter/invokecharon.c b/src/starter/invokecharon.c index 1cb0dfb63..111bb9c6f 100644 --- a/src/starter/invokecharon.c +++ b/src/starter/invokecharon.c @@ -14,7 +14,7 @@ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. * - * RCSID $Id: invokecharon.c 3267 2007-10-08 19:57:54Z andreas $ + * RCSID $Id: invokecharon.c 3344 2007-11-15 18:34:05Z martin $ */ #include <sys/types.h> @@ -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; |