From e3afaf8890558beb5e399efe2f8fa6cbd9123b91 Mon Sep 17 00:00:00 2001 From: Alexander Marx Date: Sat, 26 Jan 2013 19:49:24 +0100 Subject: [PATCH] Forward Firewall: bugfix: network ip was treated like single host --- config/forwardfw/convert-outgoingfw | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/config/forwardfw/convert-outgoingfw b/config/forwardfw/convert-outgoingfw index 77f76cb83..a23059833 100755 --- a/config/forwardfw/convert-outgoingfw +++ b/config/forwardfw/convert-outgoingfw @@ -54,6 +54,7 @@ sub process_groups $ip =~ s/\s//gi; print LOG "Check IP $ip from Group $group "; my $val=&check_ip($ip); + print "ALARM IP ist nun: $val"; ############################ if($val){ push(@hostarray,$val.",ip"); print LOG "-> OK\n"; @@ -101,13 +102,16 @@ sub check_ip { my $adr=shift; my $a; + + print "habe bekommen: $adr\n";######################################### #ip with subnet in decimal 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); my $b = &General::iporsubtodec($5); $a=$adr."/".$b; - } - if($adr =~ /^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/){ + }elsif($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); if(&General::validip($adr)){ $a=$adr."/255.255.255.255"; -- 2.39.2