From 51f5fc714015c312622ed4ee1820518d26edee65 Mon Sep 17 00:00:00 2001 From: Luca Deri Date: Mon, 25 Mar 2024 08:15:19 +0100 Subject: Added support for roaring bitmap v3 (#2355) * Integrated RoaringBitmap v3 * Renamed ndpi_bitmap64 ro ndpi_bitmap64_fuse * Fixes to ndpi_bitmap for new roaring library * Fixes for bitmap serialization * Fixed format * Warning fix * Conversion fix * Warning fix * Added check for roaring v3 support * Updated file name * Updated path * Uses clang-9 (instead of clang-7) for builds * Fixed fuzz_ds_bitmap64_fuse * Fixes nDPI printf handling * Disabled printf * Yet another printf fix * Cleaup * Fx for compiling on older platforms * Fixes for old compilers * Initialization changes * Added compiler check * Fixes for old compilers * Inline function is not static inline * Added missing include --- src/lib/ndpi_replace_printf.h | 56 ------------------------------------------- 1 file changed, 56 deletions(-) delete mode 100644 src/lib/ndpi_replace_printf.h (limited to 'src/lib/ndpi_replace_printf.h') diff --git a/src/lib/ndpi_replace_printf.h b/src/lib/ndpi_replace_printf.h deleted file mode 100644 index 73313386c..000000000 --- a/src/lib/ndpi_replace_printf.h +++ /dev/null @@ -1,56 +0,0 @@ -/* - * ndpi_replace_printf.h - * - * Copyright (C) 2023 - ntop.org and contributors - * - * This file is part of nDPI, an open source deep packet inspection - * library based on the OpenDPI and PACE technology by ipoque GmbH - * - * nDPI is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * nDPI is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public License - * along with nDPI. If not, see . - * - */ - -// This file may be included in every *.c file that uses printf(...) except for ndpi_main.c ! - -#include "ndpi_config.h" - -#ifndef NDPI_CFFI_PREPROCESSING - -#undef printf -#undef fprintf - -#include "ndpi_typedefs.h" - -#ifdef NDPI_ENABLE_DEBUG_MESSAGES - -#define printf(...) ndpi_debug_printf(0, NULL, NDPI_LOG_DEBUG_EXTRA, __FILE__, __func__, __LINE__, __VA_ARGS__) - -#ifdef NDPI_REPLACE_FPRINTF -#define fprintf(stream, ...) ndpi_debug_printf(0, NULL, NDPI_LOG_ERROR, __FILE__, __func__, __LINE__, __VA_ARGS__) -#endif - -#else - -#define printf(...) do {} while(0); - -#ifdef NDPI_REPLACE_FPRINTF -#define fprintf(stream, ...) do {} while(0); -#endif - -#endif - -void ndpi_debug_printf(unsigned int proto, struct ndpi_detection_module_struct *ndpi_str, ndpi_log_level_t log_level, - const char *file_name, const char *func_name, int line_number, const char *format, ...); - -#endif -- cgit v1.2.3