diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-10-02 16:41:29 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-10-02 16:41:29 +0000 |
| commit | 1675c73f51501a53bd90d24f2dfaa7793021c81d (patch) | |
| tree | cc2a0aa28b0728eafc5271472f953a6595ca4b3c | |
| parent | 08d38b5aa5490de6b5d660d6a9b176a046c236ca (diff) | |
| download | pfsense-1675c73f51501a53bd90d24f2dfaa7793021c81d.zip pfsense-1675c73f51501a53bd90d24f2dfaa7793021c81d.tar.gz | |
* Extend get_current_wan_address() to accept a interface.
* Use "wan" if no interface supplied
* Pass interface when creating nat port forwards
| -rw-r--r-- | etc/inc/filter.inc | 2 | ||||
| -rw-r--r-- | etc/inc/interfaces.inc | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc index 3f3fcc6..4410b3f 100644 --- a/etc/inc/filter.inc +++ b/etc/inc/filter.inc @@ -547,7 +547,7 @@ function filter_nat_rules_generate() { else $extaddr = $rule['external-address']; else - $extaddr = get_current_wan_address(); + $extaddr = get_current_wan_address($rule['interface']); if (!$rule['interface'] || ($rule['interface'] == "wan")) $natif = $wanif; diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 6db3eaa..5d6362f 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -1208,10 +1208,10 @@ function get_real_wan_interface() { return $wanif; } -function get_current_wan_address() { +function get_current_wan_address($interface = "wan") { global $config, $g; - $wancfg = $config['interfaces']['wan']; + $wancfg = $config['interfaces'][$interface]; if (in_array($wancfg['ipaddr'], array('pppoe','dhcp','pptp','bigpond'))) { /* dynamic WAN IP address, find out which one */ |
