iptables: Replace state module by conntrack module.

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

diff --git a/config/forwardfw/convert-portfw b/config/forwardfw/convert-portfw
index 682199f0046746c6425b3a620be0ac48058a189d..691cfb429a0a632114d423f43d8ecf1f95c0bd16 100755 (executable)
--- a/config/forwardfw/convert-portfw
+++ b/config/forwardfw/convert-portfw
@@ -2,7 +2,7 @@
 
 ######################################################################## 
 # Script:      convert-portfw
-# Date:                19.03.2013
+# Date:                21.03.2013
 # Author:      Alexander Marx (amarx@ipfire.org)
 ########################################################################
 #
@@ -18,7 +18,7 @@ my @values=();
 my @built_rules=();
 my %nat=();
 my $portfwconfig       = "${General::swroot}/portfw/config";
-my $confignat          = "${General::swroot}/forward/nat";
+my $confignat          = "${General::swroot}/forward/config";
 my ($key,$flag,$prot,$ipfireport,$target,$targetport,$active,$alias,$source,$remark);
 my ($key1,$flag1,$prot1,$ipfireport1,$target1,$targetport1,$active1,$alias1,$source1,$remark1);
 my $count=0;
@@ -85,17 +85,18 @@ sub build_rules
                }else{
                        foreach my $ali (@alias){
                                my ($alias_ip,$alias_active,$alias_name) = split (",",$ali);
-                               if($alias eq $alias_name){
+                               if($alias eq $alias_ip){
+                                       chomp($alias_name);
                                        $alias=$alias_name;
                                }
                        }
                }
                $active = uc $active;
                $prot   = uc $prot;
-               $remark = chomp($remark);
-               push (@built_rules,"ACCEPT,NAT_DESTINATION,$active,$src,$src1,tgt_addr,$target/32,ON,$prot,,TGT_PORT,$targetport,$remark,00:00,00:00,ON,$alias,$ipfireport,dnat");
+               chomp($remark);
+               push (@built_rules,"ACCEPT,FORWARDFW,$active,$src,$src1,tgt_addr,$target/32,ON,$prot,,TGT_PORT,$targetport,$remark,00:00,00:00,ON,$alias,$ipfireport,dnat");
                my $now=localtime;
-               print LOG "$now    Converted-> KEY: $count ACCEPT,NAT_DESTINATION,$active,$src,$src1,tgt_addr,$target/32,ON,$prot,,TGT_PORT,$targetport,$remark,00:00,00:00,ON,$alias,$ipfireport,dnat\n";
+               print LOG "$now    Converted-> KEY: $count ACCEPT,FORWARDFW,$active,$src,$src1,tgt_addr,$target/32,ON,$prot,,TGT_PORT,$targetport,$remark,00:00,00:00,ON,$alias,$ipfireport,dnat\n";
        }
 }
 sub write_rules