diff options
| author | Seth Mos <seth.mos@xs4all.nl> | 2008-02-01 21:32:13 +0000 |
|---|---|---|
| committer | Seth Mos <seth.mos@xs4all.nl> | 2008-02-01 21:32:13 +0000 |
| commit | cf7a51617bd4e3ca2e77edcc20ea4b444a2466d8 (patch) | |
| tree | d1df5a3e1755eaf95eaed747b4d50f7c7b6570bb | |
| parent | 008da4cf1dfde46a9a1da0b1149ded8670282b85 (diff) | |
| download | pfsense-cf7a51617bd4e3ca2e77edcc20ea4b444a2466d8.zip pfsense-cf7a51617bd4e3ca2e77edcc20ea4b444a2466d8.tar.gz | |
Update to racoon-0.7-cvs with Timo Teras patches.
Use setkey -f because spd loading works normally now.
| -rw-r--r-- | etc/inc/vpn.inc | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 404d26c..80d084d 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"); } } } |
