From 153e7bc9515f0fe4a79d6cb061245eb36d74c210 Mon Sep 17 00:00:00 2001 From: Ad Schellevis Date: Wed, 1 Jun 2016 11:56:56 +0200 Subject: [PATCH] refactor is_specialnet(), interface administration contains all now --- src/www/guiconfig.inc | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/www/guiconfig.inc b/src/www/guiconfig.inc index 56d5457ea..d9cd38ab7 100644 --- a/src/www/guiconfig.inc +++ b/src/www/guiconfig.inc @@ -554,16 +554,16 @@ function pconfig_to_address(&$adr, $padr, $pmask, $pnot=false, $pbeginport=0, $p function is_specialnet($net) { - global $specialsrcdst; - - if (!$net) { - return false; - } - if (is_array($specialsrcdst) && in_array($net, $specialsrcdst)) { + if (in_array($net, array('any','(self)'))) { return true; } else { - return false; + foreach (legacy_config_get_interfaces(array("enable" => true)) as $ifent => $ifdetail) { + if ($ifent == $net || (!isset($ifdetail['virtual']) && $ifent."ip" == $net)) { + return true; + } + } } + return false; }