diff options
| author | Seth Mos <seth.mos@xs4all.nl> | 2008-02-01 21:34:57 +0000 |
|---|---|---|
| committer | Seth Mos <seth.mos@xs4all.nl> | 2008-02-01 21:34:57 +0000 |
| commit | 448f4e112882bfad248af442766ad1f8654f61b3 (patch) | |
| tree | d4704a35acbb70e7b878089e66ce2416f74f00c1 /etc | |
| parent | c3b8a58d04c0c0def73e300d86be1e9edf105682 (diff) | |
| download | pfsense-448f4e112882bfad248af442766ad1f8654f61b3.zip pfsense-448f4e112882bfad248af442766ad1f8654f61b3.tar.gz | |
Update to racoon-0.7-cvs with Timo Teras patches.
Use setkey -f because spd loading works normally now.
Diffstat (limited to 'etc')
| -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 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) { |
