mirror of
https://github.com/vincentmli/bpfire.git
synced 2026-04-26 19:00:34 +02:00
Merge remote-tracking branch 'amarx/firewall-dnat' into next
Conflicts: config/firewall/rules.pl
This commit is contained in:
@@ -1644,7 +1644,10 @@ sub getcolor
|
||||
$tdcolor="<font style='color: $Header::colourblue;'>$c</font>";
|
||||
return $tdcolor;
|
||||
}
|
||||
|
||||
if ("$sip/$scidr" eq "0.0.0.0/0"){
|
||||
$tdcolor="<font style='color: $Header::colourred;'>$c</font>";
|
||||
return $tdcolor;
|
||||
}
|
||||
#Check if IP is part of OpenVPN N2N subnet
|
||||
foreach my $key (sort keys %ccdhost){
|
||||
if ($ccdhost{$key}[3] eq 'net'){
|
||||
@@ -2501,6 +2504,9 @@ sub getipforgroup
|
||||
&General::readhash("${General::swroot}/vpn/settings",\%hash);
|
||||
return $hash{'RW_NET'};
|
||||
}
|
||||
if ($name eq 'RED'){
|
||||
return "0.0.0.0/0";
|
||||
}
|
||||
}
|
||||
}
|
||||
sub decrease
|
||||
|
||||
Reference in New Issue
Block a user