X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=blobdiff_plain;f=config%2Fforwardfw%2Frules.pl;h=9f9f7e9919d118b204bd73c427b6d4a4b431bf27;hp=12397037e9f34099c89444b18220e290ceb62c7e;hb=ff4770c79ba800a03fea65ffd5153f75e63cf2b8;hpb=05d4f131e9f96a27249f1e833923ba2790dbd49a diff --git a/config/forwardfw/rules.pl b/config/forwardfw/rules.pl index 12397037e..9f9f7e991 100755 --- a/config/forwardfw/rules.pl +++ b/config/forwardfw/rules.pl @@ -179,7 +179,7 @@ sub buildrules my $nat; my $fwaccessdport; foreach my $key (sort {$a <=> $b} keys %$hash){ - next if ($$hash{$key}[6] eq 'RED' && $conexists eq 'off' ); + next if (($$hash{$key}[6] eq 'RED' || $$hash{$key}[6] eq 'RED1') && $conexists eq 'off' ); if ($$hash{$key}[28] eq 'ON'){ $command='iptables -t nat -A'; $natip=&get_nat_ip($$hash{$key}[29],$$hash{$key}[31]); @@ -224,8 +224,11 @@ sub buildrules if($$hash{$key}[6] eq 'ORANGE'){ $targethash{$key}[0]=$defaultNetworks{'ORANGE_ADDRESS'}; } - if($$hash{$key}[6] eq 'RED'){ - open(FILE, "/var/ipfire/red/local-ipaddress") or die 'Unable to open config file.'; + if($$hash{$key}[6] eq 'ALL'){ + $targethash{$key}[0]='0.0.0.0/0'; + } + if($$hash{$key}[6] eq 'RED' || $$hash{$key}[6] eq 'RED1'){ + open(FILE, "/var/ipfire/red/local-ipaddress")or die "Couldn't open local-ipaddress"; $targethash{$key}[0]= ; close(FILE); }else{