aboutsummaryrefslogtreecommitdiffstats
path: root/package/network
diff options
context:
space:
mode:
authorJo-Philipp Wich <jow@openwrt.org>2013-05-21 12:58:15 +0000
committerJo-Philipp Wich <jow@openwrt.org>2013-05-21 12:58:15 +0000
commit8df6cd005ce53a195d6f401d7fe10b9faab0e3dd (patch)
tree2722450e7231ba4d605bd7d373469e29d399fa22 /package/network
parente8050c6c35166beeec4b1d9c80dbb8b9576c433c (diff)
downloadupstream-8df6cd005ce53a195d6f401d7fe10b9faab0e3dd.tar.gz
upstream-8df6cd005ce53a195d6f401d7fe10b9faab0e3dd.tar.bz2
upstream-8df6cd005ce53a195d6f401d7fe10b9faab0e3dd.zip
netfilter: move time, mark, set matches and MARK, REDIRECT, SET targets into base iptables package - drop iptables-mod-ipset
SVN-Revision: 36683
Diffstat (limited to 'package/network')
-rw-r--r--package/network/utils/iptables/Makefile35
1 files changed, 14 insertions, 21 deletions
diff --git a/package/network/utils/iptables/Makefile b/package/network/utils/iptables/Makefile
index a0ea7f7ce0..1b6a4cf79b 100644
--- a/package/network/utils/iptables/Makefile
+++ b/package/network/utils/iptables/Makefile
@@ -62,20 +62,34 @@ IP firewall administration tool.
- tcp
- udp
- comment
+ - conntrack
- limit
- mac
+ - mark
- multiport
+ - set
+ - state
+ - time
Targets:
- ACCEPT
+ - CT
+ - DNAT
- DROP
- REJECT
- LOG
+ - MARK
+ - MASQUERADE
+ - REDIRECT
+ - SET
+ - SNAT
- TCPMSS
Tables:
- filter
- mangle
+ - nat
+ - raw
endef
@@ -125,10 +139,8 @@ iptables extensions for matching/changing IP packet options.
- dscp
- ecn
- length
- - mark
- statistic
- tcpmss
- - time
- unclean
- hl
@@ -136,7 +148,6 @@ iptables extensions for matching/changing IP packet options.
- DSCP
- CLASSIFY
- ECN
- - MARK
- HL
endef
@@ -156,22 +167,6 @@ iptables extensions for matching ipsec traffic.
endef
-define Package/iptables-mod-ipset
-$(call Package/iptables/Module,)
- TITLE:=IPset iptables extensions
-endef
-
-define Package/iptables-mod-ipset/description
-IPset iptables extensions.
-
- Matches:
- - set
-
- Targets:
- - SET
-
-endef
-
define Package/iptables-mod-nat-extra
$(call Package/iptables/Module, +kmod-ipt-nat-extra)
TITLE:=Extra NAT extensions
@@ -183,7 +178,6 @@ iptables extensions for extra NAT targets.
Targets:
- MIRROR
- NETMAP
- - REDIRECT
endef
define Package/iptables-mod-ulog
@@ -440,7 +434,6 @@ $(eval $(call BuildPlugin,iptables-mod-extra,$(IPT_EXTRA-m)))
$(eval $(call BuildPlugin,iptables-mod-filter,$(IPT_FILTER-m),$(L7_INSTALL)))
$(eval $(call BuildPlugin,iptables-mod-ipopt,$(IPT_IPOPT-m)))
$(eval $(call BuildPlugin,iptables-mod-ipsec,$(IPT_IPSEC-m)))
-$(eval $(call BuildPlugin,iptables-mod-ipset,ipt_set ipt_SET))
$(eval $(call BuildPlugin,iptables-mod-nat-extra,$(IPT_NAT_EXTRA-m)))
$(eval $(call BuildPlugin,iptables-mod-iprange,$(IPT_IPRANGE-m)))
$(eval $(call BuildPlugin,iptables-mod-ulog,$(IPT_ULOG-m)))