diff options
| author | Vinicius Coque <vinicius.coque@bluepex.com> | 2010-07-26 16:17:16 -0300 |
|---|---|---|
| committer | Vinicius Coque <vinicius.coque@bluepex.com> | 2010-07-26 16:17:16 -0300 |
| commit | d9a0c4b8e86b193821b67783982e66370b399629 (patch) | |
| tree | a38c6290dbdd9854c57f73dd001d1e9901a53d1e /etc/inc/vpn.inc | |
| parent | 188097024801509c431899e7d9d4382e0a05b204 (diff) | |
| parent | 4cb9abc3dc4b1faf42f4f8607772f9b652341209 (diff) | |
| download | pfsense-d9a0c4b8e86b193821b67783982e66370b399629.zip pfsense-d9a0c4b8e86b193821b67783982e66370b399629.tar.gz | |
Merge remote branch 'mainline/master'
Conflicts:
usr/local/www/services_rfc2136.php
usr/local/www/services_snmp.php
usr/local/www/status_rrd_graph.php
usr/local/www/status_rrd_graph_settings.php
Diffstat (limited to 'etc/inc/vpn.inc')
| -rw-r--r-- | etc/inc/vpn.inc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 8a2bb85..68e1064 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -103,21 +103,21 @@ function vpn_ipsec_configure($ipchg = false) if (!isset($ipseccfg['enable'])) { mwexec("/sbin/ifconfig enc0 down"); + /* send a SIGKILL to be sure */ + sigkillbypid("{$g['varrun_path']}/racoon.pid", "KILL"); + /* kill racoon */ if(is_process_running("racoon")) mwexec("/usr/bin/killall racoon", true); killbypid("{$g['varrun_path']}/dnswatch-ipsec.pid"); - + /* wait for racoon process to die */ sleep(2); - /* send a SIGKILL to be sure */ - sigkillbypid("{$g['varrun_path']}/racoon.pid", "KILL"); - /* flush SPD and SAD */ - mwexec("/usr/local/sbin/setkey -FP"); mwexec("/usr/local/sbin/setkey -F"); - + mwexec("/usr/local/sbin/setkey -FP"); + /* disallow IPSEC, it is off */ // exec("/sbin/sysctl net.inet.ip.ipsec_in_use=0"); @@ -162,7 +162,7 @@ function vpn_ipsec_configure($ipchg = false) $rg = $ph1ent['remote-gateway']; if (!is_ipaddr($rg)) { - $dnswatch_list[] = $rg; + $dnswatch_list[] = "{$rg} = value"; add_hostname_to_watch($rg); $rg = resolve_retry($rg); if (!$rg) |
