Date:2010-06-23 00:39:22 (13 years 6 months ago)
Author:jow
Commit:86b9c1df6447ff355f0cf8c7e4c65f91e485e280
Message:[netfilter] package TPROXY target and module infrastructure

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21883 3c298f89-4303-0410-b956-a3cf2f4a3e73
Files: include/netfilter.mk (2 diffs)
package/iptables/Makefile (2 diffs)
package/kernel/modules/netfilter.mk (1 diff)
target/linux/generic-2.6/config-2.6.25 (2 diffs)
target/linux/generic-2.6/config-2.6.30 (2 diffs)
target/linux/generic-2.6/config-2.6.31 (2 diffs)
target/linux/generic-2.6/config-2.6.32 (2 diffs)
target/linux/generic-2.6/config-2.6.33 (2 diffs)
target/linux/generic-2.6/config-2.6.34 (2 diffs)
target/linux/generic-2.6/config-2.6.35 (2 diffs)

Change Details

include/netfilter.mk
277277$(eval $(call nf_add,IPT_ULOG,CONFIG_IP_NF_TARGET_ULOG, $(P_V4)ipt_ULOG))
278278
279279
280# tproxy
281
282$(eval $(call nf_add,IPT_TPROXY,CONFIG_NETFILTER_XT_MATCH_SOCKET, $(P_XT)xt_socket))
283$(eval $(call nf_add,IPT_TPROXY,CONFIG_NETFILTER_XT_TARGET_TPROXY, $(P_XT)xt_TPROXY))
284
285
280286#
281287# ebtables
282288#
...... 
329335IPT_BUILTIN += $(IPT_NATHELPER-y)
330336IPT_BUILTIN += $(IPT_NATHELPER_EXTRA-y)
331337IPT_BUILTIN += $(IPT_ULOG-y)
338IPT_BUILTIN += $(IPT_TPROXY-y)
332339IPT_BUILTIN += $(EBTABLES-y)
333340IPT_BUILTIN += $(EBTABLES_IP4-y)
334341IPT_BUILTIN += $(EBTALTES_IP6-y)
package/iptables/Makefile
214214- libipt_recent
215215endef
216216
217define Package/iptables-mod-tproxy
218$(call Package/iptables/Module, +kmod-ipt-tproxy)
219  TITLE:=Transparent proxy iptables extensions
220endef
221
222define Package/iptables-mod-tproxy/description
223Transparent proxy iptables extensions.
224Includes:
225- libxt_socket
226- libxt_TPROXY
227endef
228
229
217230define Package/iptables-utils
218231$(call Package/iptables/Module, )
219232  TITLE:=iptables save and restore utilities
...... 
380393$(eval $(call BuildPlugin,iptables-mod-nat-extra,$(IPT_NAT_EXTRA-m)))
381394$(eval $(call BuildPlugin,iptables-mod-iprange,$(IPT_IPRANGE-m)))
382395$(eval $(call BuildPlugin,iptables-mod-ulog,$(IPT_ULOG-m)))
396$(eval $(call BuildPlugin,iptables-mod-tproxy,$(IPT_TPROXY-m)))
383397$(eval $(call BuildPackage,ip6tables))
384398$(eval $(call BuildPackage,ip6tables-utils))
385399$(eval $(call BuildPackage,libiptc))
package/kernel/modules/netfilter.mk
283283$(eval $(call KernelPackage,ipt-ulog))
284284
285285
286define KernelPackage/ipt-tproxy
287  TITLE:=Transparent proxying support
288  DEPENDS:=@LINUX_2_6
289  KCONFIG:= \
290      CONFIG_NETFILTER_TPROXY \
291      CONFIG_NETFILTER_XT_MATCH_SOCKET \
292      CONFIG_NETFILTER_XT_TARGET_TPROXY
293  FILES:= \
294      $(LINUX_DIR)/net/netfilter/nf_tproxy_core.$(LINUX_KMOD_SUFFIX) \
295      $(foreach mod,$(IPT_TPROXY-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
296  AUTOLOAD:=$(call AutoLoad,45,$(notdir nf_tproxy_core $(IPT_TPROXY-m)))
297  $(call AddDepends/ipt)
298endef
299
300define KernelPackage/ipt-tproxy/description
301  Kernel modules for Transparent Proxying
302endef
303
304$(eval $(call KernelPackage,ipt-tproxy))
305
306
286307define KernelPackage/ipt-iprange
287308  TITLE:=Module for matching ip ranges
288309  KCONFIG:=$(KCONFIG_IPT_IPRANGE)
target/linux/generic-2.6/config-2.6.25
971971# CONFIG_NETFILTER_XT_MATCH_STATE is not set
972972# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
973973# CONFIG_NETFILTER_XT_MATCH_STRING is not set
974# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
974975# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
975976# CONFIG_NETFILTER_XT_MATCH_TIME is not set
976977# CONFIG_NETFILTER_XT_MATCH_U32 is not set
...... 
984985# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
985986# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
986987# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
988# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
987989# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
988990CONFIG_NETFILTER=y
989991CONFIG_NET_IPGRE_BROADCAST=y
target/linux/generic-2.6/config-2.6.30
13561356# CONFIG_NETFILTER_XT_MATCH_STATE is not set
13571357# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
13581358# CONFIG_NETFILTER_XT_MATCH_STRING is not set
1359# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
13591360# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
13601361# CONFIG_NETFILTER_XT_MATCH_TIME is not set
13611362# CONFIG_NETFILTER_XT_MATCH_U32 is not set
...... 
13721373# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
13731374# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
13741375# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
1376# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
13751377# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
13761378CONFIG_NETFILTER=y
13771379CONFIG_NET_IPGRE_BROADCAST=y
target/linux/generic-2.6/config-2.6.31
13521352# CONFIG_NETFILTER_XT_MATCH_STATE is not set
13531353# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
13541354# CONFIG_NETFILTER_XT_MATCH_STRING is not set
1355# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
13551356# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
13561357# CONFIG_NETFILTER_XT_MATCH_TIME is not set
13571358# CONFIG_NETFILTER_XT_MATCH_U32 is not set
...... 
13681369# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
13691370# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
13701371# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
1372# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
13711373# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
13721374CONFIG_NETFILTER=y
13731375CONFIG_NET_IPGRE_BROADCAST=y
target/linux/generic-2.6/config-2.6.32
14331433# CONFIG_NETFILTER_XT_MATCH_STATE is not set
14341434# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
14351435# CONFIG_NETFILTER_XT_MATCH_STRING is not set
1436# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
14361437# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
14371438# CONFIG_NETFILTER_XT_MATCH_TIME is not set
14381439# CONFIG_NETFILTER_XT_MATCH_U32 is not set
...... 
14491450# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
14501451# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
14511452# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
1453# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
14521454# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
14531455CONFIG_NETFILTER=y
14541456CONFIG_NET_IPGRE_BROADCAST=y
target/linux/generic-2.6/config-2.6.33
14771477# CONFIG_NETFILTER_XT_MATCH_STATE is not set
14781478# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
14791479# CONFIG_NETFILTER_XT_MATCH_STRING is not set
1480# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
14801481# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
14811482# CONFIG_NETFILTER_XT_MATCH_TIME is not set
14821483# CONFIG_NETFILTER_XT_MATCH_U32 is not set
...... 
14931494# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
14941495# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
14951496# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
1497# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
14961498# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
14971499CONFIG_NETFILTER=y
14981500CONFIG_NET_IPGRE_BROADCAST=y
target/linux/generic-2.6/config-2.6.34
15081508# CONFIG_NETFILTER_XT_MATCH_STATE is not set
15091509# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
15101510# CONFIG_NETFILTER_XT_MATCH_STRING is not set
1511# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
15111512# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
15121513# CONFIG_NETFILTER_XT_MATCH_TIME is not set
15131514# CONFIG_NETFILTER_XT_MATCH_U32 is not set
...... 
15241525# CONFIG_NETFILTER_XT_TARGET_RATEEST is not set
15251526# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
15261527# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
1528# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
15271529# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
15281530CONFIG_NETFILTER=y
15291531CONFIG_NET_IPGRE_BROADCAST=y
target/linux/generic-2.6/config-2.6.35
15351535# CONFIG_NETFILTER_XT_MATCH_STATE is not set
15361536# CONFIG_NETFILTER_XT_MATCH_STATISTIC is not set
15371537# CONFIG_NETFILTER_XT_MATCH_STRING is not set
1538# CONFIG_NETFILTER_XT_MATCH_SOCKET is not set
15381539# CONFIG_NETFILTER_XT_MATCH_TCPMSS is not set
15391540# CONFIG_NETFILTER_XT_MATCH_TIME is not set
15401541# CONFIG_NETFILTER_XT_MATCH_U32 is not set
...... 
15521553# CONFIG_NETFILTER_XT_TARGET_TCPMSS is not set
15531554# CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP is not set
15541555# CONFIG_NETFILTER_XT_TARGET_TEE is not set
1556# CONFIG_NETFILTER_XT_TARGET_TPROXY is not set
15551557# CONFIG_NETFILTER_XT_TARGET_TRACE is not set
15561558CONFIG_NETFILTER=y
15571559CONFIG_NET_IPGRE_BROADCAST=y

Archive Download the corresponding diff file

Branches:
backfire
history
master
release_2010-11-17
release_2010-12-14
release_2011-02-23
release_2011-05-28
release_2011-08-27
release_2011-11-13
release_2012-03-18
release_2012-04-09
release_2012-10-11
uclibc_nptl



interactive