Forward Firewall: some typos in dmz-converter

This commit is contained in:
Alexander Marx
2013-04-02 08:43:18 +02:00
committed by Michael Tremer
parent a60dbb4b6a
commit f7e649ddfb
2 changed files with 8 additions and 8 deletions

View File

@@ -66,9 +66,9 @@ elsif ($ARGV[0] eq 'restore') {
system("/usr/sbin/ovpn-ccd-convert");
#OUTGOINGFW CONVERTER
if( -d "${General::swroot}/outgoing"){
if( -f "${General::swroot}/forward/config" ){
if( -f "${General::swroot}/forward/config" ){
unlink("${General::swroot}/forward/config");
system("touch ${General::swroot}/forward/config");
system("touch ${General::swroot}/forward/config");
chown 99,99,"${General::swroot}/forward/config";
}
if( -f "${General::swroot}/forward/outgoing" ){
@@ -99,7 +99,7 @@ elsif ($ARGV[0] eq 'restore') {
rmtree("${General::swroot}/xtaccess");
}
#DMZ-HOLES CONVERTER
if( -d "${General::swroot}/dmz-holes"){
if( -d "${General::swroot}/dmzholes"){
if( -f "${General::swroot}/forward/dmz" ){
unlink("${General::swroot}/forward/dmz");
system("touch ${General::swroot}/forward/dmz");
@@ -107,7 +107,7 @@ elsif ($ARGV[0] eq 'restore') {
}
#START CONVERTER "DMZ-HOLES"
system("/usr/sbin/convert-dmz");
rmtree("${General::swroot}/xtaccess");
rmtree("${General::swroot}/dmzholes");
}
#PORTFORWARD CONVERTER
if( -d "${General::swroot}/portfw"){

View File

@@ -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;