diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-03-31 00:27:56 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-03-31 00:27:56 +0000 |
| commit | 3c105468195829b45c2ab08468bf488f0d4725c6 (patch) | |
| tree | ea5b12eb85cdea30e1669aabab5d2ccfcde4bcb4 /etc | |
| parent | 1652e53368069dfae590e8ba4f971bf7f9892bed (diff) | |
| download | pfsense-3c105468195829b45c2ab08468bf488f0d4725c6.zip pfsense-3c105468195829b45c2ab08468bf488f0d4725c6.tar.gz | |
Allow ipsec->ip override for listen interface and spd.conf
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/vpn.inc | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/etc/inc/vpn.inc b/etc/inc/vpn.inc index 43d3c1b..85d7459 100644 --- a/etc/inc/vpn.inc +++ b/etc/inc/vpn.inc @@ -137,6 +137,8 @@ function vpn_ipsec_configure($ipchg = false) { $number_of_gifs = find_last_gif_device(); $number_of_gifs++; $curwanip = get_current_wan_address(); + if($config['ipsec']['ip'] <> "") + $curwanip = $config['ipsec']['ip']; mwexec("/sbin/ifconfig gif" . $number_of_gifs . " tunnel" . $curwanip . " " . $tunnel['remote-gateway']); mwexec("/sbin/ifconfig gif" . $number_of_gifs . " {$lansa}/{$lansn} {$lanip}/32"); } @@ -168,10 +170,10 @@ function vpn_ipsec_configure($ipchg = false) { $racoonconf = ""; - if($config['ipsec']['interface'] <> "") { - if(does_interface_exist($config['ipsec']['interface']) == true) { - $interface_ip = find_interface_ip($config['ipsec']['interface']); - $racoonconf .= <<<EOD + if($config['ipsec']['ip'] <> "") { + + $interface_ip = $config['ipsec']['ip']; + $racoonconf .= <<<EOD listen { isakmp {$interface_ip} [500]; } |
