diff options
| author | Chris Buechler <cmb@pfsense.org> | 2010-01-04 20:47:00 -0500 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2010-01-04 20:47:00 -0500 |
| commit | aef123a00e958111285f5196520b2bb3cd860ee7 (patch) | |
| tree | 96aa4da6c5598b392b3fd9fa9ffb8fd8ceb368bb /usr | |
| parent | 11de5c3da250dfd5b8addfdbf0d6df34342a4581 (diff) | |
| download | pfsense-aef123a00e958111285f5196520b2bb3cd860ee7.zip pfsense-aef123a00e958111285f5196520b2bb3cd860ee7.tar.gz | |
fix up auto-generated outbound NAT rules.
Don't wipe out user's configured NAT rules when switching back to automatic.
Diffstat (limited to 'usr')
| -rwxr-xr-x | usr/local/www/firewall_nat_out.php | 19 |
1 files changed, 3 insertions, 16 deletions
diff --git a/usr/local/www/firewall_nat_out.php b/usr/local/www/firewall_nat_out.php index 1e29b0b..61ef7aa 100755 --- a/usr/local/www/firewall_nat_out.php +++ b/usr/local/www/firewall_nat_out.php @@ -79,8 +79,6 @@ if (isset($_POST['save']) && $_POST['save'] == "Save") { case "ipsecpassthru": $config['nat']['ipsecpassthru']['enable'] = true; unset($config['nat']['advancedoutbound']['enable']); - if(count($config['nat']['advancedoutbound']['rule']) > 0) - unset($config['nat']['advancedoutbound']['rule']); break; case "advancedoutboundnat": if (!isset($config['nat']['advancedoutbound']['enable'])) { @@ -104,20 +102,9 @@ if (isset($_POST['save']) && $_POST['save'] == "Save") { continue; $natent = array(); - $natent['nonat'] = true; - $natent['source']['network'] = "any"; - $natent['sourceport'] = ""; - $natent['descr'] = "Auto nonat TFTP proxy created rule for {$ifdesc2}"; - $natent['target'] = "tftp"; - $natent['interface'] = $if2; - $natent['destination']['any'] = true; - $natent['natport'] = ""; - $a_out[] = $natent; - - $natent = array(); $natent['source']['network'] = "{$osn}/{$ossubnet}"; $natent['sourceport'] = "500"; - $natent['descr'] = "Auto NAT-T created rule for {$ifdesc2}"; + $natent['descr'] = "Auto created rule for {$ifdesc} to {$ifdesc2}"; $natent['target'] = ""; $natent['interface'] = $if2; $natent['destination']['any'] = true; @@ -127,7 +114,7 @@ if (isset($_POST['save']) && $_POST['save'] == "Save") { $natent = array(); $natent['source']['network'] = "{$osn}/{$ossubnet}"; $natent['sourceport'] = "5060"; - $natent['descr'] = "Auto NAT-T created rule for {$ifdesc2}"; + $natent['descr'] = "Auto created rule for {$ifdesc} to {$ifdesc2}"; $natent['target'] = ""; $natent['interface'] = $if2; $natent['destination']['any'] = true; @@ -137,7 +124,7 @@ if (isset($_POST['save']) && $_POST['save'] == "Save") { $natent = array(); $natent['source']['network'] = "{$osn}/{$ossubnet}"; $natent['sourceport'] = ""; - $natent['descr'] = "Auto created rule for {$ifdesc2}"; + $natent['descr'] = "Auto created rule for {$ifdesc} to {$ifdesc2}"; $natent['target'] = ""; $natent['interface'] = $if2; $natent['destination']['any'] = true; |
