Skip to content

Commit b824999

Browse files
Fixes call to undeclared function when setting port forward target as an alias
1 parent 3f6beaf commit b824999

3 files changed

Lines changed: 4 additions & 8 deletions

File tree

pfSense-pkg-API/files/etc/inc/api/models/APIFirewallNATPortForwardCreate.inc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,8 @@ class APIFirewallNATPortForwardCreate extends APIModel {
7979
private function __validate_target() {
8080
# Require client to pass in an internal target for the port forward
8181
if (isset($this->initial_data['target'])) {
82-
# Require the target to either be a valid IPv4 or IPv6 address
83-
if (is_ipaddrv4($this->initial_data['target'])) {
84-
$this->validated_data["target"] = $this->initial_data['target'];
85-
} elseif (alias_in_use($this->initial_data['target'])) {
82+
# Require the target to either be a valid IPv4 or alias
83+
if (in_array(is_ipaddroralias($this->initial_data['target']), [4, true])) {
8684
$this->validated_data["target"] = $this->initial_data['target'];
8785
} else {
8886
$this->errors[] = APIResponse\get(4009);

pfSense-pkg-API/files/etc/inc/api/models/APIFirewallNATPortForwardUpdate.inc

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,8 @@ class APIFirewallNATPortForwardUpdate extends APIModel {
101101
private function __validate_target() {
102102
# Optionally allow client to update internal target for the port forward
103103
if (isset($this->initial_data['target'])) {
104-
# Require the target to either be a valid IPv4 or IPv6 address
105-
if (is_ipaddrv4($this->initial_data['target'])) {
106-
$this->validated_data["target"] = $this->initial_data['target'];
107-
} elseif (alias_in_use($this->initial_data['target'])) {
104+
# Require the target to either be a valid IPv4 or alias
105+
if (in_array(is_ipaddroralias($this->initial_data['target']), [4, true])) {
108106
$this->validated_data["target"] = $this->initial_data['target'];
109107
} else {
110108
$this->errors[] = APIResponse\get(4009);
6.76 KB
Binary file not shown.

0 commit comments

Comments
 (0)