From: Michael Tremer <michael.tremer@ipfire.org>
Date: Thu, 27 Feb 2014 18:39:18 +0000 (+0100)
Subject: QoS: Actually accept subnets everywhere.
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=5a7491ffd6023019d605aa773c1f6d8e3fb2ff17;hp=5eee5a607e213c25b350926c5234d2230cfc6e29

QoS: Actually accept subnets everywhere.
---

diff --git a/html/cgi-bin/qos.cgi b/html/cgi-bin/qos.cgi
index 6d4d025bf..5542f6530 100644
--- a/html/cgi-bin/qos.cgi
+++ b/html/cgi-bin/qos.cgi
@@ -251,29 +251,15 @@ END
 if ($qossettings{'DOLEVEL7'} eq $Lang::tr{'save'})
 {
 	if ( $qossettings{'QIP'} ne '' ) {
-		if ($qossettings{'QIP'} =~ /^(.*?)\/(.*?)$/){
-			if (! &General::validipandmask($qossettings{'QIP'}) ) {
-				$qossettings{'VALID'} = 'no';
-				$message = $Lang::tr{'The source IP address is invalid.'};
-			}
-		}else{
-			if ( &General::validip($qossettings{'QIP'}) ) {
-				$qossettings{'VALID'} = 'no';
-				$message = $Lang::tr{'The source IP address is invalid.'};
-			}
+		if ((!&General::validipandmask($qossettings{'QIP'})) && (!&General::validip($qossettings{'QIP'}))) {
+			$qossettings{'VALID'} = 'no';
+			$message = $Lang::tr{'The source IP address is invalid.'};
 		}
 	}
 	if ( $qossettings{'DIP'} ne '' ) {
-		if ($qossettings{'QIP'} =~ /^(.*?)\/(.*?)$/){
-			if ( &General::validipandmask($qossettings{'DIP'}) ) {
-				$qossettings{'VALID'} = 'no';
-				$message = $Lang::tr{'The destination IP address is invalid.'};
-			}
-		}else{
-			if ( &General::validip($qossettings{'DIP'}) ) {
-				$qossettings{'VALID'} = 'no';
-				$message = $Lang::tr{'The destination IP address is invalid.'};
-			}
+		if ((!&General::validipandmask($qossettings{'DIP'})) && (!&General::validip($qossettings{'DIP'}))) {
+			$qossettings{'VALID'} = 'no';
+			$message = $Lang::tr{'The destination IP address is invalid.'};
 		}
 	}
 	if ($qossettings{'CLASS'} >= 100 && $qossettings{'CLASS'} < 121) {
@@ -340,15 +326,15 @@ END
 if ($qossettings{'DOPORT'} eq $Lang::tr{'save'})
 {
 	if ( $qossettings{'QIP'} ne '' ) {
-		unless ( &General::validip($qossettings{'QIP'}) ) {
+		if ((!&General::validipandmask($qossettings{'QIP'})) && (!&General::validip($qossettings{'QIP'}))) {
 			$qossettings{'VALID'} = 'no';
-			$message = "$Lang::tr{'The source IP address is invalid.'}";
+			$message = $Lang::tr{'The source IP address is invalid.'};
 		}
 	}
 	if ( $qossettings{'DIP'} ne '' ) {
-		unless ( &General::validip($qossettings{'DIP'}) ) {
+		if ((!&General::validipandmask($qossettings{'DIP'})) && (!&General::validip($qossettings{'DIP'}))) {
 			$qossettings{'VALID'} = 'no';
-			$message = "$Lang::tr{'The destination IP address is invalid.'}";
+			$message = $Lang::tr{'The destination IP address is invalid.'};
 		}
 	}
 	if ($qossettings{'CLASS'} >= 100 && $qossettings{'CLASS'} < 121) {