summaryrefslogtreecommitdiffstats
path: root/etc/inc/vpn.inc
diff options
context:
space:
mode:
authorSeth Mos <seth.mos@xs4all.nl>2007-05-11 07:12:55 +0000
committerSeth Mos <seth.mos@xs4all.nl>2007-05-11 07:12:55 +0000
commit842294f3cc72b4b12c071d37120002b4bc5a85ea (patch)
tree533fbb7e438c9386c082f8e31856f88898b19d83 /etc/inc/vpn.inc
parent8e57ecdf7c0e9e66a860a626a4ddeb73f7c21c96 (diff)
downloadpfsense-842294f3cc72b4b12c071d37120002b4bc5a85ea.zip
pfsense-842294f3cc72b4b12c071d37120002b4bc5a85ea.tar.gz
Do not flush SPA and SPD before starting. It upsets racoon.
Diffstat (limited to 'etc/inc/vpn.inc')
-rw-r--r--etc/inc/vpn.inc9
1 files changed, 5 insertions, 4 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc
index 07711c6..07f4481 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);
OpenPOWER on IntegriCloud