my %optionsfw=();
my %ifaces=();
-my $VERSION='0.9.9.9';
+my $VERSION='0.9.9.9a';
my $color;
my $confignet = "${General::swroot}/fwhosts/customnetworks";
my $confighost = "${General::swroot}/fwhosts/customhosts";
$errormessage.=$Lang::tr{'fwdfw useless rule'}."<br>";
}
#check if we try to break rules
- if( $fwdfwsettings{$fwdfwsettings{'grp1'}} eq 'IPFire' && $fwdfwsettings{'grp2'} eq 'ipfire'){
+ if( $fwdfwsettings{'grp1'} eq 'ipfire_src' && $fwdfwsettings{'grp2'} eq 'ipfire'){
$errormessage.=$Lang::tr{'fwdfw err same'};
}
#INPUT part
print"<td align='center'>$protz</td>";
@protocols=();
#SOURCE
+ my $ipfireiface;
&getcolor($$hash{$key}[3],$$hash{$key}[4],\%customhost);
print"<td align='center' width='160' $tdcolor>";
+ if ($$hash{$key}[3] eq 'ipfire_src'){
+ $ipfireiface='Interface ';
+ }
if ($$hash{$key}[3] eq 'std_net_src'){
print &get_name($$hash{$key}[4]);
}elsif ($$hash{$key}[3] eq 'src_addr'){
print $$hash{$key}[4];
}
}elsif ($$hash{$key}[4] eq 'RED1'){
- print "$Lang::tr{'fwdfw red'}";
+ print "$ipfireiface $Lang::tr{'fwdfw red'}";
}else{
- print $$hash{$key}[4];
+ print "ipfireiface $$hash{$key}[4]";
}
$tdcolor='';
#SOURCEPORT
}
print"<br>->";
}
+ if ($$hash{$key}[5] eq 'ipfire'){
+ $ipfireiface='Interface';
+ }
if ($$hash{$key}[5] eq 'std_net_tgt' || $$hash{$key}[5] eq 'ipfire' && $$hash{$key}[6] eq 'RED' || $$hash{$key}[6] eq 'RED1' || $$hash{$key}[6] eq 'GREEN' || $$hash{$key}[6] eq 'ORANGE' || $$hash{$key}[6] eq 'BLUE' ){
if ($$hash{$key}[6] eq 'RED1')
{
- print $Lang::tr{'red1'};
+ print "$ipfireiface $Lang::tr{'red1'}";
}else{
print &get_name($$hash{$key}[6]);
}
print $$hash{$key}[6];
}
}else{
- print $$hash{$key}[6];
+ print "$ipfireiface $$hash{$key}[6]";
}
$tdcolor='';
#TARGETPORT