KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ipset: use in-tree kernel modules to fix crash issues

Browse source 
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 44883
This commit is contained in:
Felix Fietkau 2015-03-19 11:58:17 +00:00
parent e3d19988cf
commit 31681f0878
2 changed files with 48 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
package/kernel/linux/modules/netfilter.mk
View file

@ -223,6 +223,54 @@ endef
$(eval $(call KernelPackage,ipt-ipsec)) $(eval $(call KernelPackage,ipt-ipsec))
IPSET_MODULES:= \
ipset/ip_set \
ipset/ip_set_bitmap_ip \
ipset/ip_set_bitmap_ipmac \
ipset/ip_set_bitmap_port \
ipset/ip_set_hash_ip \
ipset/ip_set_hash_ipmark \
ipset/ip_set_hash_ipport \
ipset/ip_set_hash_ipportip \
ipset/ip_set_hash_ipportnet \
ipset/ip_set_hash_mac \
ipset/ip_set_hash_netportnet \
ipset/ip_set_hash_net \
ipset/ip_set_hash_netnet \
ipset/ip_set_hash_netport \
ipset/ip_set_hash_netiface \
ipset/ip_set_list_set \
xt_set
define KernelPackage/ipt-ipset
SUBMENU:=Netfilter Extensions
TITLE:=IPset netfilter modules
DEPENDS+= +kmod-ipt-core +kmod-nfnetlink
KCONFIG:= \
CONFIG_IP_SET \
CONFIG_IP_SET_MAX=256 \
CONFIG_NETFILTER_XT_SET \
CONFIG_IP_SET_BITMAP_IP \
CONFIG_IP_SET_BITMAP_IPMAC \
CONFIG_IP_SET_BITMAP_PORT \
CONFIG_IP_SET_HASH_IP \
CONFIG_IP_SET_HASH_IPMARK \
CONFIG_IP_SET_HASH_IPPORT \
CONFIG_IP_SET_HASH_IPPORTIP \
CONFIG_IP_SET_HASH_IPPORTNET \
CONFIG_IP_SET_HASH_MAC \
CONFIG_IP_SET_HASH_NET \
CONFIG_IP_SET_HASH_NETNET \
CONFIG_IP_SET_HASH_NETIFACE \
CONFIG_IP_SET_HASH_NETPORT \
CONFIG_IP_SET_HASH_NETPORTNET \
CONFIG_IP_SET_LIST_SET \
CONFIG_NET_EMATCH_IPSET=n
FILES:=$(foreach mod,$(IPSET_MODULES),$(LINUX_DIR)/net/netfilter/$(mod).ko)
AUTOLOAD:=$(call AutoLoad,49,$(notdir $(IPSET_MODULES)))
endef
$(eval $(call KernelPackage,ipt-ipset))
define KernelPackage/ipt-nat define KernelPackage/ipt-nat
TITLE:=Basic NAT targets TITLE:=Basic NAT targets

26
package/network/utils/ipset/Makefile
View file

@ -39,25 +39,8 @@ MAKE_FLAGS += \
ARCH="$(LINUX_KARCH)" \ ARCH="$(LINUX_KARCH)" \
SHELL="$(BASH)" SHELL="$(BASH)"
IPSET_MODULES:= \
ipset/ip_set \
ipset/ip_set_bitmap_ip \
ipset/ip_set_bitmap_ipmac \
ipset/ip_set_bitmap_port \
ipset/ip_set_hash_ip \
ipset/ip_set_hash_ipmark \
ipset/ip_set_hash_ipport \
ipset/ip_set_hash_ipportip \
ipset/ip_set_hash_ipportnet \
ipset/ip_set_hash_net \
ipset/ip_set_hash_netiface \
ipset/ip_set_hash_netport \
ipset/ip_set_list_set \
xt_set \
define Build/Compile define Build/Compile
$(call Build/Compile/Default) $(call Build/Compile/Default)
$(call Build/Compile/Default,modules)
endef endef
define Package/ipset/install define Package/ipset/install
@ -67,13 +50,4 @@ define Package/ipset/install
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libipset*.so* $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipset*.so* $(1)/usr/lib/
endef endef
define KernelPackage/ipt-ipset
SUBMENU:=Netfilter Extensions
TITLE:=IPset netfilter modules
DEPENDS+= +kmod-ipt-core +kmod-nfnetlink
FILES:=$(foreach mod,$(IPSET_MODULES),$(PKG_BUILD_DIR)/kernel/net/netfilter/$(mod).ko)
AUTOLOAD:=$(call AutoLoad,49,$(notdir $(IPSET_MODULES)))
endef
$(eval $(call BuildPackage,ipset)) $(eval $(call BuildPackage,ipset))
$(eval $(call KernelPackage,ipt-ipset))