remove debug crap accidentally left in the patch

[openwrt.git] / package / iptables / files / firewall.awk

diff --git a/package/iptables/files/firewall.awk b/package/iptables/files/firewall.awk
index 5378330..31dbae0 100644 (file)
--- a/package/iptables/files/firewall.awk
+++ b/package/iptables/files/firewall.awk
@@ -1,23 +1,6 @@
 # Copyright (C) 2006 OpenWrt.org
 
 BEGIN {
 # Copyright (C) 2006 OpenWrt.org
 
 BEGIN {

-       print ". /etc/config/network"
-       print "proto=\"$wan_proto\""
-       print "[ -z \"$proto\" -o \"$proto\" = \"none\" ] && exit"
-       print "ifname=\"$wan_ifname\""
-       print "[ -z \"$ifname\" ] && exit"
-       print ""
-       print "iptables -X input_$ifname 2>&- >&-"
-       print "iptables -N input_$ifname"
-       print "iptables -X forward_$ifname 2>&- >&-"
-       print "iptables -N forward_$ifname"
-       print "iptables -t nat -X prerouting_$ifname 2>&- >&-"
-       print "iptables -t nat -N prerouting_$ifname"
-       print ""
-       print "iptables -A input_rule -i \"$ifname\" -j input_$ifname"
-       print "iptables -A forwarding_rule -i \"$ifname\" -j forward_$ifname"
-       print "iptables -t nat -A prerouting_rule -i \"$ifname\" -j prerouting_$ifname"
-       print ""

        FS=":"
 }
 
        FS=":"
 }
 


@@ -35,15 +18,15 @@ BEGIN {
 ($1 == "accept") {
        target = " -j ACCEPT"
        for (o in _opt) {
 ($1 == "accept") {
        target = " -j ACCEPT"
        for (o in _opt) {

-               print "iptables -t nat -A prerouting_$ifname" _opt[o] str2ipt($2) target
-               print "iptables        -A input_$ifname     " _opt[o] str2ipt($2) target
+               print "iptables -t nat -A prerouting_wan" _opt[o] str2ipt($2) target
+               print "iptables        -A input_wan     " _opt[o] str2ipt($2) target

                print ""
        }
 }
 
 ($1 == "drop") {
        for (o in _opt) {
                print ""
        }
 }
 
 ($1 == "drop") {
        for (o in _opt) {

-               print "iptables -t nat -A prerouting_$ifname" _opt[o] str2ipt($2) " -j DROP"
+               print "iptables -t nat -A prerouting_wan" _opt[o] str2ipt($2) " -j DROP"

                print ""
        }
 }
                print ""
        }
 }


@@ -60,8 +43,8 @@ BEGIN {
                else fwopts = ""
        }
        for (o in _opt) {
                else fwopts = ""
        }
        for (o in _opt) {

-               print "iptables -t nat -A prerouting_$ifname" _opt[o] str2ipt($2) target
-               print "iptables        -A forward_$ifname   " _opt[o] " -d " $3 fwopts " -j ACCEPT"
+               print "iptables -t nat -A prerouting_wan" _opt[o] str2ipt($2) target
+               print "iptables        -A forwarding_wan   " _opt[o] " -d " $3 fwopts " -j ACCEPT"

                print ""
        }
 }
                print ""
        }
 }