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 ndpi-netfilter2

Browse source
This commit is contained in:
Ycarus (Yannick Chabanois) 2023-05-01 10:53:34 +02:00
parent 78fa507956
commit 9d90f36870
2 changed files with 23 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
ndpi-netfilter2/patches/001-remove-request-module-nf_conntrack-ip_tables-ip6_tables.patch Normal file
View file

@ -0,0 +1,20 @@
diff --git forkSrcPrefix/ndpi-netfilter/src/main.c forkDstPrefix/ndpi-netfilter/src/main.c
index 8e2766fcbd823d709930af63a38a49535b335665..4f3382eac2293709b57699994dc17bc888b082ea 100644
--- forkSrcPrefix/ndpi-netfilter/src/main.c
+++ forkDstPrefix/ndpi-netfilter/src/main.c
@@ -3223,6 +3223,7 @@ static int __init ndpi_mt_init(void)
set_ndpi_malloc(malloc_wrapper);
set_ndpi_free(free_wrapper);
+#if 0
if(request_module("nf_conntrack") < 0) {
pr_err("xt_ndpi: nf_conntrack required!\n");
return -EOPNOTSUPP;
@@ -3237,6 +3238,7 @@ static int __init ndpi_mt_init(void)
return -EOPNOTSUPP;
}
#endif
+#endif
#ifdef NF_CT_CUSTOM
ret = nf_ct_extend_custom_register(&ndpi_extend,0x4e445049); /* "NDPI" in hex */
if(ret < 0) {

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

@ -1,13 +1,14 @@
--- a/ndpi-netfilter/src/Makefile 2022-08-03 21:27:52.321058402 +0200
+++ b/ndpi-netfilter/src/Makefile 2022-08-03 21:28:27.572452447 +0200
@@ -5,6 +5,11 @@
@@ -5,6 +5,12 @@
ccflags-y += -I${src}/${NDPI_SRC}/include -I${src}/${NDPI_SRC}/lib -I${src}/../libre -I${src}/${NDPI_SRC}/lib/third_party/include
ccflags-y += -DHAVE_CONFIG_H -DNDPI_LIB_COMPILATION -DOPENDPI_NETFILTER_MODULE -DNDPI_DETECTION_SUPPORT_IPV6 -g
ccflags-y += -Wno-declaration-after-statement
+ifeq ($(KERNEL_RELEASE),5.15)
+ifeq ($(ARCH),arm64)
+ ccflags-y += -mno-outline-atomics
+endif
+ifeq ($(ARCH),aarch64)
+ ccflags-y += -mno-outline-atomics
+endif
#ccflags-y += -Wshadow-local
# Needed for pahole