diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2005-07-21 16:57:12 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2005-07-21 16:57:12 +0000 |
| commit | ab255a8a29f383df9e72951030c8e215b4d62ec3 (patch) | |
| tree | 391be6f4f393f9ca87c494b983c665b090d1924f | |
| parent | 8c400978792d762a9ab0d7d45e774635b21c3f14 (diff) | |
| download | upstream-ab255a8a29f383df9e72951030c8e215b4d62ec3.tar.gz upstream-ab255a8a29f383df9e72951030c8e215b4d62ec3.tar.bz2 upstream-ab255a8a29f383df9e72951030c8e215b4d62ec3.zip | |
fix firewall script, add ar7 network if into the bridge by default
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1522 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rwxr-xr-x | openwrt/package/base-files/default/etc/init.d/S45firewall | 9 | ||||
| -rw-r--r-- | openwrt/target/linux/package/openwrt/files/network.overrides.ar7 | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/openwrt/package/base-files/default/etc/init.d/S45firewall b/openwrt/package/base-files/default/etc/init.d/S45firewall index 188b9aaa8ad..c9986011ad8 100755 --- a/openwrt/package/base-files/default/etc/init.d/S45firewall +++ b/openwrt/package/base-files/default/etc/init.d/S45firewall @@ -5,7 +5,8 @@ ${FAILSAFE:+exit} . /etc/functions.sh . /etc/network.overrides -[ -e /etc/config/network] && . /etc/config/network +[ -e /etc/config/network ] && . /etc/config/network + WAN=$(nvram get wan_ifname) LAN=$(nvram get lan_ifname) @@ -37,7 +38,7 @@ iptables -t nat -N postrouting_rule iptables -A INPUT -j input_rule # allow - 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 @@ -81,7 +82,7 @@ iptables -t nat -N postrouting_rule # allow iptables -A FORWARD -i br0 -o br0 -j ACCEPT - iptables -A FORWARD -i $LAN -o $WAN -j ACCEPT + [ -z "$WAN" ] || iptables -A FORWARD -i $LAN -o $WAN -j ACCEPT # reject (what to do with anything not allowed earlier) # uses the default -P DROP @@ -89,7 +90,7 @@ iptables -t nat -N postrouting_rule ### MASQ iptables -t nat -A PREROUTING -j prerouting_rule iptables -t nat -A POSTROUTING -j postrouting_rule - iptables -t nat -A POSTROUTING -o $WAN -j MASQUERADE + [ -z "$WAN" ] || iptables -t nat -A POSTROUTING -o $WAN -j MASQUERADE ## USER RULES [ -f /etc/firewall.user ] && . /etc/firewall.user diff --git a/openwrt/target/linux/package/openwrt/files/network.overrides.ar7 b/openwrt/target/linux/package/openwrt/files/network.overrides.ar7 index dc58a7e5912..e857d5b5f18 100644 --- a/openwrt/target/linux/package/openwrt/files/network.overrides.ar7 +++ b/openwrt/target/linux/package/openwrt/files/network.overrides.ar7 @@ -7,7 +7,7 @@ [ -f /etc/sysconf ] && . /etc/sysconf DEFAULT_lan_proto="static" -DEFAULT_lan_ifname="eth0" +DEFAULT_lan_ifname="br0" DEFAULT_lan_ifnames="eth0" DEFAULT_lan_ipaddr=${BR2_SYSCONF_FAILSAFE_IP:-"192.168.1.1"} DEFAULT_lan_netmask=${BR2_SYSCONF_FAILSAFE_NETMASK:-"255.255.255.0"} |