From cf7a51617bd4e3ca2e77edcc20ea4b444a2466d8 Mon Sep 17 00:00:00 2001 From: Seth Mos Date: Fri, 1 Feb 2008 21:32:13 +0000 Subject: [PATCH] Update to racoon-0.7-cvs with Timo Teras patches. Use setkey -f because spd loading works normally now. --- etc/inc/vpn.inc | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 404d26c447..80d084d774 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -573,26 +573,16 @@ EOD; /* flush SPD entries */ mwexec("/sbin/setkey -FP"); mwexec("/sbin/setkey -F"); - $i = 0; - while($i < 4) { - /* load SPD */ - mwexec("/bin/cat {$g['varetc_path']}/spd.conf | /usr/local/bin/slowdownpipe.sh | /sbin/setkey -c"); - sleep(2); - $i++; - } + /* load SPD */ + mwexec("/sbin/setkey -f {$g['varetc_path']}/spd.conf"); } else { /* start racoon */ mwexec("/usr/local/sbin/racoon -f {$g['varetc_path']}/racoon.conf"); /* flush SA + SPD entries */ mwexec("/sbin/setkey -FP"); mwexec("/sbin/setkey -F"); - $i = 0; - while($i < 4) { - /* load SPD */ - mwexec("/bin/cat {$g['varetc_path']}/spd.conf | /usr/local/bin/slowdownpipe.sh | /sbin/setkey -c"); - sleep(2); - $i++; - } + /* load SPD */ + mwexec("/sbin/setkey -f {$g['varetc_path']}/spd.conf"); } } }