";
}
- if ($show eq '1'){$show='';print"";}
#IPsec networks
+ my @IPSEC_N2N=();
foreach my $key (sort { ncmp($ipsecconf{$a}[0],$ipsecconf{$b}[0]) } keys %ipsecconf) {
if ($ipsecconf{$key}[3] eq 'net'){
- print<
- "
+ "
END
- $show='1';
- print"";
+ foreach(@IPSEC_N2N){
+ print"";
}
}
- if ($show eq '1'){$show='';print"
";}
+ print"";
print"";
print"";
print"
";
@@ -1478,9 +1499,28 @@ END
print<
+
+
+
+ $Lang::tr{'remark'}:
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
END
}
if($fwhostsettings{'updatesrvgrp'} eq 'on'){
@@ -1583,6 +1623,7 @@ sub getcolor
my $c=shift;
my $sip;
my $scidr;
+ my $tdcolor='';
#Check if MAC
if (&General::validmac($c)){ return $c;}
@@ -1647,10 +1688,13 @@ sub getcolor
#Check if IP is part of a IPsec N2N network
foreach my $key (sort keys %ipsecconf){
- my ($a,$b) = split("/",$ipsecconf{$key}[11]);
- if (&General::IpInSubnet($sip,$a,$b)){
- $tdcolor="$c";
- return $tdcolor;
+ if ($ipsecconf{$key}[11]){
+ my ($a,$b) = split("/",$ipsecconf{$key}[11]);
+ $b=&General::iporsubtodec($b);
+ if (&General::IpInSubnet($sip,$a,$b)){
+ $tdcolor="$c";
+ return $tdcolor;
+ }
}
}
return "$c";
@@ -1802,7 +1846,7 @@ sub viewtablegrp
print "
$Lang::tr{'fwhost deleted'}
$customgrp{$key}[3]
";
}else{
my ($colip,$colsub) = split("/",$ip);
- $ip="$colip/".&General::subtocidr($colsub) if ($colsub);
+ $ip="$colip/".&General::iporsubtocidr($colsub) if ($colsub);
print"
".&getcolor($ip)."
$customgrp{$key}[3]
";
}
if ($delflag > 0 && $ip ne ''){
@@ -2014,7 +2058,7 @@ sub checkname
}
sub checkgroup
{
- &General::readhasharray("$configsrvgrp", \%customservicegrp );
+ &General::readhasharray("$configgrp", \%customgrp );
my $name=shift;
foreach my $key (keys %customservicegrp) {
if($customservicegrp{$key}[0] eq $name){