diff options
| author | Renato Botelho <renato.botelho@bluepex.com> | 2010-04-12 11:10:04 -0300 |
|---|---|---|
| committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-04-12 11:10:04 -0300 |
| commit | 93e485e3c6d1e304bba7108e62bce897cb1a15d0 (patch) | |
| tree | 98f6d7eb9ad070247dddc485b0d56ec55039eb24 | |
| parent | b52d3aa509a54854a0fccd7685f4db12ad5fc15f (diff) | |
| download | pfsense-93e485e3c6d1e304bba7108e62bce897cb1a15d0.zip pfsense-93e485e3c6d1e304bba7108e62bce897cb1a15d0.tar.gz | |
Teach more code to deal with new NAT Port Forwarding xml tags
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 4 | ||||
| -rwxr-xr-x | usr/local/www/firewall_virtual_ip.php | 4 | ||||
| -rwxr-xr-x | usr/local/www/firewall_virtual_ip_edit.php | 4 |
3 files changed, 7 insertions, 5 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index dd7c4de..de702dd 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -291,7 +291,9 @@ function is_alias_inuse($alias) { foreach($config['nat']['rule'] as $rule) { if($rule['target'] == $alias) return true; - if($rule['external-address'] == $alias) + if($rule['source']['address'] == $alias) + return true; + if($rule['destination']['address'] == $alias) return true; } return false; diff --git a/usr/local/www/firewall_virtual_ip.php b/usr/local/www/firewall_virtual_ip.php index 6cd8879..c44c5ef 100755 --- a/usr/local/www/firewall_virtual_ip.php +++ b/usr/local/www/firewall_virtual_ip.php @@ -94,8 +94,8 @@ if ($_GET['act'] == "del") { /* make sure no inbound NAT mappings reference this entry */ if (is_array($config['nat']['rule'])) { foreach ($config['nat']['rule'] as $rule) { - if($rule['external-address'] <> "") { - if ($rule['external-address'] == $a_vip[$_GET['id']]['ipaddr']) { + if($rule['destination']['address'] <> "") { + if ($rule['destination']['address'] == $a_vip[$_GET['id']]['ipaddr']) { $input_errors[] = "This entry cannot be deleted because it is still referenced by at least one NAT mapping."; break; } diff --git a/usr/local/www/firewall_virtual_ip_edit.php b/usr/local/www/firewall_virtual_ip_edit.php index 4b99f3f..83d9d9a 100755 --- a/usr/local/www/firewall_virtual_ip_edit.php +++ b/usr/local/www/firewall_virtual_ip_edit.php @@ -216,8 +216,8 @@ if ($_POST) { interface_vip_bring_down($a_vip[$id]); /* modify all virtual IP rules with this address */ for ($i = 0; isset($config['nat']['rule'][$i]); $i++) { - if ($config['nat']['rule'][$i]['external-address'] == $a_vip[$id]['subnet']) - $config['nat']['rule'][$i]['external-address'] = $vipent['subnet']; + if ($config['nat']['rule'][$i]['destination']['address'] == $a_vip[$id]['subnet']) + $config['nat']['rule'][$i]['destination']['address'] = $vipent['subnet']; } $a_vip[$id] = $vipent; } else |
