From 448f4e112882bfad248af442766ad1f8654f61b3 Mon Sep 17 00:00:00 2001 From: Seth Mos Date: Fri, 1 Feb 2008 21:34:57 +0000 Subject: 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(-) (limited to 'etc') diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 335e116..61ad7d6 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -613,26 +613,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"); /* start dnswatch, if necessary */ if (count($dnswatch_list) > 0) { -- cgit v1.1