X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/5e9bcc13ca9601f8c64993a34b31b8f0d4c7159c..cccec9f4b412fdbd076e384bb1eb89e5edcee6f5:/package/kernel/modules/netfilter.mk

diff --git a/package/kernel/modules/netfilter.mk b/package/kernel/modules/netfilter.mk
index 45ae41f92..d19a16da3 100644
--- a/package/kernel/modules/netfilter.mk
+++ b/package/kernel/modules/netfilter.mk
@@ -1,3 +1,4 @@
+
 #
 # Copyright (C) 2006-2008 OpenWrt.org
 #
@@ -20,29 +21,39 @@ endef
 define KernelPackage/ipt-core/description
  Netfilter core kernel modules
  Includes:
+ - comment (2.6)
  - limit
  - LOG
  - mac
  - multiport
- - TCPMSS
  - REJECT
+ - TCPMSS
 endef
 
 $(eval $(call KernelPackage,ipt-core))
 
 
-define KernelPackage/ipt-conntrack
+define KernelPackage/ipt/Depends
   SUBMENU:=$(NF_MENU)
+  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))
   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:
+ - conntrack
+ - defrag (2.6)
+ - iptables_raw
+ - NOTRACK
  - state
 endef
 
@@ -50,12 +61,11 @@ $(eval $(call KernelPackage,ipt-conntrack))
 
 
 define KernelPackage/ipt-conntrack-extra
-  SUBMENU:=$(NF_MENU)
+$(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))
   AUTOLOAD:=$(call AutoLoad,42,$(notdir $(IPT_CONNTRACK_EXTRA-m)))
-  DEPENDS:= kmod-ipt-core +kmod-ipt-conntrack
 endef
 
 define KernelPackage/ipt-conntrack-extra/description
@@ -66,82 +76,82 @@ define KernelPackage/ipt-conntrack-extra/description
  - conntrack
  - helper
  - recent
- - NOTRACK
 endef
 
 $(eval $(call KernelPackage,ipt-conntrack-extra))
 
 
 define KernelPackage/ipt-filter
-  SUBMENU:=$(NF_MENU)
+$(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))
   AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_FILTER-m)))
-  DEPENDS:= kmod-ipt-core @LINUX_2_4||+kmod-textsearch
 endef
 
 define KernelPackage/ipt-filter/description
  Netfilter (IPv4) kernel modules for packet content inspection
  Includes:
- - ipt_layer7
- - ipt_string
+ - layer7
+ - string
 endef
 
 $(eval $(call KernelPackage,ipt-filter))
 
 
 define KernelPackage/ipt-ipopt
-  SUBMENU:=$(NF_MENU)
+$(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))
   AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_IPOPT-m)))
-  DEPENDS:= kmod-ipt-core
 endef
 
 define KernelPackage/ipt-ipopt/description
  Netfilter (IPv4) modules for matching/changing IP packet options
  Includes:
- - ipt_CLASSIFY
- - ipt_dscp/DSCP
- - ipt_ecn/ECN
- - ipt_length
- - ipt_tos/TOS
- - ipt_tcpmms
- - ipt_ttl/TTL
- - ipt_unclean
+ - CLASSIFY
+ - dscp/DSCP
+ - ecn/ECN
+ - hl/HL (2.6.30 and later)
+ - length
+ - mark/MARK
+ - statistic (2.6)
+ - tcpmss
+ - time
+ - tos/TOS (prior to 2.6.25)
+ - ttl/TTL (prior to 2.6.30)
+ - unclean
 endef
 
 $(eval $(call KernelPackage,ipt-ipopt))
 
 
 define KernelPackage/ipt-ipsec
-  SUBMENU:=$(NF_MENU)
+$(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))
   AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_IPSEC-m)))
-  DEPENDS:= kmod-ipt-core
 endef
 
 define KernelPackage/ipt-ipsec/description
  Netfilter (IPv4) modules for matching IPSec packets
  Includes:
- - ipt_ah
- - ipt_esp
+ - ah
+ - esp
+ - policy (2.6)
 endef
 
 $(eval $(call KernelPackage,ipt-ipsec))
 
 
 define KernelPackage/ipt-nat
-  SUBMENU:=$(NF_MENU)
+$(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))
   AUTOLOAD:=$(call AutoLoad,42,$(notdir $(IPT_NAT-m)))
-  DEPENDS:= kmod-ipt-core +kmod-ipt-conntrack
 endef
 
 define KernelPackage/ipt-nat/description
@@ -154,18 +164,17 @@ $(eval $(call KernelPackage,ipt-nat))
 
 
 define KernelPackage/ipt-nat-extra
-  SUBMENU:=$(NF_MENU)
+$(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))
   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
+ - MIRROR (2.4)
  - NETMAP
  - REDIRECT
 endef
@@ -174,61 +183,56 @@ $(eval $(call KernelPackage,ipt-nat-extra))
 
 
 define KernelPackage/ipt-nathelper
-  SUBMENU:=$(NF_MENU)
+$(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))
   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:
- - conntrack_ftp
- - nat_ftp
- - conntrack_irc
- - nat_irc
- - conntrack_tftp
- - nat_tftp
+ - ftp
+ - irc
+ - tftp
 endef
 
 $(eval $(call KernelPackage,ipt-nathelper))
 
 
 define KernelPackage/ipt-nathelper-extra
-  SUBMENU:=$(NF_MENU)
+$(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))
   AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_NATHELPER_EXTRA-m)))
-  DEPENDS:= kmod-ipt-core +kmod-ipt-nat +kmod-textsearch
 endef
 
 define KernelPackage/ipt-nathelper-extra/description
  Extra Netfilter (IPv4) Conntrack and NAT helpers
  Includes:
- - ip_conntrack_amanda
- - ip_conntrack_proto_gre
- - ip_nat_proto_gre
- - ip_conntrack_pptp
- - ip_nat_pptp
- - ip_conntrack_sip
- - ip_nat_sip
- - ip_nat_snmp_basic
+ - amanda
+ - h323
+ - mms
+ - pptp (2.6)
+ - proto_gre (2.6)
+ - rtsp
+ - sip (2.6)
+ - snmp_basic
 endef
 
 $(eval $(call KernelPackage,ipt-nathelper-extra))
 
 
 define KernelPackage/ipt-imq
-  SUBMENU:=$(NF_MENU)
+$(call KernelPackage/ipt/Depends,)
   TITLE:=Intermediate Queueing support
   KCONFIG:= \
 	CONFIG_IMQ \
 	CONFIG_IMQ_BEHAVIOR_BA=y \
 	CONFIG_IMQ_NUM_DEVS=2 \
-	CONFIG_IP_NF_TARGET_IMQ
+	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))
@@ -236,7 +240,6 @@ define KernelPackage/ipt-imq
 	imq \
 	$(IPT_IMQ-m) \
   ))
-  DEPENDS:= kmod-ipt-core
 endef
 
 define KernelPackage/ipt-imq/description
@@ -247,12 +250,11 @@ $(eval $(call KernelPackage,ipt-imq))
 
 
 define KernelPackage/ipt-queue
-  SUBMENU:=$(NF_MENU)
+$(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))
   AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_QUEUE-m)))
-  DEPENDS:= kmod-ipt-core
 endef
 
 define KernelPackage/ipt-queue/description
@@ -265,86 +267,55 @@ $(eval $(call KernelPackage,ipt-queue))
 
 
 define KernelPackage/ipt-ulog
-  SUBMENU:=$(NF_MENU)
+$(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))
   AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_ULOG-m)))
-  DEPENDS:= kmod-ipt-core
 endef
 
 define KernelPackage/ipt-ulog/description
  Netfilter (IPv4) module for user-space packet logging
  Includes:
- - ipt_ULOG
+ - ULOG
 endef
 
 $(eval $(call KernelPackage,ipt-ulog))
 
 
 define KernelPackage/ipt-iprange
-  SUBMENU:=$(NF_MENU)
+$(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))
   AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_IPRANGE-m)))
-  DEPENDS:= kmod-ipt-core
 endef
 
 define KernelPackage/ipt-iprange/description
  Netfilter (IPv4) module for matching ip ranges
  Includes:
- - ipt_IPRANGE
+ - iprange
 endef
 
 $(eval $(call KernelPackage,ipt-iprange))
 
 
-define KernelPackage/ipt-ipset
-  SUBMENU:=$(NF_MENU)
-  TITLE:=IPSET Modules
-  KCONFIG:=$(KCONFIG_IPT_IPSET)
-  FILES:=$(foreach mod,$(IPT_IPSET-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
-  AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_IPSET-m)))
-  DEPENDS:= kmod-ipt-core
-endef
-
-define KernelPackage/ipt-ipset/description
- Netfilter kernel modules for ipset
- Includes:
- - ip_set
- - ip_set_iphash
- - ip_set_ipmap
- - ip_set_ipporthash
- - ip_set_iptree
- - ip_set_iptreemap
- - ip_set_macipmap
- - ip_set_nethash
- - ip_set_portmap
- - ipt_set
- - ipt_SET
-endef
-
-$(eval $(call KernelPackage,ipt-ipset))
-
-
 define KernelPackage/ipt-extra
-  SUBMENU:=$(NF_MENU)
+$(call KernelPackage/ipt/Depends,)
   TITLE:=Extra modules
   KCONFIG:=$(KCONFIG_IPT_EXTRA)
   FILES:=$(foreach mod,$(IPT_EXTRA-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
   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_owner
- - ipt_physdev
- - ipt_pkttype
- - ipt_recent
- - iptable_raw
- - xt_NOTRACK
+ - condition (2.4 only)
+ - owner
+ - physdev (if bridge support was enabled in kernel)
+ - pkttype
+ - quota
 endef
 
 $(eval $(call KernelPackage,ipt-extra))
@@ -354,7 +325,7 @@ define KernelPackage/ip6tables
   SUBMENU:=$(NF_MENU)
   TITLE:=IPv6 modules
   DEPENDS:=+kmod-ipv6
-  KCONFIG:=CONFIG_IP6_NF_IPTABLES
+  KCONFIG:=$(KCONFIG_IPT_IPV6)
   FILES:=$(foreach mod,$(IPT_IPV6-m),$(LINUX_DIR)/net/$(mod).$(LINUX_KMOD_SUFFIX))
   AUTOLOAD:=$(call AutoLoad,49,$(notdir $(IPT_IPV6-m)))
 endef
@@ -370,8 +341,10 @@ define KernelPackage/arptables
   SUBMENU:=$(NF_MENU)
   TITLE:=ARP firewalling modules
   FILES:=$(LINUX_DIR)/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX)
-  KCONFIG:=CONFIG_IP_NF_ARPTABLES
-  AUTOLOAD:=$(call AutoLoad,49,$(notdir $(patsubst %.ko,%,$(wildcard $(LINUX_DIR)/net/ipv4/netfilter/arp*.$(LINUX_KMOD_SUFFIX)))))
+  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)))))
 endef
 
 define KernelPackage/arptables/description
@@ -380,23 +353,80 @@ 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)
+  FILES:=$(foreach mod,$(EBTABLES-m),$(LINUX_DIR)/net/$(mod).$(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)))))
+	$(KCONFIG_EBTABLES)
+  AUTOLOAD:=$(call AutoLoad,49,$(notdir $(EBTABLES-m)))
 endef
 
 define KernelPackage/ebtables/description
- Kernel modules for Ethernet Bridge firewalling
+  ebtables is a general, extensible frame/packet identification
+  framework. It provides you to do Ethernet
+  filtering/NAT/brouting on the Ethernet bridge.
 endef
 
 $(eval $(call KernelPackage,ebtables))
 
 
+define KernelPackage/ebtables/Depends
+  SUBMENU:=$(NF_MENU)
+  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))
+  KCONFIG:=$(KCONFIG_EBTABLES_IP4)
+  AUTOLOAD:=$(call AutoLoad,49,$(notdir $(EBTABLES_IP4-m)))
+endef
+
+define KernelPackage/ebtables-ipv4/description
+ This option adds the IPv4 support to ebtables, which allows basic
+ IPv4 header field filtering, ARP filtering as well as SNAT, DNAT targets.
+endef
+
+$(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))
+  KCONFIG:=$(KCONFIG_EBTABLES_IP6)
+  AUTOLOAD:=$(call AutoLoad,49,$(notdir $(EBTABLES_IP6-m)))
+endef
+
+define KernelPackage/ebtables-ipv6/description
+ This option adds the IPv6 support to ebtables, which allows basic
+ IPv6 header field filtering and target support.
+endef
+
+$(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))
+  KCONFIG:=$(KCONFIG_EBTABLES_WATCHERS)
+  AUTOLOAD:=$(call AutoLoad,49,$(notdir $(EBTABLES_WATCHERS-m)))
+endef
+
+define KernelPackage/ebtables-watchers/description
+ This option adds the log watchers, that you can use in any rule
+ in any ebtables table.
+endef
+
+$(eval $(call KernelPackage,ebtables-watchers))
+
+
 define KernelPackage/nfnetlink
   SUBMENU:=$(NF_MENU)
   TITLE:=Netlink-based userspace interface
@@ -413,10 +443,15 @@ endef
 $(eval $(call KernelPackage,nfnetlink))
 
 
-define KernelPackage/nfnetlink-log
+define KernelPackage/nfnetlink/Depends
   SUBMENU:=$(NF_MENU)
+  DEPENDS:=@LINUX_2_6 +kmod-nfnetlink $(1)
+endef
+
+
+define KernelPackage/nfnetlink-log
+$(call KernelPackage/nfnetlink/Depends,)
   TITLE:=Netfilter LOG over NFNETLINK interface
-  DEPENDS:=@LINUX_2_6 +kmod-nfnetlink
   FILES:=$(LINUX_DIR)/net/netfilter/nfnetlink_log.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_NETFILTER_NETLINK_LOG
   AUTOLOAD:=$(call AutoLoad,48,nfnetlink_log)
@@ -430,9 +465,8 @@ $(eval $(call KernelPackage,nfnetlink-log))
 
 
 define KernelPackage/nfnetlink-queue
-  SUBMENU:=$(NF_MENU)
+$(call KernelPackage/nfnetlink/Depends,)
   TITLE:=Netfilter QUEUE over NFNETLINK interface
-  DEPENDS:=@LINUX_2_6 +kmod-nfnetlink
   FILES:=$(LINUX_DIR)/net/netfilter/nfnetlink_queue.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_NETFILTER_NETLINK_QUEUE
   AUTOLOAD:=$(call AutoLoad,48,nfnetlink_queue)
@@ -446,9 +480,8 @@ $(eval $(call KernelPackage,nfnetlink-queue))
 
 
 define KernelPackage/nf-conntrack-netlink
-  SUBMENU:=$(NF_MENU)
+$(call KernelPackage/nfnetlink/Depends,+kmod-ipt-conntrack)
   TITLE:=Connection tracking netlink interface
-  DEPENDS:=@LINUX_2_6 +kmod-nfnetlink +kmod-ipt-conntrack
   FILES:=$(LINUX_DIR)/net/netfilter/nf_conntrack_netlink.$(LINUX_KMOD_SUFFIX)
   KCONFIG:=CONFIG_NF_CT_NETLINK
   AUTOLOAD:=$(call AutoLoad,49,nf_conntrack_netlink)