mptcp/openmptcprouter-feeds
1
0
Fork 0
mirror of https://github.com/Ysurac/openmptcprouter-feeds.git synced 2025-03-09 15:40:03 +00:00
Code Issues Releases Wiki Activity

fix

Browse source
This commit is contained in:
suyuan 2023-07-28 14:48:47 +08:00
parent e24dcf6f87
commit 4679d28b1f
3 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

13
ndpi-netfilter2/Makefile
View file

@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=ndpi-netfilter2 PKG_NAME:=ndpi-netfilter2
PKG_RELEASE:=4 PKG_RELEASE:=4
PKG_REV:=fbb2104d125a13db3b8c7fdc34ea0e3fcfe92d12 PKG_REV:=3deea541af037b663b1b83a055b80d9a06a0afd2
PKG_VERSION:=4-$(PKG_REV) PKG_VERSION:=4-$(PKG_REV)
PKG_SOURCE_PROTO:=git PKG_SOURCE_PROTO:=git
@ -21,6 +21,7 @@ PKG_SOURCE_URL:=https://github.com/vel21ripn/nDPI.git
PKG_SOURCE_VERSION:=$(PKG_REV) PKG_SOURCE_VERSION:=$(PKG_REV)
PKG_BUILD_PARALLEL:=0 PKG_BUILD_PARALLEL:=0
PKG_FORTIFY_SOURCE:=0
PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) PKG_BUILD_DIR:=$(KERNEL_BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
@ -34,7 +35,8 @@ define Package/iptables-mod-ndpi
URL:=http://www.ntop.org/products/ndpi/ URL:=http://www.ntop.org/products/ndpi/
# DEPENDS:=+iptables +iptables-mod-conntrack-extra +kmod-ipt-ndpi +libpcap # DEPENDS:=+iptables +iptables-mod-conntrack-extra +kmod-ipt-ndpi +libpcap
# DEPENDS:=+iptables +kmod-ipt-ndpi +libpcap @(LINUX_5_4||LINUX_5_15||TARGET_x86_64) # DEPENDS:=+iptables +kmod-ipt-ndpi +libpcap @(LINUX_5_4||LINUX_5_15||TARGET_x86_64)
DEPENDS:=+iptables +kmod-ipt-ndpi +libpcap @(LINUX_5_4||LINUX_5_15) # DEPENDS:=+iptables +kmod-ipt-ndpi +libpcap @(LINUX_5_4||LINUX_5_15) @!TARGET_ramips
DEPENDS:=+iptables +kmod-ipt-ndpi +libpcap @!TARGET_ramips
MAINTAINER:=Ycarus (Yannick Chabanois) <ycarus@zugaina.org> MAINTAINER:=Ycarus (Yannick Chabanois) <ycarus@zugaina.org>
endef endef
@ -50,7 +52,7 @@ MAKE_PATH:=ndpi-netfilter
MAKE_FLAGS += \ MAKE_FLAGS += \
KERNEL_DIR="$(LINUX_DIR)" \ KERNEL_DIR="$(LINUX_DIR)" \
MODULES_DIR="$(TARGET_MODULES_DIR)" \ MODULES_DIR="$(TARGET_MODULES_DIR)" \
NDPI_PATH=$(PKG_BUILD_DIR)/ndpi-netfilter \ NDPI_PATH=$(PKG_BUILD_DIR)/ndpi-netfilter
ifeq ($ARCH),aarch64) ifeq ($ARCH),aarch64)
MAKE_FLAGS += ARCH="arm64" MAKE_FLAGS += ARCH="arm64"
@ -74,14 +76,15 @@ define KernelPackage/ipt-ndpi
SUBMENU:=Netfilter Extensions SUBMENU:=Netfilter Extensions
TITLE:= nDPI net netfilter module TITLE:= nDPI net netfilter module
# DEPENDS:=+kmod-nf-conntrack +kmod-nf-conntrack-netlink +kmod-ipt-compat-xtables +libpcap @(LINUX_5_4||LINUX_5_15||TARGET_x86_64) # DEPENDS:=+kmod-nf-conntrack +kmod-nf-conntrack-netlink +kmod-ipt-compat-xtables +libpcap @(LINUX_5_4||LINUX_5_15||TARGET_x86_64)
DEPENDS:=+kmod-nf-conntrack +kmod-nf-conntrack-netlink +kmod-ipt-compat-xtables +libpcap @(LINUX_5_4||LINUX_5_15) # DEPENDS:=+kmod-nf-conntrack +kmod-nf-conntrack-netlink +kmod-ipt-compat-xtables +libpcap @(LINUX_5_4||LINUX_5_15) @!TARGET_ramips
DEPENDS:=+kmod-nf-conntrack +kmod-nf-conntrack-netlink +kmod-ipt-compat-xtables +libpcap @!TARGET_ramips
KCONFIG:=CONFIG_NF_CONNTRACK_LABELS=y \ KCONFIG:=CONFIG_NF_CONNTRACK_LABELS=y \
CONFIG_NETFILTER_XT_MATCH_CONNLABEL=y CONFIG_NETFILTER_XT_MATCH_CONNLABEL=y
FILES:= $(PKG_BUILD_DIR)/ndpi-netfilter/src/xt_ndpi.ko FILES:= $(PKG_BUILD_DIR)/ndpi-netfilter/src/xt_ndpi.ko
AUTOLOAD:=$(call AutoProbe,xt_ndpi) AUTOLOAD:=$(call AutoProbe,xt_ndpi)
# MODPARAMS.xt_ndpi:=ndpi_enable_flow=1 # MODPARAMS.xt_ndpi:=ndpi_enable_flow=1
KCONFIG:=\ KCONFIG:=\
CONFIG_LIVEPATCH=y \ CONFIG_NDPI_HOOK=y \
CONFIG_NF_CONNTRACK=y \ CONFIG_NF_CONNTRACK=y \
CONFIG_NF_CONNTRACK_LABELS=y \ CONFIG_NF_CONNTRACK_LABELS=y \
CONFIG_NETFILTER_XT_MATCH_CONNLABEL=y \ CONFIG_NETFILTER_XT_MATCH_CONNLABEL=y \

2
ndpi-netfilter2/patches/outline-atomics.patch
View file

@ -7,7 +7,7 @@
+cc-option = $(shell if $(CC) -Werror $(1) -S -o /dev/null -xc /dev/null \ +cc-option = $(shell if $(CC) -Werror $(1) -S -o /dev/null -xc /dev/null \
+ > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;) + > /dev/null 2>&1; then echo "$(1)"; else echo "$(2)"; fi ;)
+mno_outline_atomics := $(call cc-option, -mno-outline-atomics, "") +mno_outline_atomics := $(call cc-option, -mno-outline-atomics, "")
+ccflags-y += $(mno_outline_atomics) +ccflags-y += $(mno_outline_atomics) -Wframe-larger-than=2600
#ccflags-y += -Wshadow-local #ccflags-y += -Wshadow-local
# Needed for pahole # Needed for pahole
#ccflags-y += -femit-struct-debug-detailed=any #ccflags-y += -femit-struct-debug-detailed=any

4
ndpi-netfilter2/patches/skbuff-check_fix.patch
View file

@ -4,8 +4,8 @@
KERNEL_DIR := /lib/modules/$(shell uname -r)/build KERNEL_DIR := /lib/modules/$(shell uname -r)/build
endif endif
-ifeq ($(shell test -f $(KERNEL_DIR)/source/include/linux/skbuff.h && grep -qc userid $(KERNEL_DIR)/source/include/linux/skbuff.h),1) -ifeq ($(shell test -f $(KERNEL_DIR)/source/include/linux/skbuff.h && grep -c userid $(KERNEL_DIR)/source/include/linux/skbuff.h),1)
+ifeq ($(shell test -f $(KERNEL_DIR)/include/linux/skbuff.h && shell grep -qc userid $(KERNEL_DIR)/include/linux/skbuff.h),1) +ifeq ($(shell test -f $(KERNEL_DIR)/include/linux/skbuff.h && shell grep -c userid $(KERNEL_DIR)/include/linux/skbuff.h),1)
ccflags-y += -DUSE_HACK_USERID=1 ccflags-y += -DUSE_HACK_USERID=1
endif endif