diff options
author | Seth Mos <seth.mos@xs4all.nl> | 2007-05-11 07:14:13 +0000 |
---|---|---|
committer | Seth Mos <seth.mos@xs4all.nl> | 2007-05-11 07:14:13 +0000 |
commit | 9a66dfe56a9c24c0b688884206b89d9e8151f1c8 (patch) | |
tree | 75110ef806cffc66717d7420776168d0342b5d74 | |
parent | ceab1c91995aca075cebc45c9cd188fbc5bd2351 (diff) | |
download | pfsense-9a66dfe56a9c24c0b688884206b89d9e8151f1c8.zip pfsense-9a66dfe56a9c24c0b688884206b89d9e8151f1c8.tar.gz |
Do not flush SPA and SPD before starting. It upsets racoon.
-rw-r--r-- | etc/inc/vpn.inc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index a6a3609..16b4bb8 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -561,11 +561,12 @@ EOD; if(is_process_running("racoon")) { /* We are already online, reload */ mwexec("/usr/local/sbin/racoonctl reload-config"); + sleep(1); + exec("/usr/bin/ps auxw | grep \"/usr/local/sbin/[r]acoon\" | awk '{print $2}'", $racoonpid); + if(! empty($racoonpid)) { + mwexec("/usr/bin/kill -HUP $racoonpid[0]"); + } } else { - /* flush SPD and SAD */ - mwexec("/sbin/setkey -FP"); - mwexec("/sbin/setkey -F"); - /* sleep for a bit */ sleep (2); |