Firewall: When using custom hosts and not having BLUE or ORANGE, the Ruletable took very long to display every Line

With this commit the page is shown quickly because there's now a check
if ORANGE or BLUE exist before we test if a host might be in that
subnet.
This commit is contained in:
Alexander Marx
2014-05-06 12:40:05 +02:00
committed by Michael Tremer
parent b1f6b33992
commit 1be052f995

View File

@@ -1334,7 +1334,7 @@ sub getcolor
return;
}elsif($val =~ /^(.*?)\/(.*?)$/){
my ($sip,$scidr) = split ("/",$val);
if ( &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
if ( &Header::orange_used() && &General::IpInSubnet($sip,$netsettings{'ORANGE_ADDRESS'},$netsettings{'ORANGE_NETMASK'})){
$tdcolor="style='background-color: $Header::colourorange;color:white;'";
return;
}
@@ -1342,7 +1342,7 @@ sub getcolor
$tdcolor="style='background-color: $Header::colourgreen;color:white;'";
return;
}
if ( &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){
if ( &Header::blue_used() && &General::IpInSubnet($sip,$netsettings{'BLUE_ADDRESS'},$netsettings{'BLUE_NETMASK'})){
$tdcolor="style='background-color: $Header::colourblue;color:white;'";
return;
}