X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f901524927d2ab7eda30586f7ac25f12cb5bcd6f..7b3bd12cf8ee18257abac8deb8c5854070569fdf:/package/kernel/modules/netfilter.mk diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk index d19a16da3..e2361af6a 100644 --- a/package/kernel/modules/netfilter.mk +++ b/package/kernel/modules/netfilter.mk @@ -1,6 +1,6 @@ # -# Copyright (C) 2006-2008 OpenWrt.org +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -13,8 +13,11 @@ include $(INCLUDE_DIR)/netfilter.mk define KernelPackage/ipt-core SUBMENU:=$(NF_MENU) TITLE:=Netfilter core - KCONFIG:=$(KCONFIG_IPT_CORE) - FILES:=$(foreach mod,$(IPT_CORE-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + KCONFIG:= \ + CONFIG_NETFILTER=y \ + CONFIG_NETFILTER_ADVANCED=y \ + $(KCONFIG_IPT_CORE) + FILES:=$(foreach mod,$(IPT_CORE-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_CORE-m))) endef @@ -33,18 +36,18 @@ endef $(eval $(call KernelPackage,ipt-core)) -define KernelPackage/ipt/Depends +define AddDepends/ipt SUBMENU:=$(NF_MENU) - DEPENDS:= kmod-ipt-core $(1) + DEPENDS+= kmod-ipt-core $(1) endef define KernelPackage/ipt-conntrack -$(call KernelPackage/ipt/Depends,) TITLE:=Basic connection tracking modules KCONFIG:=$(KCONFIG_IPT_CONNTRACK) - FILES:=$(foreach mod,$(IPT_CONNTRACK-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_CONNTRACK-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,41,$(notdir $(IPT_CONNTRACK-m))) + $(call AddDepends/ipt) endef define KernelPackage/ipt-conntrack/description @@ -61,11 +64,11 @@ $(eval $(call KernelPackage,ipt-conntrack)) define KernelPackage/ipt-conntrack-extra -$(call KernelPackage/ipt/Depends,+kmod-ipt-conntrack) TITLE:=Extra connection tracking modules KCONFIG:=$(KCONFIG_IPT_CONNTRACK_EXTRA) - FILES:=$(foreach mod,$(IPT_CONNTRACK_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_CONNTRACK_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,42,$(notdir $(IPT_CONNTRACK_EXTRA-m))) + $(call AddDepends/ipt,+kmod-ipt-conntrack) endef define KernelPackage/ipt-conntrack-extra/description @@ -82,11 +85,11 @@ $(eval $(call KernelPackage,ipt-conntrack-extra)) define KernelPackage/ipt-filter -$(call KernelPackage/ipt/Depends,+LINUX_2_6:kmod-textsearch) TITLE:=Modules for packet content inspection KCONFIG:=$(KCONFIG_IPT_FILTER) - FILES:=$(foreach mod,$(IPT_FILTER-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_FILTER-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_FILTER-m))) + $(call AddDepends/ipt,+kmod-textsearch) endef define KernelPackage/ipt-filter/description @@ -100,11 +103,11 @@ $(eval $(call KernelPackage,ipt-filter)) define KernelPackage/ipt-ipopt -$(call KernelPackage/ipt/Depends,) TITLE:=Modules for matching/changing IP packet options KCONFIG:=$(KCONFIG_IPT_IPOPT) - FILES:=$(foreach mod,$(IPT_IPOPT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_IPOPT-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_IPOPT-m))) + $(call AddDepends/ipt) endef define KernelPackage/ipt-ipopt/description @@ -128,11 +131,11 @@ $(eval $(call KernelPackage,ipt-ipopt)) define KernelPackage/ipt-ipsec -$(call KernelPackage/ipt/Depends,) TITLE:=Modules for matching IPSec packets KCONFIG:=$(KCONFIG_IPT_IPSEC) - FILES:=$(foreach mod,$(IPT_IPSEC-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_IPSEC-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_IPSEC-m))) + $(call AddDepends/ipt) endef define KernelPackage/ipt-ipsec/description @@ -147,11 +150,11 @@ $(eval $(call KernelPackage,ipt-ipsec)) define KernelPackage/ipt-nat -$(call KernelPackage/ipt/Depends,+kmod-ipt-conntrack) TITLE:=Basic NAT targets KCONFIG:=$(KCONFIG_IPT_NAT) - FILES:=$(foreach mod,$(IPT_NAT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_NAT-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,42,$(notdir $(IPT_NAT-m))) + $(call AddDepends/ipt,+kmod-ipt-conntrack) endef define KernelPackage/ipt-nat/description @@ -164,11 +167,11 @@ $(eval $(call KernelPackage,ipt-nat)) define KernelPackage/ipt-nat-extra -$(call KernelPackage/ipt/Depends,+kmod-ipt-nat) TITLE:=Extra NAT targets KCONFIG:=$(KCONFIG_IPT_NAT_EXTRA) - FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,43,$(notdir $(IPT_NAT_EXTRA-m))) + $(call AddDepends/ipt,+kmod-ipt-nat) endef define KernelPackage/ipt-nat-extra/description @@ -183,11 +186,11 @@ $(eval $(call KernelPackage,ipt-nat-extra)) define KernelPackage/ipt-nathelper -$(call KernelPackage/ipt/Depends,+kmod-ipt-nat) TITLE:=Basic Conntrack and NAT helpers KCONFIG:=$(KCONFIG_IPT_NATHELPER) - FILES:=$(foreach mod,$(IPT_NATHELPER-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_NATHELPER-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_NATHELPER-m))) + $(call AddDepends/ipt,+kmod-ipt-nat) endef define KernelPackage/ipt-nathelper/description @@ -202,11 +205,11 @@ $(eval $(call KernelPackage,ipt-nathelper)) define KernelPackage/ipt-nathelper-extra -$(call KernelPackage/ipt/Depends,+kmod-ipt-nat +LINUX_2_6:kmod-textsearch) TITLE:=Extra Conntrack and NAT helpers KCONFIG:=$(KCONFIG_IPT_NATHELPER_EXTRA) - FILES:=$(foreach mod,$(IPT_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_NATHELPER_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_NATHELPER_EXTRA-m))) + $(call AddDepends/ipt,+kmod-ipt-nat +kmod-textsearch) endef define KernelPackage/ipt-nathelper-extra/description @@ -226,7 +229,6 @@ $(eval $(call KernelPackage,ipt-nathelper-extra)) define KernelPackage/ipt-imq -$(call KernelPackage/ipt/Depends,) TITLE:=Intermediate Queueing support KCONFIG:= \ CONFIG_IMQ \ @@ -234,12 +236,13 @@ $(call KernelPackage/ipt/Depends,) CONFIG_IMQ_NUM_DEVS=2 \ CONFIG_NETFILTER_XT_TARGET_IMQ FILES:= \ - $(LINUX_DIR)/drivers/net/imq.$(LINUX_KMOD_SUFFIX) \ - $(foreach mod,$(IPT_IMQ-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) - AUTOLOAD:=$(call AutoLoad,45,$(notdir \ + $(LINUX_DIR)/drivers/net/imq.ko \ + $(foreach mod,$(IPT_IMQ-m),$(LINUX_DIR)/net/$(mod).ko) + AUTOLOAD:=$(call AutoLoad,46,$(notdir \ imq \ $(IPT_IMQ-m) \ )) + $(call AddDepends/ipt) endef define KernelPackage/ipt-imq/description @@ -250,11 +253,11 @@ $(eval $(call KernelPackage,ipt-imq)) define KernelPackage/ipt-queue -$(call KernelPackage/ipt/Depends,) TITLE:=Module for user-space packet queueing KCONFIG:=$(KCONFIG_IPT_QUEUE) - FILES:=$(foreach mod,$(IPT_QUEUE-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_QUEUE-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_QUEUE-m))) + $(call AddDepends/ipt) endef define KernelPackage/ipt-queue/description @@ -267,11 +270,11 @@ $(eval $(call KernelPackage,ipt-queue)) define KernelPackage/ipt-ulog -$(call KernelPackage/ipt/Depends,) TITLE:=Module for user-space packet logging KCONFIG:=$(KCONFIG_IPT_ULOG) - FILES:=$(foreach mod,$(IPT_ULOG-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_ULOG-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_ULOG-m))) + $(call AddDepends/ipt) endef define KernelPackage/ipt-ulog/description @@ -283,12 +286,32 @@ endef $(eval $(call KernelPackage,ipt-ulog)) +define KernelPackage/ipt-tproxy + TITLE:=Transparent proxying support + KCONFIG:= \ + CONFIG_NETFILTER_TPROXY \ + CONFIG_NETFILTER_XT_MATCH_SOCKET \ + CONFIG_NETFILTER_XT_TARGET_TPROXY + FILES:= \ + $(LINUX_DIR)/net/netfilter/nf_tproxy_core.ko \ + $(foreach mod,$(IPT_TPROXY-m),$(LINUX_DIR)/net/$(mod).ko) + AUTOLOAD:=$(call AutoLoad,45,$(notdir nf_tproxy_core $(IPT_TPROXY-m))) + $(call AddDepends/ipt) +endef + +define KernelPackage/ipt-tproxy/description + Kernel modules for Transparent Proxying +endef + +$(eval $(call KernelPackage,ipt-tproxy)) + + define KernelPackage/ipt-iprange -$(call KernelPackage/ipt/Depends,) TITLE:=Module for matching ip ranges KCONFIG:=$(KCONFIG_IPT_IPRANGE) - FILES:=$(foreach mod,$(IPT_IPRANGE-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_IPRANGE-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_IPRANGE-m))) + $(call AddDepends/ipt) endef define KernelPackage/ipt-iprange/description @@ -301,11 +324,11 @@ $(eval $(call KernelPackage,ipt-iprange)) define KernelPackage/ipt-extra -$(call KernelPackage/ipt/Depends,) TITLE:=Extra modules KCONFIG:=$(KCONFIG_IPT_EXTRA) - FILES:=$(foreach mod,$(IPT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_EXTRA-m))) + $(call AddDepends/ipt) endef define KernelPackage/ipt-extra/description @@ -326,7 +349,7 @@ define KernelPackage/ip6tables TITLE:=IPv6 modules DEPENDS:=+kmod-ipv6 KCONFIG:=$(KCONFIG_IPT_IPV6) - FILES:=$(foreach mod,$(IPT_IPV6-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(IPT_IPV6-m),$(LINUX_DIR)/net/$(mod).ko) AUTOLOAD:=$(call AutoLoad,49,$(notdir $(IPT_IPV6-m))) endef @@ -340,11 +363,11 @@ $(eval $(call KernelPackage,ip6tables)) define KernelPackage/arptables SUBMENU:=$(NF_MENU) TITLE:=ARP firewalling modules - FILES:=$(LINUX_DIR)/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/ipv4/netfilter/arp*.ko KCONFIG:=CONFIG_IP_NF_ARPTABLES \ CONFIG_IP_NF_ARPFILTER \ CONFIG_IP_NF_ARP_MANGLE - AUTOLOAD:=$(call AutoLoad,49,$(notdir $(patsubst %.$(LINUX_KMOD_SUFFIX),%,$(wildcard $(LINUX_DIR)/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX))))) + AUTOLOAD:=$(call AutoLoad,49,$(notdir $(patsubst %.ko,%,$(wildcard $(LINUX_DIR)/net/ipv4/netfilter/arp*.ko)))) endef define KernelPackage/arptables/description @@ -357,8 +380,7 @@ $(eval $(call KernelPackage,arptables)) define KernelPackage/ebtables SUBMENU:=$(NF_MENU) TITLE:=Bridge firewalling modules - DEPENDS:=@LINUX_2_6 - FILES:=$(foreach mod,$(EBTABLES-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(EBTABLES-m),$(LINUX_DIR)/net/$(mod).ko) KCONFIG:=CONFIG_BRIDGE_NETFILTER=y \ $(KCONFIG_EBTABLES) AUTOLOAD:=$(call AutoLoad,49,$(notdir $(EBTABLES-m))) @@ -373,18 +395,18 @@ endef $(eval $(call KernelPackage,ebtables)) -define KernelPackage/ebtables/Depends +define AddDepends/ebtables SUBMENU:=$(NF_MENU) - DEPENDS:=kmod-ebtables $(1) + DEPENDS+=kmod-ebtables $(1) endef define KernelPackage/ebtables-ipv4 -$(call KernelPackage/ebtables/Depends,) TITLE:=ebtables: IPv4 support - FILES:=$(foreach mod,$(EBTABLES_IP4-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(EBTABLES_IP4-m),$(LINUX_DIR)/net/$(mod).ko) KCONFIG:=$(KCONFIG_EBTABLES_IP4) AUTOLOAD:=$(call AutoLoad,49,$(notdir $(EBTABLES_IP4-m))) + $(call AddDepends/ebtables) endef define KernelPackage/ebtables-ipv4/description @@ -396,11 +418,11 @@ $(eval $(call KernelPackage,ebtables-ipv4)) define KernelPackage/ebtables-ipv6 -$(call KernelPackage/ebtables/Depends,) TITLE:=ebtables: IPv6 support - FILES:=$(foreach mod,$(EBTABLES_IP6-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(EBTABLES_IP6-m),$(LINUX_DIR)/net/$(mod).ko) KCONFIG:=$(KCONFIG_EBTABLES_IP6) AUTOLOAD:=$(call AutoLoad,49,$(notdir $(EBTABLES_IP6-m))) + $(call AddDepends/ebtables) endef define KernelPackage/ebtables-ipv6/description @@ -412,11 +434,11 @@ $(eval $(call KernelPackage,ebtables-ipv6)) define KernelPackage/ebtables-watchers -$(call KernelPackage/ebtables/Depends,) TITLE:=ebtables: watchers support - FILES:=$(foreach mod,$(EBTABLES_WATCHERS-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + FILES:=$(foreach mod,$(EBTABLES_WATCHERS-m),$(LINUX_DIR)/net/$(mod).ko) KCONFIG:=$(KCONFIG_EBTABLES_WATCHERS) AUTOLOAD:=$(call AutoLoad,49,$(notdir $(EBTABLES_WATCHERS-m))) + $(call AddDepends/ebtables) endef define KernelPackage/ebtables-watchers/description @@ -430,8 +452,8 @@ $(eval $(call KernelPackage,ebtables-watchers)) define KernelPackage/nfnetlink SUBMENU:=$(NF_MENU) TITLE:=Netlink-based userspace interface - DEPENDS:=@LINUX_2_6 +kmod-ipt-core - FILES:=$(LINUX_DIR)/net/netfilter/nfnetlink.$(LINUX_KMOD_SUFFIX) + DEPENDS:=+kmod-ipt-core + FILES:=$(LINUX_DIR)/net/netfilter/nfnetlink.ko KCONFIG:=CONFIG_NETFILTER_NETLINK AUTOLOAD:=$(call AutoLoad,48,nfnetlink) endef @@ -443,18 +465,18 @@ endef $(eval $(call KernelPackage,nfnetlink)) -define KernelPackage/nfnetlink/Depends +define AddDepends/nfnetlink SUBMENU:=$(NF_MENU) - DEPENDS:=@LINUX_2_6 +kmod-nfnetlink $(1) + DEPENDS+=+kmod-nfnetlink $(1) endef define KernelPackage/nfnetlink-log -$(call KernelPackage/nfnetlink/Depends,) TITLE:=Netfilter LOG over NFNETLINK interface - FILES:=$(LINUX_DIR)/net/netfilter/nfnetlink_log.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/netfilter/nfnetlink_log.ko KCONFIG:=CONFIG_NETFILTER_NETLINK_LOG AUTOLOAD:=$(call AutoLoad,48,nfnetlink_log) + $(call AddDepends/nfnetlink) endef define KernelPackage/nfnetlink-log/description @@ -465,11 +487,11 @@ $(eval $(call KernelPackage,nfnetlink-log)) define KernelPackage/nfnetlink-queue -$(call KernelPackage/nfnetlink/Depends,) TITLE:=Netfilter QUEUE over NFNETLINK interface - FILES:=$(LINUX_DIR)/net/netfilter/nfnetlink_queue.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/netfilter/nfnetlink_queue.ko KCONFIG:=CONFIG_NETFILTER_NETLINK_QUEUE AUTOLOAD:=$(call AutoLoad,48,nfnetlink_queue) + $(call AddDepends/nfnetlink) endef define KernelPackage/nfnetlink-queue/description @@ -480,11 +502,11 @@ $(eval $(call KernelPackage,nfnetlink-queue)) define KernelPackage/nf-conntrack-netlink -$(call KernelPackage/nfnetlink/Depends,+kmod-ipt-conntrack) TITLE:=Connection tracking netlink interface - FILES:=$(LINUX_DIR)/net/netfilter/nf_conntrack_netlink.$(LINUX_KMOD_SUFFIX) + FILES:=$(LINUX_DIR)/net/netfilter/nf_conntrack_netlink.ko KCONFIG:=CONFIG_NF_CT_NETLINK AUTOLOAD:=$(call AutoLoad,49,nf_conntrack_netlink) + $(call AddDepends/nfnetlink,+kmod-ipt-conntrack) endef define KernelPackage/nf-conntrack-netlink/description @@ -493,3 +515,18 @@ define KernelPackage/nf-conntrack-netlink/description endef $(eval $(call KernelPackage,nf-conntrack-netlink)) + +define KernelPackage/ipt-hashlimit + SUBMENU:=$(NF_MENU) + TITLE:=Netfilter hashlimit match + KCONFIG:=$(KCONFIG_IPT_HASHLIMIT) + FILES:=$(LINUX_DIR)/net/netfilter/xt_hashlimit.ko + AUTOLOAD:=$(call AutoLoad,50,xt_hashlimit) + $(call KernelPackage/ipt) +endef + +define KernelPackage/ipt-hashlimit/description + Kernel modules support for the hashlimit bucket match module +endef + +$(eval $(call KernelPackage,ipt-hashlimit))