Forward Firewall: convert-dmz now puts converted files into /var/ipfire/forward/confi...

[people/teissler/ipfire-2.x.git] / config / forwardfw / convert-dmz

diff --git a/config/forwardfw/convert-dmz b/config/forwardfw/convert-dmz
index 639cef374dcb1504a3761bb684526d128ee45ad0..0722f5bef4acb23d7cf3f0da6f0897902f251350 100755 (executable)
--- a/config/forwardfw/convert-dmz
+++ b/config/forwardfw/convert-dmz
@@ -19,7 +19,7 @@ my %ifaces=();
 my %configfwdfw=();
 require '/var/ipfire/general-functions.pl';
 my $dmzconfig    = "${General::swroot}/dmzholes/config";
-my $fwdfwconfig   = "${General::swroot}/forward/dmz";
+my $fwdfwconfig   = "${General::swroot}/forward/config";
 my $ifacesettings = "${General::swroot}/ethernet/settings";
 my $field0     = 'ACCEPT';
 my $field1     = 'FORWARDFW';
@@ -49,8 +49,8 @@ sub process_rules{
                my $now=localtime;
                #get values from old configfile
                my ($a,$b,$c,$d,$e,$f,$g,$h) = split (",",$line);
-               $h =~ s/\s//gi;
-               print LOG "$Now Processing A: $a   B: $b   C: $c   D: $d   E: $e   F: $f   G: $g   H: $h\n";
+               $h =~ s/\s*\n//gi;
+               print LOG "$now Processing A: $a   B: $b   C: $c   D: $d   E: $e   F: $f   G: $g   H: $h\n";
                #Now convert values and check ip addresses
                $a=uc($a);
                $e=uc($e);
@@ -99,11 +99,11 @@ sub process_rules{
                                $field5='tgt_addr';
                                $field6=$c;
                        }else{
-                               print LOG "$Now ->NOT Converted, invalid Source IP $b\n\n";
+                               print LOG "$now ->NOT Converted, target ip $c not part of target network $g \n\n";
                                next;
                        }
                }else{
-                       print LOG "$now -> SOURCE IP INVALID. \n\n";
+                       print LOG "$now -> TARGET IP INVALID. \n\n";
                        next;
                }
                $field12=$a;
@@ -111,9 +111,6 @@ sub process_rules{
                $d =~ tr/-/:/;
                $field15=$d;
                $field16=$h;
-               ##Ausgabe
-               #print "A: $a   B: $b   C: $c   D: $d   E: $e   F: $f   G: $g   H: $h\n";
-               #print "0:$field0 1:$field1 2:$field2  3:$field3  4:$field4  5:$field5  6:$field6  11:$field11   12:$field12 13:$field13 14:$field14 15:$field15 16:$field16 26:$field26 27:$field27\n\n\n";
                my $key = &General::findhasharraykey (\%configfwdfw);
                foreach my $i (0 .. 27) { $configfwdfw{$key}[$i] = "";}
                $configfwdfw{$key}[0] = $field0;