115 lines
4.1 KiB
Diff
115 lines
4.1 KiB
Diff
|
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
||
|
|
Date: Mon, 9 Apr 2018 19:41:26 +0200
|
||
|
|
Subject: iptables: split physdev match out as a separate package
|
||
|
|
|
||
|
|
Split physdev match out of ipt-extra to allow installing ipt-extra without
|
||
|
|
pulling in br-netfilter.
|
||
|
|
|
||
|
|
Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
|
||
|
|
|
||
|
|
diff --git a/include/netfilter.mk b/include/netfilter.mk
|
||
|
|
index 39c8e7c90fab2ba14cd75c80d1e357dd23ae6a1b..79ae3d5343ed77b559f50f40bb8a73a33dd13314 100644
|
||
|
|
--- a/include/netfilter.mk
|
||
|
|
+++ b/include/netfilter.mk
|
||
|
|
@@ -89,12 +89,14 @@ $(eval $(if $(NF_KMOD),,$(call nf_add,IPT_CONNTRACK_EXTRA,CONFIG_NETFILTER_XT_CO
|
||
|
|
|
||
|
|
$(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_ADDRTYPE, $(if $(NF_KMOD),$(P_XT)xt_addrtype,$(P_XT)ipt_addrtype)))
|
||
|
|
$(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_OWNER, $(P_XT)xt_owner))
|
||
|
|
-$(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_PHYSDEV, $(P_XT)xt_physdev))
|
||
|
|
$(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_PKTTYPE, $(P_XT)xt_pkttype))
|
||
|
|
$(eval $(call nf_add,IPT_EXTRA,CONFIG_NETFILTER_XT_MATCH_QUOTA, $(P_XT)xt_quota))
|
||
|
|
|
||
|
|
#$(eval $(call nf_add,IPT_EXTRA,CONFIG_IP_NF_TARGET_ROUTE, $(P_V4)ipt_ROUTE))
|
||
|
|
|
||
|
|
+# physdev
|
||
|
|
+
|
||
|
|
+$(eval $(call nf_add,IPT_PHYSDEV,CONFIG_NETFILTER_XT_MATCH_PHYSDEV, $(P_XT)xt_physdev))
|
||
|
|
|
||
|
|
# filter
|
||
|
|
|
||
|
|
@@ -347,6 +349,7 @@ IPT_BUILTIN += $(NF_CONNTRACK6-y)
|
||
|
|
IPT_BUILTIN += $(IPT_CONNTRACK-y)
|
||
|
|
IPT_BUILTIN += $(IPT_CONNTRACK_EXTRA-y)
|
||
|
|
IPT_BUILTIN += $(IPT_EXTRA-y)
|
||
|
|
+IPT_BUILTIN += $(IPT_PHYSDEV-y)
|
||
|
|
IPT_BUILTIN += $(IPT_FILTER-y)
|
||
|
|
IPT_BUILTIN += $(IPT_IPOPT-y)
|
||
|
|
IPT_BUILTIN += $(IPT_IPRANGE-y)
|
||
|
|
diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk
|
||
|
|
index 34eefcd892b9e8b3157603fa47578d0afc65dc4b..a71904673ae53bffcc9fd88291520aacb4a4f8d7 100644
|
||
|
|
--- a/package/kernel/linux/modules/netfilter.mk
|
||
|
|
+++ b/package/kernel/linux/modules/netfilter.mk
|
||
|
|
@@ -604,7 +604,7 @@ define KernelPackage/ipt-extra
|
||
|
|
KCONFIG:=$(KCONFIG_IPT_EXTRA)
|
||
|
|
FILES:=$(foreach mod,$(IPT_EXTRA-m),$(LINUX_DIR)/net/$(mod).ko)
|
||
|
|
AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_EXTRA-m)))
|
||
|
|
- $(call AddDepends/ipt,+kmod-br-netfilter)
|
||
|
|
+ $(call AddDepends/ipt)
|
||
|
|
endef
|
||
|
|
|
||
|
|
define KernelPackage/ipt-extra/description
|
||
|
|
@@ -612,7 +612,6 @@ define KernelPackage/ipt-extra/description
|
||
|
|
Includes:
|
||
|
|
- addrtype
|
||
|
|
- owner
|
||
|
|
- - physdev (if bridge support was enabled in kernel)
|
||
|
|
- pkttype
|
||
|
|
- quota
|
||
|
|
endef
|
||
|
|
@@ -620,6 +619,21 @@ endef
|
||
|
|
$(eval $(call KernelPackage,ipt-extra))
|
||
|
|
|
||
|
|
|
||
|
|
+define KernelPackage/ipt-physdev
|
||
|
|
+ TITLE:=physdev module
|
||
|
|
+ KCONFIG:=$(KCONFIG_IPT_PHYSDEV)
|
||
|
|
+ FILES:=$(foreach mod,$(IPT_PHYSDEV-m),$(LINUX_DIR)/net/$(mod).ko)
|
||
|
|
+ AUTOLOAD:=$(call AutoProbe,$(notdir $(IPT_PHYSDEV-m)))
|
||
|
|
+ $(call AddDepends/ipt,+kmod-br-netfilter)
|
||
|
|
+endef
|
||
|
|
+
|
||
|
|
+define KernelPackage/ipt-physdev/description
|
||
|
|
+ The iptables physdev kernel module
|
||
|
|
+endef
|
||
|
|
+
|
||
|
|
+$(eval $(call KernelPackage,ipt-physdev))
|
||
|
|
+
|
||
|
|
+
|
||
|
|
define KernelPackage/ip6tables
|
||
|
|
SUBMENU:=$(NF_MENU)
|
||
|
|
TITLE:=IPv6 modules
|
||
|
|
diff --git a/package/network/utils/iptables/Makefile b/package/network/utils/iptables/Makefile
|
||
|
|
index 9761ed1820b5c092292d25aef28f8f9a8ffa91a6..af5ed8c6245a9d52f5aea695e71b08ac6f3e6eca 100644
|
||
|
|
--- a/package/network/utils/iptables/Makefile
|
||
|
|
+++ b/package/network/utils/iptables/Makefile
|
||
|
|
@@ -321,12 +321,20 @@ Other extra iptables extensions.
|
||
|
|
- addrtype
|
||
|
|
- condition
|
||
|
|
- owner
|
||
|
|
- - physdev (if ebtables is enabled)
|
||
|
|
- pkttype
|
||
|
|
- quota
|
||
|
|
|
||
|
|
endef
|
||
|
|
|
||
|
|
+define Package/iptables-mod-physdev
|
||
|
|
+$(call Package/iptables/Module, +kmod-ipt-physdev)
|
||
|
|
+ TITLE:=physdev iptables extension
|
||
|
|
+endef
|
||
|
|
+
|
||
|
|
+define Package/iptables-mod-physdev/description
|
||
|
|
+The iptables physdev match.
|
||
|
|
+endef
|
||
|
|
+
|
||
|
|
define Package/iptables-mod-led
|
||
|
|
$(call Package/iptables/Module, +kmod-ipt-led)
|
||
|
|
TITLE:=LED trigger iptables extension
|
||
|
|
@@ -561,6 +569,7 @@ endef
|
||
|
|
$(eval $(call BuildPackage,iptables))
|
||
|
|
$(eval $(call BuildPlugin,iptables-mod-conntrack-extra,$(IPT_CONNTRACK_EXTRA-m)))
|
||
|
|
$(eval $(call BuildPlugin,iptables-mod-extra,$(IPT_EXTRA-m)))
|
||
|
|
+$(eval $(call BuildPlugin,iptables-mod-physdev,$(IPT_PHYSDEV-m)))
|
||
|
|
$(eval $(call BuildPlugin,iptables-mod-filter,$(IPT_FILTER-m)))
|
||
|
|
$(eval $(call BuildPlugin,iptables-mod-ipopt,$(IPT_IPOPT-m)))
|
||
|
|
$(eval $(call BuildPlugin,iptables-mod-ipsec,$(IPT_IPSEC-m)))
|