From 4333c81e655bd2cbfc5887e526364c12cbb2ea7d Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Mon, 6 Nov 2023 10:37:26 +0100 Subject: [PATCH] Gateways: Single: Migrate to MVC - rework datastorage layer. regression in https://github.com/opnsense/core/commit/ebc8e34b15c86d1ba6a1c3db9488c86438c13e7e --- src/opnsense/mvc/app/models/OPNsense/Routing/Gateways.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/opnsense/mvc/app/models/OPNsense/Routing/Gateways.php b/src/opnsense/mvc/app/models/OPNsense/Routing/Gateways.php index 17f769d9b..72b0ab9cc 100644 --- a/src/opnsense/mvc/app/models/OPNsense/Routing/Gateways.php +++ b/src/opnsense/mvc/app/models/OPNsense/Routing/Gateways.php @@ -58,11 +58,11 @@ class Gateways extends BaseModel $this->validateNameChange($gateway, $messages, $ref); $this->validateDynamicMatch($gateway, $messages, $ref); foreach (['gateway', 'monitor'] as $key) { - if (empty((string)$node->$key) || (string)$node->$key == 'dynamic') { + if (empty((string)$gateway->$key) || (string)$gateway->$key == 'dynamic') { continue; - } elseif ((string)$node->ipprotocol === 'inet' && !Util::isIpv4Address((string)$node->$key)) { + } elseif ((string)$gateway->ipprotocol === 'inet' && !Util::isIpv4Address((string)$gateway->$key)) { $messages->appendMessage(new Message(gettext('Invalid IPv4 address'), $ref . '.' . $tag)); - } elseif ((string)$node->ipprotocol === 'inet6' && !Util::isIpv6Address((string)$node->$key)) { + } elseif ((string)$gateway->ipprotocol === 'inet6' && !Util::isIpv6Address((string)$gateway->$key)) { $messages->appendMessage(new Message(gettext('Invalid IPv6 address'), $ref . '.' . $tag)); } }