summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-09-01 20:37:22 +0000
committerjow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>2011-09-01 20:37:22 +0000
commit040047ef04833541ea55ddf0285f940bf268d9b8 (patch)
treef7a9b2469c8f73ebf873cd8d4a10005697012740
parenta028d987c3225c6593ccb47fedc4470581f7b6f6 (diff)
[package] firewall: make ESTABLISHED,RELATED rules match before INVALID, use conntrack instead of state match (#10038)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@28148 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/firewall/Makefile2
-rw-r--r--package/firewall/files/lib/core_init.sh16
2 files changed, 9 insertions, 9 deletions
diff --git a/package/firewall/Makefile b/package/firewall/Makefile
index b192ad330..597a37e14 100644
--- a/package/firewall/Makefile
+++ b/package/firewall/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=firewall
PKG_VERSION:=2
-PKG_RELEASE:=34
+PKG_RELEASE:=35
include $(INCLUDE_DIR)/package.mk
diff --git a/package/firewall/files/lib/core_init.sh b/package/firewall/files/lib/core_init.sh
index 185fffb98..f2cde1c47 100644
--- a/package/firewall/files/lib/core_init.sh
+++ b/package/firewall/files/lib/core_init.sh
@@ -1,4 +1,4 @@
-# Copyright (C) 2009-2010 OpenWrt.org
+# Copyright (C) 2009-2011 OpenWrt.org
# Copyright (C) 2008 John Crispin <blogic@openwrt.org>
FW_INITIALIZED=
@@ -66,17 +66,17 @@ fw_load_defaults() {
done
fw_sysctl_interface all
+ fw add i f INPUT ACCEPT { -m conntrack --ctstate RELATED,ESTABLISHED }
+ fw add i f OUTPUT ACCEPT { -m conntrack --ctstate RELATED,ESTABLISHED }
+ fw add i f FORWARD ACCEPT { -m conntrack --ctstate RELATED,ESTABLISHED }
+
[ $defaults_drop_invalid == 1 ] && {
- fw add i f INPUT DROP { -m state --state INVALID }
- fw add i f OUTPUT DROP { -m state --state INVALID }
- fw add i f FORWARD DROP { -m state --state INVALID }
+ fw add i f INPUT DROP { -m conntrack --ctstate INVALID }
+ fw add i f OUTPUT DROP { -m conntrack --ctstate INVALID }
+ fw add i f FORWARD DROP { -m conntrack --ctstate INVALID }
FW_NOTRACK_DISABLED=1
}
- fw add i f INPUT ACCEPT { -m state --state RELATED,ESTABLISHED }
- fw add i f OUTPUT ACCEPT { -m state --state RELATED,ESTABLISHED }
- fw add i f FORWARD ACCEPT { -m state --state RELATED,ESTABLISHED }
-
fw add i f INPUT ACCEPT { -i lo }
fw add i f OUTPUT ACCEPT { -o lo }