diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2006-07-30 03:09:09 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2006-07-30 03:09:09 +0000 |
| commit | d3a6fe9915875cb78ca3d22f8330a0380dcd58a0 (patch) | |
| tree | 3a7ec356cf8ec9ada9d0ddbf6ccbd1cbb9aae869 /package/iptables | |
| parent | d5aeb2645530079ac89ed72e2eee91fbcbc38e84 (diff) | |
| download | master-187ad058-d3a6fe9915875cb78ca3d22f8330a0380dcd58a0.tar.gz master-187ad058-d3a6fe9915875cb78ca3d22f8330a0380dcd58a0.tar.bz2 master-187ad058-d3a6fe9915875cb78ca3d22f8330a0380dcd58a0.zip | |
rewrite of the network scripts and configuration
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@4323 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/iptables')
| -rw-r--r-- | package/iptables/files/firewall.awk | 5 | ||||
| -rwxr-xr-x | package/iptables/files/firewall.init | 11 | ||||
| -rw-r--r--[-rwxr-xr-x] | package/iptables/files/firewall.user | 5 |
3 files changed, 8 insertions, 13 deletions
diff --git a/package/iptables/files/firewall.awk b/package/iptables/files/firewall.awk index 5378330045..902c7b1888 100644 --- a/package/iptables/files/firewall.awk +++ b/package/iptables/files/firewall.awk @@ -1,10 +1,7 @@ # 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 "ifname=\"$WAN\"" print "[ -z \"$ifname\" ] && exit" print "" print "iptables -X input_$ifname 2>&- >&-" diff --git a/package/iptables/files/firewall.init b/package/iptables/files/firewall.init index e174d84bb2..a0bd99ef9a 100755 --- a/package/iptables/files/firewall.init +++ b/package/iptables/files/firewall.init @@ -3,9 +3,12 @@ ## Please make changes in /etc/firewall.user -. /etc/config/network -WAN="$wan_ifname" -LAN="$lan_ifname" +. /etc/functions.sh +include network + +scan_interfaces +config_get WAN wan ifname +config_get LAN lan ifname ## CLEAR TABLES for T in filter nat; do @@ -35,7 +38,7 @@ iptables -t nat -N postrouting_rule iptables -A INPUT -j input_rule # allow - [ -z "$WAN" ] || iptables -A INPUT -i \! $WAN -j ACCEPT # allow from lan/wifi interfaces + iptables -A INPUT ${WAN:+-i \! $WAN} -j ACCEPT # allow from lan/wifi interfaces iptables -A INPUT -p icmp -j ACCEPT # allow ICMP iptables -A INPUT -p gre -j ACCEPT # allow GRE diff --git a/package/iptables/files/firewall.user b/package/iptables/files/firewall.user index 1fb862e9b0..5f295babf2 100755..100644 --- a/package/iptables/files/firewall.user +++ b/package/iptables/files/firewall.user @@ -1,11 +1,6 @@ #!/bin/sh # Copyright (C) 2006 OpenWrt.org -. /etc/config/network - -WAN="$wan_ifname" -LAN="$lan_ifname" - iptables -F input_rule iptables -F output_rule iptables -F forwarding_rule |