* Hide interfaces internals to other code and use the propper interfaces.

  Basically use get_interface*() functions instead of accessing fields like 'ipaddr'/'descr' etc...
* Make get_interfaces_with_gateway less heavyweight by getting information from the configuration stored in config.xml
* Some other missed custom interface list building and substituing with propper get_configured_interface*()
NOTE: This should give indipendce on dynamic interfaces on some services that before could not be used on top of this type of interfaces.

1 files changed, 4 insertions, 5 deletions

diff --git a/usr/local/www/firewall_virtual_ip_edit.php b/usr/local/www/firewall_virtual_ip_edit.php
index 52029b5..d6d82b8 100755
--- a/usr/local/www/firewall_virtual_ip_edit.php
+++ b/usr/local/www/firewall_virtual_ip_edit.php
@@ -88,11 +88,10 @@ if ($_POST) {
 	if (($_POST['subnet'] && !is_ipaddr($_POST['subnet'])))
 		$input_errors[] = "A valid IP address must be specified.";
 
-	if ($_POST['ipaddr'] == $config['interfaces']['wan']['ipaddr'])
-		$input_errors[] = "The WAN IP address may not be used in a virtual entry.";
-
-	if ($_POST['ipaddr'] == $config['interfaces']['lan']['ipaddr'])
-		$input_errors[] = "The LAN IP address may not be used in a virtual entry.";
+	$natiflist = get_configured_interface_with_descr();
+	foreach ($natiflist as $natif => $natdescr)
+		if ($_POST['ipaddr'] == get_interface_ip($natif))
+			$input_errors[] = "The {$natdescr} IP address may not be used in a virtual entry.";
 
 	if($_POST['subnet_bits'] == "32" and $_POST['type'] == "carp")
 	 	$input_errors[] = "The /32 subnet mask is invalid for CARP IPs.";