upstream/opnsense-core
1
0
Fork 0
mirror of https://github.com/opnsense/core.git synced 2026-02-03 20:39:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0df992200c into a5fed616a5

Browse source
This commit is contained in:
Steve Kerrison 2026-02-01 20:53:22 +01:00 committed by GitHub
commit cc452a494d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/opnsense/mvc/app/library/OPNsense/Firewall/SNatRule.php
View file

@ -91,12 +91,16 @@ class SNatRule extends Rule
$this->log('SNAT / pool type not round-robin');
$rule['disabled'] = true;
}
} elseif (preg_match("/^(wan|lan|opt[0-9]+)ip$/", $rule['target'], $matches)) {
} elseif (preg_match("/^(wan|lan|opt[0-9]+)(ip)?$/", $rule['target'], $matches)) {
if (empty($this->interfaceMapping["{$matches[1]}"])) {
$this->log("SNAT / target missing");
$rule['disabled'] = true;
} else {
} elseif (count($matches) == 3) {
// interface was suffixed by "ip", use its primary address
$rule['target'] = "({$this->interfaceMapping["{$matches[1]}"]['if']}:0)";
} else {
// network is possible here also, but only without aliases
$rule['target'] = "({$this->interfaceMapping["{$matches[1]}"]['if']}:network:0)";
}
}
foreach (array("sourceport", "dstport", "natport") as $fieldname) {

1
src/www/firewall_nat_out_edit.php
View file

@ -40,6 +40,7 @@ function formTranslateAddresses() {
// add this hosts ips
foreach (legacy_config_get_interfaces(array('virtual' => false, "enable" => true)) as $intf => $intfdata) {
$retval[$intf] = (!empty($intfdata['descr']) ? $intfdata['descr'] : $intf ) . " " . gettext("net");
$retval[$intf."ip"] = (!empty($intfdata['descr']) ? $intfdata['descr'] : $intf ) . " " . gettext("address");
}