kernel/iptables: add modules for qos-gargoyle

include/netfilter.mk

@@ -114,6 +114,13 @@ $(eval $(call nf_add,IPT_FILTER,CONFIG_NETFILTER_XT_MATCH_BPF, $(P_XT)xt_bpf))
 $(eval $(call nf_add,IPT_IMQ,CONFIG_IP_NF_TARGET_IMQ, $(P_V4)ipt_IMQ))
 $(eval $(call nf_add,IPT_IMQ,CONFIG_NETFILTER_XT_TARGET_IMQ, $(P_XT)xt_IMQ))
 
+# gargoyle-qos
+
+$(eval $(call nf_add,IPT_BANDWIDTH,CONFIG_IP_NF_MATCH_BANDWIDTH, $(P_V4)ipt_bandwidth))
+$(eval $(call nf_add,IPT_TIMERANGE,CONFIG_IP_NF_MATCH_TIMERANGE, $(P_V4)ipt_timerange))
+$(eval $(call nf_add,IPT_WEBMON,CONFIG_IP_NF_MATCH_WEBMON, $(P_V4)ipt_webmon))
+$(eval $(call nf_add,IPT_WEBURL,CONFIG_IP_NF_MATCH_WEBURL, $(P_V4)ipt_weburl))
+
 # ipopt
 
 $(eval $(call nf_add,IPT_IPOPT,CONFIG_NETFILTER_XT_MATCH_DSCP, $(P_XT)xt_dscp))

package/kernel/linux/modules/netfilter.mk

@@ -508,6 +508,50 @@ endef
 $(eval $(call KernelPackage,ipt-imq))
 
 
+define KernelPackage/ipt-bandwidth
+  SUBMENU:=$(NF_MENU)
+  TITLE:=bandwidth
+  KCONFIG:=$(KCONFIG_IPT_BANDWIDTH)
+  FILES:=$(LINUX_DIR)/net/ipv4/netfilter/*bandwidth*.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_BANDWIDTH-m)))
+	DEPENDS:= kmod-ipt-core
+endef
+$(eval $(call KernelPackage,ipt-bandwidth))
+
+
+define KernelPackage/ipt-timerange
+  SUBMENU:=$(NF_MENU)
+  TITLE:=timerange
+  KCONFIG:=$(KCONFIG_IPT_TIMERANGE)
+  FILES:=$(LINUX_DIR)/net/ipv4/netfilter/*timerange*.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_TIMERANGE-m)))
+	DEPENDS:= kmod-ipt-core
+endef
+$(eval $(call KernelPackage,ipt-timerange))
+
+
+define KernelPackage/ipt-webmon
+  SUBMENU:=$(NF_MENU)
+  TITLE:=webmon
+  KCONFIG:=$(KCONFIG_IPT_WEBMON)
+  FILES:=$(LINUX_DIR)/net/ipv4/netfilter/*webmon*.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_WEBMON-m)))
+	DEPENDS:= kmod-ipt-core
+endef
+$(eval $(call KernelPackage,ipt-webmon))
+
+
+define KernelPackage/ipt-weburl
+  SUBMENU:=$(NF_MENU)
+  TITLE:=weburl
+  KCONFIG:=$(KCONFIG_IPT_WEBURL)
+  FILES:=$(LINUX_DIR)/net/ipv4/netfilter/*weburl*.$(LINUX_KMOD_SUFFIX)
+  AUTOLOAD:=$(call AutoLoad,45,$(notdir $(IPT_WEBURL-m)))
+	DEPENDS:= kmod-ipt-core
+endef
+$(eval $(call KernelPackage,ipt-weburl))
+
+
 define KernelPackage/ipt-raw6
   TITLE:=Netfilter IPv6 raw table support
   KCONFIG:=CONFIG_IP6_NF_RAW

package/network/utils/iptables/Makefile

@@ -195,6 +195,26 @@ iptables extension for IMQ support.
 
 endef
 
+define Package/iptables-mod-bandwidth
+$(call Package/iptables/Module, +kmod-ipt-bandwidth)
+  TITLE:=bandwidth option extensions
+endef
+
+define Package/iptables-mod-timerange
+$(call Package/iptables/Module, +kmod-ipt-timerange)
+  TITLE:=timerange option extensions
+endef
+
+define Package/iptables-mod-webmon
+$(call Package/iptables/Module, +kmod-ipt-webmon)
+  TITLE:=webmon option extensions
+endef
+
+define Package/iptables-mod-weburl
+$(call Package/iptables/Module, +kmod-ipt-weburl)
+  TITLE:=weburl option extensions
+endef
+
 define Package/iptables-mod-ipopt
 $(call Package/iptables/Module, +kmod-ipt-ipopt)
   TITLE:=IP/Packet option extensions
@@ -706,6 +726,10 @@ $(eval $(call BuildPlugin,iptables-mod-physdev,$(IPT_PHYSDEV-m)))
 $(eval $(call BuildPlugin,iptables-mod-filter,$(IPT_FILTER-m)))
 $(eval $(call BuildPlugin,iptables-mod-cgroup,$(IPT_CGROUP-m)))
 $(eval $(call BuildPlugin,iptables-mod-imq,$(IPT_IMQ-m)))
+$(eval $(call BuildPlugin,iptables-mod-bandwidth,$(IPT_BANDWIDTH-m)))
+$(eval $(call BuildPlugin,iptables-mod-timerange,$(IPT_TIMERANGE-m)))
+$(eval $(call BuildPlugin,iptables-mod-webmon,$(IPT_WEBMON-m)))
+$(eval $(call BuildPlugin,iptables-mod-weburl,$(IPT_WEBURL-m)))
 $(eval $(call BuildPlugin,iptables-mod-ipopt,$(IPT_IPOPT-m)))
 $(eval $(call BuildPlugin,iptables-mod-ipsec,$(IPT_IPSEC-m)))
 $(eval $(call BuildPlugin,iptables-mod-nat-extra,$(IPT_NAT_EXTRA-m)))

target/linux/generic/config-4.14

@@ -5676,3 +5676,7 @@ CONFIG_IMQ_NUM_DEVS=2
 # CONFIG_IMQ_BEHAVIOR_AB is not set
 CONFIG_IMQ_BEHAVIOR_BA=y
 # CONFIG_IMQ_BEHAVIOR_BB is not set
+CONFIG_IP_NF_MATCH_WEBURL=m
+CONFIG_IP_NF_MATCH_WEBMON=m
+CONFIG_IP_NF_MATCH_TIMERANGE=m
+CONFIG_IP_NF_MATCH_BANDWIDTH=m

target/linux/generic/config-4.19

@@ -6102,3 +6102,7 @@ CONFIG_IMQ_NUM_DEVS=2
 # CONFIG_IMQ_BEHAVIOR_AB is not set
 CONFIG_IMQ_BEHAVIOR_BA=y
 # CONFIG_IMQ_BEHAVIOR_BB is not set
+CONFIG_IP_NF_MATCH_WEBURL=m
+CONFIG_IP_NF_MATCH_WEBMON=m
+CONFIG_IP_NF_MATCH_TIMERANGE=m
+CONFIG_IP_NF_MATCH_BANDWIDTH=m

target/linux/generic/config-4.9

@@ -5331,3 +5331,7 @@ CONFIG_IMQ_NUM_DEVS=2
 # CONFIG_IMQ_BEHAVIOR_AB is not set
 CONFIG_IMQ_BEHAVIOR_BA=y
 # CONFIG_IMQ_BEHAVIOR_BB is not set
+CONFIG_IP_NF_MATCH_WEBURL=m
+CONFIG_IP_NF_MATCH_WEBMON=m
+CONFIG_IP_NF_MATCH_TIMERANGE=m
+CONFIG_IP_NF_MATCH_BANDWIDTH=m