vrr/nDPI
2
0
Fork 0
mirror of https://github.com/vel21ripn/nDPI.git synced 2026-05-22 03:03:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Merge commit '9587059598' into flow_info-4

Browse source
This commit is contained in:
Vitaly Lavrov 2025-12-09 12:40:48 +03:00
commit 4ba3fa94ce
9 changed files with 35 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Makefile.am
View file

@ -43,7 +43,7 @@ doc-view:
python3 -m http.server --bind 127.0.0.1 --directory doc/_build/html 8080
coverage: all
mkdir -vp coverage_report/ndpi_coverage_report
$(MKDIR_P) coverage_report/ndpi_coverage_report
lcov --directory . --capture --output-file lcov.info
genhtml -o coverage_report/ndpi_coverage_report lcov.info
@ -60,3 +60,6 @@ changelog:
cd $(top_srcdir) && git log --since={`curl -s https://github.com/ntop/ndpi/releases | grep datetime | head -n1 | egrep -o "[0-9]+\-[0-9]+\-[0-9]+"`} --name-only --pretty=format:" - %s" | grep "^ " > CHANGELOG.latest
.PHONY: doc doc-view coverage clean-coverage changelog
# Prevent parallel execution of clean/distclean to avoid potential race conditions
.NOTPARALLEL: clean distclean

13
configure.ac
View file

@ -3,7 +3,7 @@ AC_INIT([libndpi],[5.1.0])
AC_CONFIG_AUX_DIR([.])
AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign subdir-objects])
AM_INIT_AUTOMAKE([foreign subdir-objects parallel-tests])
AC_PREFIX_DEFAULT(/usr)
@ -310,7 +310,7 @@ AS_IF([test "x$enable_global_context_support" != "xno"], [
])
ADDITIONAL_INCS="${ADDITIONAL_INCS}"
ADDITIONAL_LIBS="${ADDITIONAL_LIBS} $LIBM"
ADDITIONAL_LIBS="${ADDITIONAL_LIBS}"
PCAP_HOME=$HOME/PF_RING/userland
DPDK_TARGET=
@ -501,6 +501,10 @@ if test "${with_maxminddb+set}" = set; then :
fi
fi
dnl> Add base system libraries last (lowest-level dependencies)
dnl> This ensures proper linking order: high-level libs -> low-level libs
ADDITIONAL_LIBS="${ADDITIONAL_LIBS} $LIBM"
dnl> Use absolute source directory for NDPI_BASE_DIR
NDPI_ABS_SRCDIR="`cd ${srcdir} && pwd`"
AC_DEFINE_UNQUOTED(NDPI_BASE_DIR, "${NDPI_ABS_SRCDIR}", [nDPI base directory])
@ -517,9 +521,10 @@ dnl> fi
dnl> ndpiReader has some hard-coded unit tests: in the out-of-tree builds we need some configuration files in the expected path
if test "${srcdir}" != . ; then :
mkdir -p example
$MKDIR_P example
$MKDIR_P lists
cp ${srcdir}/example/categories.txt example/
cp -R ${srcdir}/lists lists/
cp -R ${srcdir}/lists/* lists/
fi
AC_CONFIG_FILES([Makefile example/Makefile example/Makefile.dpdk tests/Makefile tests/unit/Makefile tests/performance/Makefile tests/dga/Makefile rrdtool/Makefile influxdb/Makefile libndpi.pc src/include/ndpi_define.h src/lib/Makefile fuzz/Makefile doc/Doxyfile.cfg utils/Makefile])

7
example/Makefile.in
View file

@ -24,9 +24,10 @@ endif
CFLAGS+=-I$(SRCHOME)/include -I$(top_builddir)/src/include @NDPI_CFLAGS@ @PCAP_INC@ @GPROF_CFLAGS@ @CUSTOM_NDPI@
LDFLAGS+=@NDPI_LDFLAGS@
LIBNDPI=$(top_builddir)/src/lib/libndpi.a
LIBS=$(LIBNDPI) @PCAP_LIB@ @ADDITIONAL_LIBS@ @LIBS@ @GPROF_LIBS@
LIBS=$(LIBNDPI) @PCAP_LIB@ @ADDITIONAL_LIBS@ @GPROF_LIBS@ @LIBS@
HEADERS=reader_util.h $(SRCHOME)/include/ndpi_api.h \
$(SRCHOME)/include/ndpi_typedefs.h $(SRCHOME)/include/ndpi_protocol_ids.h
HEADERS+=$(top_builddir)/src/include/ndpi_config.h $(top_builddir)/src/include/ndpi_define.h
PREFIX?=@prefix@
ifneq ($(BUILD_MINGW),)
@ -72,8 +73,8 @@ ndpiSimpleIntegration$(EXE_SUFFIX): ndpiSimpleIntegration.o
$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
install: ndpiReader$(EXE_SUFFIX)
mkdir -p $(DESTDIR)$(PREFIX)/bin/
mkdir -p $(DESTDIR)$(PREFIX)/share/ndpi
@MKDIR_P@ $(DESTDIR)$(PREFIX)/bin/
@MKDIR_P@ $(DESTDIR)$(PREFIX)/share/ndpi
cp ndpiReader$(EXE_SUFFIX) $(DESTDIR)$(PREFIX)/bin/
cp $(srcdir)/protos.txt $(DESTDIR)$(PREFIX)/share/ndpi/ndpiProtos.txt
cp $(srcdir)/mining_hosts.txt $(DESTDIR)$(PREFIX)/share/ndpi/ndpiCustomCategory.txt

2
fuzz/Makefile.am
View file

@ -19,7 +19,7 @@ AM_CPPFLAGS = -I $(top_srcdir)/src/include -I $(top_srcdir)/src/lib/third_party/
AM_LDFLAGS = $(LIBS)
AM_CFLAGS = @NDPI_CFLAGS@ $(CFLAGS)
AM_CXXFLAGS = @NDPI_CFLAGS@ $(CXXFLAGS)
LDADD = $(PCAP_LIB) $(top_builddir)/src/lib/libndpi.a $(ADDITIONAL_LIBS)
LDADD = $(top_builddir)/src/lib/libndpi.a $(PCAP_LIB) $(ADDITIONAL_LIBS)
if HAS_FUZZLDFLAGS
CFLAGS += $(LIB_FUZZING_ENGINE)
LDFLAGS += $(LIB_FUZZING_ENGINE)

5
influxdb/Makefile.in
View file

@ -9,13 +9,14 @@ INC=-I $(top_srcdir)/src/include -I $(top_builddir)/src/include -I/usr/local/inc
LIBDPI=$(top_builddir)/src/lib/libndpi.a
CFLAGS+=@NDPI_CFLAGS@
LDFLAGS+=@NDPI_LDFLAGS@
LIB=$(LIBDPI) -lm @ADDITIONAL_LIBS@ @LIBS@
LIB=$(LIBDPI) @ADDITIONAL_LIBS@ @LIBS@ -lm
GEN_HEADERS=$(top_builddir)/src/include/ndpi_config.h $(top_builddir)/src/include/ndpi_define.h
TOOLS=metric_anomaly
all: $(TOOLS)
metric_anomaly: $(srcdir)/metric_anomaly.c Makefile $(LIBDPI)
metric_anomaly: $(srcdir)/metric_anomaly.c Makefile $(LIBDPI) $(GEN_HEADERS)
$(CC) $(CFLAGS) $(CPPFLAGS) -g $(INC) $(LDFLAGS) $(srcdir)/metric_anomaly.c -o metric_anomaly $(LIB)
clean:

7
rrdtool/Makefile.in
View file

@ -9,16 +9,17 @@ INC=-I $(top_srcdir)/src/include -I $(top_builddir)/src/include -I/usr/local/inc
LIBDPI=$(top_builddir)/src/lib/libndpi.a
CFLAGS+=@NDPI_CFLAGS@
LDFLAGS+=@NDPI_LDFLAGS@
LIB=$(LIBDPI) -lm @ADDITIONAL_LIBS@ @LIBRRD@ @LIBS@ -lpthread
LIB=$(LIBDPI) @ADDITIONAL_LIBS@ @LIBRRD@ @LIBS@ -lm -lpthread
GEN_HEADERS=$(top_builddir)/src/include/ndpi_config.h $(top_builddir)/src/include/ndpi_define.h
TOOLS=rrd_anomaly rrd_similarity
all: $(TOOLS)
rrd_anomaly: $(srcdir)/rrd_anomaly.c Makefile $(LIBDPI)
rrd_anomaly: $(srcdir)/rrd_anomaly.c Makefile $(LIBDPI) $(GEN_HEADERS)
$(CC) $(CFLAGS) $(CPPFLAGS) -g $(INC) $(LDFLAGS) $(srcdir)/rrd_anomaly.c -o rrd_anomaly $(LIB)
rrd_similarity: $(srcdir)/rrd_similarity.c Makefile $(LIBDPI)
rrd_similarity: $(srcdir)/rrd_similarity.c Makefile $(LIBDPI) $(GEN_HEADERS)
$(CC) $(CFLAGS) $(CPPFLAGS) -g $(INC) $(LDFLAGS) $(srcdir)/rrd_similarity.c -o rrd_similarity $(LIB)
clean:

3
tests/dga/Makefile.in
View file

@ -15,9 +15,10 @@ CFLAGS+=-fPIC -DPIC
endif
CFLAGS+=-g -I$(SRCHOME)/include -I$(top_builddir)/src/include @NDPI_CFLAGS@
LIBNDPI=$(top_builddir)/src/lib/libndpi.a
LIBS=$(LIBNDPI) @ADDITIONAL_LIBS@ -lpthread @LIBS@
LIBS=$(LIBNDPI) @ADDITIONAL_LIBS@ @LIBS@ -lpthread
LDFLAGS+=@NDPI_LDFLAGS@
HEADERS=$(SRCHOME)/include/ndpi_api.h $(SRCHOME)/include/ndpi_typedefs.h $(SRCHOME)/include/ndpi_protocol_ids.h
HEADERS+=$(top_builddir)/src/include/ndpi_config.h $(top_builddir)/src/include/ndpi_define.h
OBJS=dga_evaluate
PREFIX?=@prefix@

13
tests/performance/Makefile.in
View file

@ -6,6 +6,7 @@ VPATH = @srcdir@
INC=-I $(top_srcdir)/src/include/ -I $(top_builddir)/src/include/ -I $(top_srcdir)/src/lib/third_party/include/
LIB=$(top_builddir)/src/lib/libndpi.a @ADDITIONAL_LIBS@ @LIBS@
GEN_HEADERS=$(top_builddir)/src/include/ndpi_config.h $(top_builddir)/src/include/ndpi_define.h
TOOLS=substringsearch patriciasearch gcrypt-int gcrypt-gnu strnstr
TESTS=substring_test patricia_test strnstr_test geo_test
@ -15,19 +16,19 @@ all: $(TESTS)
tools: $(TOOLS)
gcrypt-int: $(srcdir)/gcrypt.c Makefile
gcrypt-int: $(srcdir)/gcrypt.c Makefile $(GEN_HEADERS)
$(CC) $(INC) @CFLAGS@ $(srcdir)/gcrypt.c -o $@
gcrypt-gnu: $(srcdir)/gcrypt.c Makefile
gcrypt-gnu: $(srcdir)/gcrypt.c Makefile $(GEN_HEADERS)
$(CC) $(INC) @CFLAGS@ -DHAVE_LIBGCRYPT $(srcdir)/gcrypt.c -o $@ -lgcrypt
substringsearch: $(srcdir)/substringsearch.c Makefile
substringsearch: $(srcdir)/substringsearch.c Makefile $(GEN_HEADERS)
$(CC) $(INC) @CFLAGS@ $(srcdir)/substringsearch.c -o substringsearch $(LIB)
strnstr: $(srcdir)/strnstr.cpp Makefile
strnstr: $(srcdir)/strnstr.cpp Makefile $(GEN_HEADERS)
$(CXX) $(INC) @CFLAGS@ $(srcdir)/strnstr.cpp -o strnstr
geo: $(srcdir)/geo.c Makefile
geo: $(srcdir)/geo.c Makefile $(GEN_HEADERS)
$(CC) $(INC) @CFLAGS@ $(srcdir)/geo.c -o geo $(LIB)
substring_test: substringsearch top-1m.csv
@ -41,7 +42,7 @@ geo_test: geo
#
patriciasearch: $(srcdir)/patriciasearch.c Makefile
patriciasearch: $(srcdir)/patriciasearch.c Makefile $(GEN_HEADERS)
$(CC) $(INC) @CFLAGS@ $(srcdir)/patriciasearch.c -o patriciasearch $(LIB)
patricia_test: patriciasearch blacklist-ip.txt

1
tests/unit/Makefile.in
View file

@ -19,6 +19,7 @@ LIBNDPI=$(top_builddir)/src/lib/libndpi.a
LIBS=$(LIBNDPI) @PCAP_LIB@ @ADDITIONAL_LIBS@ @JSONC_LIBS@ @LIBS@
LDFLAGS+=@NDPI_LDFLAGS@
HEADERS=$(SRCHOME)/include/ndpi_api.h $(SRCHOME)/include/ndpi_typedefs.h $(SRCHOME)/include/ndpi_protocol_ids.h
HEADERS+=$(top_builddir)/src/include/ndpi_config.h $(top_builddir)/src/include/ndpi_define.h
OBJS=unit
PREFIX?=@prefix@