mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

revert last commit, it breaks non-advanced outbound NAT

Browse Source
This commit is contained in:
Bill Marquette 2005-02-20 07:58:23 +00:00
parent da6dab7d07
commit 78c80bbc25
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
etc/inc/filter.inc
View File

@ -640,13 +640,13 @@ function filter_flush_state_table() {
function filter_nat_rules_generate_if($if, $src, $dst, $target) {
global $config;
if ($target)
$tgt = $target . "/32";
else
$tgt = "($if)";
if ($target)
$tgt = $target . "/32";
else
$tgt = "0/32";
$natrule = <<<EOD
nat on $if $src $dst -> $tgt
nat on $if from $src to any -> ($if)
EOD;
return $natrule;
@ -724,17 +724,17 @@ function filter_nat_rules_generate() {
/* advanced outbound rules */
if (is_array($config['nat']['advancedoutbound']['rule'])) {
foreach ($config['nat']['advancedoutbound']['rule'] as $obent) {
$dst = "to any";
$src = "from ";
$dst = "";
$src = "";
if (!isset($obent['destination']['any'])) {
$src = "from ";
if (isset($obent['destination']['not']))
$dst = "to !";
$dst = "! to ";
else
$dst = "to ";
$dst .= $obent['destination']['network'];
}
$src .= $obent['source']['network'];
$dst .= $obent['destination']['network'];
if (!$obent['interface'] || ($obent['interface'] == "wan"))
$natif = $wanif;