lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 00:54:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

firewall/nat, regression in forward. https://github.com/opnsense/core/issues/1326

Browse Source
This commit is contained in:
Ad Schellevis 2017-12-22 20:59:53 +01:00
parent 8ed255c696
commit 687e71dc3d
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/opnsense/mvc/app/library/OPNsense/Firewall/NatRule.php
View File

@ -60,7 +60,7 @@ class NatRule extends Rule
'interface' => 'parseInterface',
'protocol' => 'parseReplaceSimple,tcp/udp:{tcp udp},proto ',
'interface.from' => 'parseInterface, from ,:network',
'target.to' => 'parsePlainCurly,to ',
'localport' => 'parsePlainCurly,to ',
'interface.to' => 'parseInterface, -> ',
'staticnatport' => 'parseBool, static-port , port 1024:65535 '
)
@ -168,11 +168,12 @@ class NatRule extends Rule
$tmp2['rule_types'][] = "rdr_nat";
$tmp2['staticnatport'] = !empty($tmp['staticnatport']);
$result[] = $tmp2;
} else {
$result[] = $tmp;
}
$result[] = $tmp;
// When reflection is enabled our ruleset should cover all
if (!$tmp['disabled'] && in_array($this->rule['natreflection'], array("purenat", "enable"))) {
if (!$tmp['disabled'] && in_array($tmp['natreflection'], array("purenat", "enable"))) {
foreach ($this->reflectionInterfaces($interface) as $refl_interf) {
$tmp['interface'] = $refl_interf;
$result[] = $tmp;

2
src/opnsense/mvc/app/library/OPNsense/Firewall/Plugin.php
View File

@ -56,7 +56,7 @@ class Plugin
if (!empty(Config::getInstance()->object()->system->skip_rules_gw_down)) {
$this->systemDefaults['skip_rules_gw_down'] = true;
}
if (!empty(Config::getInstance()->object()->system->disablenatreflection)) {
if (empty(Config::getInstance()->object()->system->disablenatreflection)) {
$this->systemDefaults['natreflection'] = "enable";
}
if (!empty(Config::getInstance()->object()->system->enablenatreflectionhelper)) {