X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=package%2Fkernel%2Fmodules%2Fnetfilter.mk;h=a25dbdef7a46cd090a8413af61793f1dcb1ad9a5;hb=53422248701eea1935d27afadf59c652f572a526;hp=18f9203a477547ba6f257c4bb4f8df4b546f878a;hpb=83790f74ad846ab2a50c71fab34a2d7755df4a95;p=openwrt.git diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk index 18f9203a47..a25dbdef7a 100644 --- a/package/kernel/modules/netfilter.mk +++ b/package/kernel/modules/netfilter.mk @@ -7,6 +7,7 @@ # $Id$ NFMENU:=Netfilter Extensions +include $(INCLUDE_DIR)/netfilter.mk define KernelPackage/ipt-conntrack TITLE:=Modules for connection tracking @@ -17,6 +18,7 @@ define KernelPackage/ipt-conntrack - ipt_conntrack \\\ - ipt_helper \\\ - ipt_connmark/CONNMARK + KCONFIG:=$(KCONFIG_IPT_CONNTRACK) FILES:=$(foreach mod,$(IPT_CONNTRACK-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) SUBMENU:=$(NFMENU) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_CONNTRACK-m))) @@ -31,6 +33,7 @@ define KernelPackage/ipt-filter Includes: \\\ - ipt_ipp2p \\\ - ipt_layer7 + KCONFIG:=$(KCONFIG_IPT_FILTER) FILES:=$(foreach mod,$(IPT_FILTER-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) SUBMENU:=$(NFMENU) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_FILTER-m))) @@ -52,6 +55,7 @@ define KernelPackage/ipt-ipopt - ipt_tcpmms \\\ - ipt_ttl/TTL \\\ - ipt_unclean + KCONFIG:=$(KCONFIG_IPT_IPOPT) FILES:=$(foreach mod,$(IPT_IPOPT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) SUBMENU:=$(NFMENU) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPOPT-m))) @@ -66,6 +70,7 @@ define KernelPackage/ipt-ipsec Includes: \\\ - ipt_ah \\\ - ipt_esp + KCONFIG:=$(KCONFIG_IPT_IPSEC) FILES:=$(foreach mod,$(IPT_IPSEC-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) SUBMENU:=$(NFMENU) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPSEC-m))) @@ -80,6 +85,7 @@ define KernelPackage/ipt-nat Includes: \\\ - ipt_REDIRECT \\\ - ipt_NETMAP + KCONFIG:=$(KCONFIG_IPT_NAT) FILES:=$(foreach mod,$(IPT_NAT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) SUBMENU:=$(NFMENU) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_NAT-m))) @@ -97,6 +103,7 @@ define KernelPackage/ipt-nathelper - ip_conntrack_irc \\\ - ip_nat_irc \\\ - ip_conntrack_tftp + KCONFIG:=$(KCONFIG_IPT_NAT_DEFAULT) FILES:=$(foreach mod,$(IPT_NAT_DEFAULT-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) SUBMENU:=$(NFMENU) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_NAT_DEFAULT-m))) @@ -117,6 +124,7 @@ define KernelPackage/ipt-nathelper-extra - ip_conntrack_sip \\\ - ip_nat_sip \\\ - ip_nat_snmp_basic + KCONFIG:=$(KCONFIG_IPT_NAT_EXTRA) FILES:=$(foreach mod,$(IPT_NAT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) SUBMENU:=$(NFMENU) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_NAT_EXTRA-m))) @@ -127,7 +135,7 @@ define KernelPackage/ipt-imq TITLE:=Intermediate Queueing support DESCRIPTION:=\ Kernel support for Intermediate Queueing devices - KCONFIG:=$(CONFIG_IP_NF_TARGET_IMQ) + KCONFIG:=CONFIG_IP_NF_TARGET_IMQ FILES:=$(LINUX_DIR)/net/ipv4/netfilter/*IMQ*.$(LINUX_KMOD_SUFFIX) $(LINUX_DIR)/drivers/net/imq.$(LINUX_KMOD_SUFFIX) SUBMENU:=$(NFMENU) 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))))) @@ -142,6 +150,7 @@ define KernelPackage/ipt-queue \\\ Includes: \\\ - ipt_QUEUE + KCONFIG:=$(KCONFIG_IPT_QUEUE) FILES:=$(foreach mod,$(IPT_QUEUE-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) SUBMENU:=$(NFMENU) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_QUEUE-m))) @@ -155,12 +164,38 @@ define KernelPackage/ipt-ulog \\\ Includes: \\\ - ipt_ULOG + KCONFIG:=$(KCONFIG_IPT_ULOG) FILES:=$(foreach mod,$(IPT_ULOG-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) SUBMENU:=$(NFMENU) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_ULOG-m))) endef $(eval $(call KernelPackage,ipt-ulog)) +define KernelPackage/ipt-iprange + TITLE:=Module for matching ip ranges + DESCRIPTION:=\ + Netfilter (IPv4) module for matching ip ranges \\\ + \\\ + Includes: \\\ + - ipt_IPRANGE + FILES:=$(LINUX_DIR)/net/ipv4/netfilter/ipt_iprange.$(LINUX_KMOD_SUFFIX) + SUBMENU:=$(NFMENU) + AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPRANGE-m))) +endef +$(eval $(call KernelPackage,ipt-iprange)) + +define KernelPackage/ipt-ipset + TITLE:=IPSET Modules + DESCRIPTION:=\ + Netfilter kernel modules for ipset + KCONFIG:=$(KCONFIG_IPT_IPSET) + FILES:=$(foreach mod,$(IPT_IPSET-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) + SUBMENU:=$(NFMENU) + AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_IPSET-m))) +endef +$(eval $(call KernelPackage,ipt-ipset)) + + define KernelPackage/ipt-extra TITLE:=Extra modules DESCRIPTION:=\ @@ -173,6 +208,7 @@ define KernelPackage/ipt-extra - ipt_recent \\\ - iptable_raw \\\ - xt_NOTRACK + KCONFIG:=$(KCONFIG_IPT_EXTRA) FILES:=$(foreach mod,$(IPT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX)) SUBMENU:=$(NFMENU) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(IPT_EXTRA-m))) @@ -183,7 +219,7 @@ define KernelPackage/ip6tables TITLE:=IPv6 modules DESCRIPTION:=\ Netfilter IPv6 firewalling support - KCONFIG:=$(CONFIG_IP6_NF_IPTABLES) + KCONFIG:=CONFIG_IP6_NF_IPTABLES FILES:=$(LINUX_DIR)/net/ipv6/netfilter/ip*.$(LINUX_KMOD_SUFFIX) SUBMENU:=$(NFMENU) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,$(wildcard $(LINUX_DIR)/net/ipv6/netfilter/ip6_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(LINUX_DIR)/net/ipv6/netfilter/ip6table_*.$(LINUX_KMOD_SUFFIX)) $(wildcard $(LINUX_DIR)/net/ipv6/netfilter/ip6t_*.$(LINUX_KMOD_SUFFIX))))) @@ -196,7 +232,7 @@ define KernelPackage/arptables DESCRIPTION:=\ Kernel modules for ARP firewalling FILES:=$(LINUX_DIR)/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX) - KCONFIG:=$(CONFIG_IP_NF_ARPTABLES) + KCONFIG:=CONFIG_IP_NF_ARPTABLES SUBMENU:=$(NFMENU) AUTOLOAD:=$(call AutoLoad,40,$(notdir $(patsubst %.ko,%,$(wildcard $(LINUX_DIR)/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX))))) endef @@ -207,8 +243,9 @@ define KernelPackage/ebtables TITLE:=Bridge firewalling modules DESCRIPTION:=\ Kernel modules for Ethernet Bridge firewalling + DEPENDS:=@LINUX_2_6 FILES:=$(LINUX_DIR)/net/bridge/netfilter/*.$(LINUX_KMOD_SUFFIX) - KCONFIG:=$(CONFIG_BRIDGE_NF_EBTABLES) + KCONFIG:=CONFIG_BRIDGE_NF_EBTABLES SUBMENU:=$(NFMENU) 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))))) endef