X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/49166d75b6920d2058d89c4735bdb528c8a65d88..1884e029a49628f24c9048abe18c2a89fac2063b:/package/iptables/files/firewall.init

diff --git a/package/iptables/files/firewall.init b/package/iptables/files/firewall.init
index a4014f3ee..204310af2 100755
--- a/package/iptables/files/firewall.init
+++ b/package/iptables/files/firewall.init
@@ -6,10 +6,18 @@ START=45
 start() {
 	include /lib/network
 	scan_interfaces
+	config_load /var/state/network
 	
 	config_get WAN wan ifname
 	config_get WANDEV wan device
 	config_get LAN lan ifname
+	config_get_bool NAT_LAN lan nat 1
+	if [ $NAT_LAN -ne 0 ]
+	then
+		config_get LAN_MASK lan netmask
+		config_get LAN_IP lan ipaddr
+		LAN_NET=$(/bin/ipcalc.sh $LAN_IP $LAN_MASK | grep NETWORK | cut -d= -f2)
+	fi
 	
 	## CLEAR TABLES
 	for T in filter nat; do
@@ -22,7 +30,8 @@ start() {
 	iptables -N output_rule
 	iptables -N forwarding_rule
 	iptables -N forwarding_wan
-	
+
+	iptables -t nat -N NEW
 	iptables -t nat -N prerouting_rule
 	iptables -t nat -N prerouting_wan
 	iptables -t nat -N postrouting_rule
@@ -99,11 +108,19 @@ start() {
 	# uses the default -P DROP
 	
 	### MASQ
+	iptables -t nat -A PREROUTING -m state --state NEW -p tcp -j NEW 
 	iptables -t nat -A PREROUTING -j prerouting_rule
 	[ -z "$WAN" ] || iptables -t nat -A PREROUTING -i "$WAN" -j prerouting_wan
 	iptables -t nat -A POSTROUTING -j postrouting_rule
-	[ -z "$WAN" ] || iptables -t nat -A POSTROUTING -o $WAN -j MASQUERADE
-	
+	### Only LAN, unless told not to
+	if [ $NAT_LAN -ne 0 ]
+	then
+		[ -z "$WAN" ] || iptables -t nat -A POSTROUTING --src $LAN_NET/$LAN_MASK -o $WAN -j MASQUERADE
+	fi
+
+	iptables -t nat -A NEW -m limit --limit 50 --limit-burst 100 -j RETURN && \
+		iptables -t nat -A NEW -j DROP
+
 	## USER RULES
 	[ -f /etc/firewall.user ] && . /etc/firewall.user
 	[ -n "$WAN" -a -e /etc/config/firewall ] && {