X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/4a75cb19337d285a49cbf6078adf92dd576b374d..495ea3c8471821855f1fc06ef5f66ffa05fabe62:/package/kernel/modules/netfilter.mk diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk index af68d079c..4177dc3eb 100644 --- a/package/kernel/modules/netfilter.mk +++ b/package/kernel/modules/netfilter.mk @@ -10,31 +10,76 @@ NF_MENU:=Netfilter Extensions NF_KMOD:=1 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)) + AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_CORE-m))) +endef + +define KernelPackage/ipt-core/description + Netfilter core kernel modules + Includes: + - limit + - LOG + - mac + - multiport + - TCPMSS + - REJECT +endef + +$(eval $(call KernelPackage,ipt-core)) + + define KernelPackage/ipt-conntrack SUBMENU:=$(NF_MENU) - TITLE:=Modules for connection tracking + TITLE:=Basic connection tracking modules KCONFIG:=$(KCONFIG_IPT_CONNTRACK) FILES:=$(foreach mod,$(IPT_CONNTRACK-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) - AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_CONNTRACK-m))) + AUTOLOAD:=$(call AutoLoad,41,$(notdir $(IPT_CONNTRACK-m))) + DEPENDS:= kmod-ipt-core endef define KernelPackage/ipt-conntrack/description Netfilter (IPv4) kernel modules for connection tracking Includes: - - ipt_conntrack - - ipt_helper - - ipt_connmark/CONNMARK + - state endef $(eval $(call KernelPackage,ipt-conntrack)) +define KernelPackage/ipt-conntrack-extra + SUBMENU:=$(NF_MENU) + TITLE:=Extra connection tracking modules + KCONFIG:=$(KCONFIG_IPT_CONNTRACK_EXTRA) + FILES:=$(foreach mod,$(IPT_CONNTRACK_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + AUTOLOAD:=$(call AutoLoad,42,$(notdir $(IPT_CONNTRACK_EXTRA-m))) + DEPENDS:= kmod-ipt-core +kmod-ipt-conntrack +endef + +define KernelPackage/ipt-conntrack-extra/description + Netfilter (IPv4) extra kernel modules for connection tracking + Includes: + - connbytes + - connmark/CONNMARK + - conntrack + - helper + - recent + - NOTRACK +endef + +$(eval $(call KernelPackage,ipt-conntrack-extra)) + + define KernelPackage/ipt-filter SUBMENU:=$(NF_MENU) TITLE:=Modules for packet content inspection KCONFIG:=$(KCONFIG_IPT_FILTER) FILES:=$(foreach mod,$(IPT_FILTER-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) - AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_FILTER-m))) + AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_FILTER-m))) + DEPENDS:= kmod-ipt-core endef define KernelPackage/ipt-filter/description @@ -52,7 +97,8 @@ define KernelPackage/ipt-ipopt 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)) - AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPOPT-m))) + AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_IPOPT-m))) + DEPENDS:= kmod-ipt-core endef define KernelPackage/ipt-ipopt/description @@ -62,7 +108,6 @@ define KernelPackage/ipt-ipopt/description - ipt_dscp/DSCP - ipt_ecn/ECN - ipt_length - - ipt_mac - ipt_tos/TOS - ipt_tcpmms - ipt_ttl/TTL @@ -77,7 +122,8 @@ define KernelPackage/ipt-ipsec TITLE:=Modules for matching IPSec packets KCONFIG:=$(KCONFIG_IPT_IPSEC) FILES:=$(foreach mod,$(IPT_IPSEC-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) - AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPSEC-m))) + AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_IPSEC-m))) + DEPENDS:= kmod-ipt-core endef define KernelPackage/ipt-ipsec/description @@ -92,38 +138,60 @@ $(eval $(call KernelPackage,ipt-ipsec)) define KernelPackage/ipt-nat SUBMENU:=$(NF_MENU) - TITLE:=Modules for extra NAT targets + TITLE:=Basic NAT targets KCONFIG:=$(KCONFIG_IPT_NAT) FILES:=$(foreach mod,$(IPT_NAT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) - AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_NAT-m))) + AUTOLOAD:=$(call AutoLoad,42,$(notdir $(IPT_NAT-m))) + DEPENDS:= kmod-ipt-core +kmod-ipt-conntrack endef define KernelPackage/ipt-nat/description - Netfilter (IPv4) modules for extra NAT targets + Netfilter (IPv4) kernel modules for basic NAT targets Includes: - - ipt_REDIRECT - - ipt_NETMAP + - MASQUERADE endef $(eval $(call KernelPackage,ipt-nat)) +define KernelPackage/ipt-nat-extra + SUBMENU:=$(NF_MENU) + TITLE:=Extra NAT targets + KCONFIG:=$(KCONFIG_IPT_NAT_EXTRA) + FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + AUTOLOAD:=$(call AutoLoad,43,$(notdir $(IPT_NAT_EXTRA-m))) + DEPENDS:= kmod-ipt-core +kmod-ipt-nat +endef + +define KernelPackage/ipt-nat-extra/description + Netfilter (IPv4) kernel modules for extra NAT targets + Includes: + - MIRROR + - NETMAP + - REDIRECT +endef + +$(eval $(call KernelPackage,ipt-nat-extra)) + + define KernelPackage/ipt-nathelper SUBMENU:=$(NF_MENU) - TITLE:=Default Conntrack and NAT helpers + TITLE:=Basic Conntrack and NAT helpers KCONFIG:=$(KCONFIG_IPT_NATHELPER) - FILES:=$(foreach mod,$(IPT_NAT_NATHELPER-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) - AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_NAT_NATHELPER-m))) + FILES:=$(foreach mod,$(IPT_NATHELPER-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_NATHELPER-m))) + DEPENDS:= kmod-ipt-core +kmod-ipt-nat endef define KernelPackage/ipt-nathelper/description Default Netfilter (IPv4) Conntrack and NAT helpers Includes: - - ip_conntrack_ftp - - ip_nat_ftp - - ip_conntrack_irc - - ip_nat_irc - - ip_conntrack_tftp + - conntrack_ftp + - nat_ftp + - conntrack_irc + - nat_irc + - conntrack_tftp + - nat_tftp endef $(eval $(call KernelPackage,ipt-nathelper)) @@ -134,7 +202,8 @@ define KernelPackage/ipt-nathelper-extra 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)) - AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_NATHELPER_EXTRA-m))) + AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_NATHELPER_EXTRA-m))) + DEPENDS:= kmod-ipt-core +kmod-ipt-nat endef define KernelPackage/ipt-nathelper-extra/description @@ -156,10 +225,19 @@ $(eval $(call KernelPackage,ipt-nathelper-extra)) define KernelPackage/ipt-imq SUBMENU:=$(NF_MENU) TITLE:=Intermediate Queueing support - KCONFIG:=CONFIG_IP_NF_TARGET_IMQ - DEPENDS:=@!LINUX_2_6_25 - FILES:=$(LINUX_DIR)/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/drivers/net/imq.$(LINUX_KMOD_SUFFIX) - AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,$(wildcard $(LINUX_DIR)/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/drivers/net/imq.$(LINUX_KMOD_SUFFIX))))) + KCONFIG:= \ + CONFIG_IMQ \ + CONFIG_IMQ_BEHAVIOR_BA=y \ + CONFIG_IMQ_NUM_DEVS=2 \ + CONFIG_IP_NF_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 \ + imq \ + $(IPT_IMQ-m) \ + )) + DEPENDS:= kmod-ipt-core @!LINUX_2_6_27 endef define KernelPackage/ipt-imq/description @@ -174,13 +252,14 @@ define KernelPackage/ipt-queue TITLE:=Module for user-space packet queueing KCONFIG:=$(KCONFIG_IPT_QUEUE) FILES:=$(foreach mod,$(IPT_QUEUE-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) - AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_QUEUE-m))) + AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_QUEUE-m))) + DEPENDS:= kmod-ipt-core endef define KernelPackage/ipt-queue/description Netfilter (IPv4) module for user-space packet queueing Includes: - - ipt_QUEUE + - QUEUE endef $(eval $(call KernelPackage,ipt-queue)) @@ -191,7 +270,8 @@ define KernelPackage/ipt-ulog TITLE:=Module for user-space packet logging KCONFIG:=$(KCONFIG_IPT_ULOG) FILES:=$(foreach mod,$(IPT_ULOG-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) - AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_ULOG-m))) + AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_ULOG-m))) + DEPENDS:= kmod-ipt-core endef define KernelPackage/ipt-ulog/description @@ -207,7 +287,8 @@ define KernelPackage/ipt-iprange SUBMENU:=$(NF_MENU) TITLE:=Module for matching ip ranges FILES:=$(foreach mod,$(IPT_IPRANGE-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) - AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPRANGE-m))) + AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_IPRANGE-m))) + DEPENDS:= kmod-ipt-core endef define KernelPackage/ipt-iprange/description @@ -224,7 +305,8 @@ define KernelPackage/ipt-ipset TITLE:=IPSET Modules KCONFIG:=$(KCONFIG_IPT_IPSET) FILES:=$(foreach mod,$(IPT_IPSET-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) - AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPSET-m))) + AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_IPSET-m))) + DEPENDS:= kmod-ipt-core endef define KernelPackage/ipt-ipset/description @@ -251,13 +333,13 @@ define KernelPackage/ipt-extra TITLE:=Extra modules KCONFIG:=$(KCONFIG_IPT_EXTRA) FILES:=$(foreach mod,$(IPT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) - AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_EXTRA-m))) + AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_EXTRA-m))) + DEPENDS:= kmod-ipt-core endef define KernelPackage/ipt-extra/description Other Netfilter (IPv4) kernel modules Includes: - - ipt_limit - ipt_owner - ipt_physdev - ipt_pkttype @@ -272,13 +354,14 @@ endef $(eval $(call KernelPackage,ipt-extra)) +# XXX: disabled on 2.6.27 due to broken IMQ define KernelPackage/ip6tables SUBMENU:=$(NF_MENU) TITLE:=IPv6 modules - DEPENDS:=+kmod-ipv6 + DEPENDS:=+kmod-ipv6 @!LINUX_2_6_27 KCONFIG:=CONFIG_IP6_NF_IPTABLES FILES:=$(foreach mod,$(IPT_IPV6-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) - AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPV6-m))) + AUTOLOAD:=$(call AutoLoad,49,$(notdir $(IPT_IPV6-m))) endef define KernelPackage/ip6tables/description @@ -293,7 +376,7 @@ define KernelPackage/arptables TITLE:=ARP firewalling modules FILES:=$(LINUX_DIR)/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX) KCONFIG:=CONFIG_IP_NF_ARPTABLES - AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,$(wildcard $(LINUX_DIR)/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX))))) + AUTOLOAD:=$(call AutoLoad,49,$(notdir $(patsubst %.ko,%,$(wildcard $(LINUX_DIR)/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX))))) endef define KernelPackage/arptables/description @@ -302,14 +385,14 @@ endef $(eval $(call KernelPackage,arptables)) - define KernelPackage/ebtables SUBMENU:=$(NF_MENU) TITLE:=Bridge firewalling modules DEPENDS:=@LINUX_2_6 FILES:=$(LINUX_DIR)/net/bridge/netfilter/*.$(LINUX_KMOD_SUFFIX) - KCONFIG:=CONFIG_BRIDGE_NF_EBTABLES - AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,ebtables.ko $(wildcard $(LINUX_DIR)/net/bridge/netfilter/ebtable_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(LINUX_DIR)/net/bridge/netfilter/ebt_*.$(LINUX_KMOD_SUFFIX))))) + KCONFIG:=CONFIG_BRIDGE_NETFILTER=y \ + CONFIG_BRIDGE_NF_EBTABLES + AUTOLOAD:=$(call AutoLoad,49,$(notdir $(patsubst %.ko,%,ebtables.ko $(wildcard $(LINUX_DIR)/net/bridge/netfilter/ebtable_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(LINUX_DIR)/net/bridge/netfilter/ebt_*.$(LINUX_KMOD_SUFFIX))))) endef define KernelPackage/ebtables/description