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

diff --git a/config/forwardfw/convert-outgoingfw b/config/forwardfw/convert-outgoingfw
index 77f76cb836fe7e692c8eb984742af72e82400267..a230598331c6d96ab83d7adfd31a5267a68dc151 100755 (executable)
--- 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";