mirror of
https://github.com/vel21ripn/nDPI.git
synced 2026-04-29 23:49:41 +00:00
3e4ab39b52
This commit add (optional) support for Link-Time-Optimization and Gold linker. This is the first, mandatory step needed to make nDPI compliant with "introspector" sanitizer requirements in OSS-Fuzz: see https://github.com/google/oss-fuzz/issues/8939 Gold linker is not supported by Windows and by macOS, so this feature is disabled by default. It has been enable in CI in two linux targets ("latest" gcc and clang). Fix some warnings triggered by LTO. The changes in `src/lib/ndpi_serializer.c` seams reasonable. However, the change in `tests/unit/unit.c` is due to the following warning, which seems to be a false positive. ``` unit.c: In function ‘serializerUnitTest’: ndpi_serializer.c:2258:13: error: ‘MEM[(struct ndpi_private_serializer *)&deserializer].buffer.size’ may be used uninitialized in this function [-Werror=maybe-uninitialized] unit.c:67:31: note: ‘MEM[(struct ndpi_private_serializer *)&deserializer].buffer.size’ was declared here 67 | ndpi_serializer serializer, deserializer; | ^ ndpi_serializer.c:2605:10: error: ‘MEM[(struct ndpi_private_serializer *)&deserializer].status.buffer.size_used’ may be used uninitialized in this function [-Werror=maybe-uninitialized] unit.c:67:31: note: ‘MEM[(struct ndpi_private_serializer *)&deserializer].status.buffer.size_used’ was declared here 67 | ndpi_serializer serializer, deserializer; ``` Since this warning is triggered only with an old version of gcc and `tests/unit/unit.c` is used only during the tests, the easiest fix has been applied. Some (unknown to me) combinations of OS and compiler trigger the following warnings at linker time (with sanitizer and gold linker) ``` /usr/bin/ld.gold: warning: Cannot export local symbol '__asan_report_load1_asm' /usr/bin/ld.gold: warning: Cannot export local symbol '__asan_report_load2_asm' /usr/bin/ld.gold: warning: Cannot export local symbol '__asan_report_load4_asm' /usr/bin/ld.gold: warning: Cannot export local symbol '__asan_report_load8_asm' /usr/bin/ld.gold: warning: Cannot export local symbol '__asan_report_load16_asm' /usr/bin/ld.gold: warning: Cannot export local symbol '__asan_report_store1_asm' /usr/bin/ld.gold: warning: Cannot export local symbol '__asan_report_store2_asm' /usr/bin/ld.gold: warning: Cannot export local symbol '__asan_report_store4_asm' [..] ``` I have not found any references to this kind of message, with the only exception of https://sourceware.org/bugzilla/show_bug.cgi?id=25975 which seems to suggest that these messages can be safely ignored. In any case, the compilation results are sound. Fix `clean` target in the Makefile in the `example` directory. In OSS-Fuzz enviroments, `fuzz_ndpi_reader` reports a strange link error (as always, when the gold linker is involved...). It's come out that the culprit was the `tempnam` function: the code has been changed to use `tmpfile` instead. No sure why... :( Fuzzing target `fuzz_ndpi_reader.c` doesn't use `libndpiReader.a` anymore: this way we can use `--with-only-libndpi` flag on Oss-Fuzz builds as workaround for the "missing dependencies errors" described in https://github.com/google/oss-fuzz/issues/8939
97 lines
2.9 KiB
Makefile
97 lines
2.9 KiB
Makefile
AR=@AR@
|
|
CC=@CC@
|
|
CXX=@CXX@
|
|
BUILD_MINGW=@BUILD_MINGW@
|
|
BUILD_MINGW_X64=@BUILD_MINGW_X64@
|
|
DISABLE_NPCAP=@DISABLE_NPCAP@
|
|
EXE_SUFFIX=@EXE_SUFFIX@
|
|
SRCHOME=../src
|
|
ifneq ($(OS),Windows_NT)
|
|
CFLAGS+=-fPIC -DPIC
|
|
endif
|
|
CFLAGS+=-I$(SRCHOME)/include @NDPI_CFLAGS@ @PCAP_INC@ @GPROF_CFLAGS@
|
|
LDFLAGS+=@NDPI_LDFLAGS@
|
|
LIBNDPI=$(SRCHOME)/lib/libndpi.a
|
|
LIBS=$(LIBNDPI) @PCAP_LIB@ @ADDITIONAL_LIBS@ @LIBS@ @GPROF_LIBS@
|
|
HEADERS=reader_util.h $(SRCHOME)/include/ndpi_api.h \
|
|
$(SRCHOME)/include/ndpi_typedefs.h $(SRCHOME)/include/ndpi_protocol_ids.h
|
|
PREFIX?=@prefix@
|
|
|
|
ifneq ($(BUILD_MINGW),)
|
|
|
|
ifeq ($(DISABLE_NPCAP),0)
|
|
CFLAGS+=-I@srcdir@/../windows/WpdPack/Include -I@srcdir@/../windows/WpdPack/Include/pcap
|
|
else
|
|
CFLAGS+=-DDISABLE_NPCAP
|
|
endif
|
|
|
|
ifeq ($(DISABLE_NPCAP),0)
|
|
|
|
ifneq ($(BUILD_MINGW_X64),)
|
|
LIBS+=@srcdir@/../windows/WpdPack/Lib/x64/wpcap.lib
|
|
else
|
|
LIBS+=@srcdir@/../windows/WpdPack/Lib/wpcap.lib
|
|
endif
|
|
|
|
endif
|
|
|
|
LIBS+=-Wl,-Bstatic -lpthread -Wl,-Bdynamic
|
|
else
|
|
LIBS+=-pthread
|
|
endif
|
|
|
|
CFLAGS+=-pthread
|
|
|
|
all: ndpiReader$(EXE_SUFFIX) @DPDK_TARGET@
|
|
|
|
EXECUTABLE_SOURCES := ndpiReader.c ndpiSimpleIntegration.c
|
|
COMMON_SOURCES := $(filter-out $(EXECUTABLE_SOURCES),$(wildcard *.c ))
|
|
|
|
libndpiReader.a: $(COMMON_SOURCES:%.c=%.o) $(LIBNDPI)
|
|
$(AR) rsv libndpiReader.a $(COMMON_SOURCES:%.c=%.o)
|
|
|
|
ndpiReader$(EXE_SUFFIX): libndpiReader.a $(LIBNDPI) ndpiReader.o
|
|
$(CC) $(CFLAGS) $(LDFLAGS) ndpiReader.o libndpiReader.a $(LIBS) -o $@
|
|
|
|
ndpiSimpleIntegration$(EXE_SUFFIX): ndpiSimpleIntegration.o
|
|
$(CC) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@
|
|
|
|
%.o: %.c $(HEADERS) Makefile
|
|
$(CC) $(CFLAGS) $(CPPFLAGS) -c $< -o $@
|
|
|
|
install: ndpiReader$(EXE_SUFFIX)
|
|
mkdir -p $(DESTDIR)$(PREFIX)/bin/
|
|
mkdir -p $(DESTDIR)$(PREFIX)/share/ndpi
|
|
cp ndpiReader$(EXE_SUFFIX) $(DESTDIR)$(PREFIX)/bin/
|
|
cp protos.txt $(DESTDIR)$(PREFIX)/share/ndpi/ndpiProtos.txt
|
|
cp mining_hosts.txt $(DESTDIR)$(PREFIX)/share/ndpi/ndpiCustomCategory.txt
|
|
[ -f ndpiSimpleIntegration$(EXE_SUFFIX) ] && cp ndpiSimpleIntegration$(EXE_SUFFIX) $(DESTDIR)$(PREFIX)/bin/ndpiSimpleIntegration$(EXE_SUFFIX) || true
|
|
[ -f build/app/ndpiReader.dpdk ] && cp build/app/ndpiReader.dpdk $(DESTDIR)$(PREFIX)/bin/ || true
|
|
[ -f ndpiReader.dpdk ] && cp ndpiReader.dpdk $(DESTDIR)$(PREFIX)/bin/ || true
|
|
|
|
dpdk:
|
|
$(MAKE) -f Makefile.dpdk
|
|
|
|
check:
|
|
true # nothing to do here
|
|
|
|
cppcheck:
|
|
cppcheck --template='{file}:{line}:{severity}:{message}' --quiet --enable=all --force -I$(SRCHOME)/include *.c
|
|
|
|
clean:
|
|
/bin/rm -f *.o ndpiReader ndpiSimpleIntegration ndpiReader$(EXE_SUFFIX) ndpiSimpleIntegration$(EXE_SUFFIX) ndpiReader.dpdk libndpiReader.a
|
|
/bin/rm -f .*.dpdk.cmd .*.o.cmd *.dpdk.map .*.o.d
|
|
/bin/rm -f _install _postbuild _postinstall _preinstall
|
|
/bin/rm -rf build
|
|
|
|
distdir:
|
|
cp README.DPDK '$(distdir)/'
|
|
find . -maxdepth 1 -type f -name '*.c' \
|
|
-o -name '*.h' \
|
|
-o -name '*.py' \
|
|
-o -name '*.txt' \
|
|
-o -name '*.csv' | xargs -I'{}' cp '{}' '$(distdir)/{}'
|
|
|
|
distclean: clean
|
|
/bin/rm -f Makefile.dpdk
|
|
/bin/rm -f Makefile
|