webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-28 11:43:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Forward Firewall: bugfix: network ip was treated like single host

Browse Source
This commit is contained in:
Alexander Marx
2013-01-26 19:49:24 +01:00
committed by Michael Tremer
parent f1ec713da7
commit e3afaf8890
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
config/forwardfw/convert-outgoingfw
View File

@@ -54,6 +54,7 @@ sub process_groups
$ip =~ s/\s//gi; $ip =~ s/\s//gi;
print LOG "Check IP $ip from Group $group "; print LOG "Check IP $ip from Group $group ";
my $val=&check_ip($ip); my $val=&check_ip($ip);
print "ALARM IP ist nun: $val"; ############################
if($val){ if($val){
push(@hostarray,$val.",ip"); push(@hostarray,$val.",ip");
print LOG "-> OK\n"; print LOG "-> OK\n";
@@ -101,13 +102,16 @@ sub check_ip
{ {
my $adr=shift; my $adr=shift;
my $a; my $a;
print "habe bekommen: $adr\n";#########################################
#ip with subnet in decimal #ip with subnet in decimal
if($adr =~ m/^(\d\d?\d?).(\d\d?\d?).(\d\d?\d?).(\d\d?\d?)\/(\d{1,2})$/){ if($adr =~ m/^(\d\d?\d?).(\d\d?\d?).(\d\d?\d?).(\d\d?\d?)\/(\d{1,2})$/){
print "Bin drin, erkannt: cidr\n";################################
$adr=int($1).".".int($2).".".int($3).".".int($4); $adr=int($1).".".int($2).".".int($3).".".int($4);
my $b = &General::iporsubtodec($5); my $b = &General::iporsubtodec($5);
$a=$adr."/".$b; $a=$adr."/".$b;
} }elsif($adr =~ /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/){
if($adr =~ /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/){ print "Hm erkannt ip ohne subnetz, ersetze es\n";#################
$adr=int($1).".".int($2).".".int($3).".".int($4); $adr=int($1).".".int($2).".".int($3).".".int($4);
if(&General::validip($adr)){ if(&General::validip($adr)){
$a=$adr."/255.255.255.255"; $a=$adr."/255.255.255.255";