Added printf/fprintf replacement for some internal modules.improved/logging_callback_ndpi_printf

 * logging is instead redirected to `ndpi_debug_printf`

Signed-off-by: lns <matzeton@googlemail.com>

3 files changed, 38 insertions, 0 deletions

diff --git a/src/lib/third_party/include/roaring.h b/src/lib/third_party/include/roaring.h
index 117f861b4..500ba9cb9 100644
--- a/src/lib/third_party/include/roaring.h
+++ b/src/lib/third_party/include/roaring.h
@@ -259,10 +259,13 @@ static inline void roaring_bitmap_set_copy_on_write(roaring_bitmap_t* r,
 
 roaring_bitmap_t *roaring_bitmap_add_offset(const roaring_bitmap_t *bm,
                                             int64_t offset);
+
+#ifdef NDPI_ENABLE_DEBUG_MESSAGES
 /**
  * Describe the inner structure of the bitmap.
  */
 void roaring_bitmap_printf_describe(const roaring_bitmap_t *r);
+#endif
 
 /**
  * Creates a new bitmap from a list of uint32_t integers
@@ -286,10 +289,12 @@ roaring_bitmap_t *roaring_bitmap_copy(const roaring_bitmap_t *r);
 bool roaring_bitmap_overwrite(roaring_bitmap_t *dest,
                               const roaring_bitmap_t *src);
 
+#ifdef NDPI_ENABLE_DEBUG_MESSAGES
 /**
  * Print the content of the bitmap.
  */
 void roaring_bitmap_printf(const roaring_bitmap_t *r);
+#endif
 
 /**
  * Computes the intersection between two bitmaps and returns new bitmap. The
diff --git a/src/lib/third_party/src/ahocorasick.c b/src/lib/third_party/src/ahocorasick.c
index cade82bab..12bc422ac 100644
--- a/src/lib/third_party/src/ahocorasick.c
+++ b/src/lib/third_party/src/ahocorasick.c
@@ -43,6 +43,8 @@ typedef __kernel_size_t size_t;
 #include "ndpi_api.h"
 #include "ahocorasick.h"
 
+#include "../../ndpi_replace_printf.h"
+
 /* TODO: For different depth of node, number of outgoing edges differs
    considerably, It is efficient to use different chunk size for 
    different depths */
@@ -482,6 +484,7 @@ int ac_automata_search (AC_AUTOMATA_t * thiz,
               if(match->match_map) {
                   match->match_counter++; /* we have a matching */
 #ifndef __KERNEL__
+#ifdef NDPI_ENABLE_DEBUG_MESSAGES
                   if(debug) {
                       int i;
                       AC_PATTERN_t *patterns = curr->matched_patterns->patterns;
@@ -495,6 +498,7 @@ int ac_automata_search (AC_AUTOMATA_t * thiz,
                       }
                   }
 #endif
+#endif
                   if(thiz->match_handler) {
                       /* We check 'next' to find out if we came here after a alphabet
                        * transition or due to a fail. in second case we should not report
@@ -521,6 +525,7 @@ int ac_automata_search (AC_AUTOMATA_t * thiz,
       if(txt->match.matched[i]) {
             *param = (txt->match.matched[i])->rep;
 #ifndef __KERNEL__
+#ifdef NDPI_ENABLE_DEBUG_MESSAGES
             if(debug) {
                 AC_PATTERN_t *pattern = txt->match.matched[i];
                 printf("best match: %c%.*s%c [%u]\n",
@@ -530,6 +535,7 @@ int ac_automata_search (AC_AUTOMATA_t * thiz,
                           pattern->rep.number);
             }
 #endif
+#endif
             thiz->stats.n_found++;
             return 1;
       }
diff --git a/src/lib/third_party/src/roaring.c b/src/lib/third_party/src/roaring.c
index f8ee417da..a207b06bf 100644
--- a/src/lib/third_party/src/roaring.c
+++ b/src/lib/third_party/src/roaring.c
@@ -1912,6 +1912,7 @@ int array_container_to_uint32_array(void *vout, const array_container_t *cont,
 /* Compute the number of runs */
 int32_t array_container_number_of_runs(const array_container_t *ac);
 
+#ifdef NDPI_ENABLE_DEBUG_MESSAGES
 /*
  * Print this container using printf (useful for debugging).
  */
@@ -1923,6 +1924,7 @@ void array_container_printf(const array_container_t *v);
  */
 void array_container_printf_as_uint32_array(const array_container_t *v,
                                             uint32_t base);
+#endif
 
 /**
  * Return the serialized size in bytes of a container having cardinality "card".
@@ -2631,6 +2633,7 @@ int bitset_container_to_uint32_array(uint32_t *out,
                                      const bitset_container_t *bc,
                                      uint32_t base);
 
+#ifdef NDPI_ENABLE_DEBUG_MESSAGES
 /*
  * Print this container using printf (useful for debugging).
  */
@@ -2642,6 +2645,7 @@ void bitset_container_printf(const bitset_container_t *v);
  */
 void bitset_container_printf_as_uint32_array(const bitset_container_t *v,
                                              uint32_t base);
+#endif
 
 /**
  * Return the serialized size in bytes of a container.
@@ -3154,6 +3158,7 @@ void run_container_xor(const run_container_t *src_1,
 int run_container_to_uint32_array(void *vout, const run_container_t *cont,
                                   uint32_t base);
 
+#ifdef NDPI_ENABLE_DEBUG_MESSAGES
 /*
  * Print this container using printf (useful for debugging).
  */
@@ -3165,6 +3170,7 @@ void run_container_printf(const run_container_t *v);
  */
 void run_container_printf_as_uint32_array(const run_container_t *v,
                                           uint32_t base);
+#endif
 
 /**
  * Return the serialized size in bytes of a container having "num_runs" runs.
@@ -4290,6 +4296,11 @@ int run_run_container_ixor(
 #include <stdbool.h>
 #include <stdio.h>
 
+#include "ndpi_config.h"
+
+#define NDPI_REPLACE_FPRINTF
+#include "../../ndpi_replace_printf.h"
+
 
 #ifdef __cplusplus
 extern "C" { namespace roaring { namespace internal {
@@ -4696,6 +4707,7 @@ static inline int32_t container_size_in_bytes(
     return 0;  // unreached
 }
 
+#ifdef NDPI_ENABLE_DEBUG_MESSAGES
 /**
  * print the container (useful for debugging), requires a  typecode
  */
@@ -4707,6 +4719,7 @@ void container_printf(const container_t *container, uint8_t typecode);
  */
 void container_printf_as_uint32_array(const container_t *container,
                                       uint8_t typecode, uint32_t base);
+#endif
 
 /**
  * Checks whether a container is not empty, requires a  typecode
@@ -10423,6 +10436,7 @@ int array_container_to_uint32_array(void *vout, const array_container_t *cont,
     return outpos;
 }
 
+#ifdef NDPI_ENABLE_DEBUG_MESSAGES
 void array_container_printf(const array_container_t *v) {
   int i;
     if (v->cardinality == 0) {
@@ -10449,6 +10463,7 @@ void array_container_printf_as_uint32_array(const array_container_t *v,
         printf(",%u", v->array[i] + base);
     }
 }
+#endif
 
 /* Compute the number of runs */
 int32_t array_container_number_of_runs(const array_container_t *ac) {
@@ -11243,6 +11258,7 @@ int bitset_container_to_uint32_array(
 #endif
 }
 
+#ifdef NDPI_ENABLE_DEBUG_MESSAGES
 /*
  * Print this container using printf (useful for debugging).
  */
@@ -11292,6 +11308,7 @@ void bitset_container_printf_as_uint32_array(const bitset_container_t * v, uint3
 		base += 64;
 	}
 }
+#endif
 
 
 // TODO: use the fast lower bound, also
@@ -11561,6 +11578,11 @@ void container_free(container_t *c, uint8_t type) {
     }
 }
 
+#ifdef NDPI_ENABLE_DEBUG_MESSAGES
+void run_container_printf(const run_container_t *cont);
+void run_container_printf_as_uint32_array(const run_container_t *cont,
+                                          uint32_t base);
+
 void container_printf(const container_t *c, uint8_t type) {
     c = container_unwrap_shared(c, &type);
     switch (type) {
@@ -11600,6 +11622,7 @@ void container_printf_as_uint32_array(
             __builtin_unreachable();
     }
 }
+#endif
 
 extern inline bool container_nonzero_cardinality(
         const container_t *c, uint8_t typecode);
@@ -14901,6 +14924,7 @@ int run_container_to_uint32_array(void *vout, const run_container_t *cont,
     return outpos;
 }
 
+#ifdef NDPI_ENABLE_DEBUG_MESSAGES
 /*
  * Print this container using printf (useful for debugging).
  */
@@ -14931,6 +14955,7 @@ void run_container_printf_as_uint32_array(const run_container_t *cont,
         uint32_t j;for ( j = 0; j <= le; ++j) printf(",%u", run_start + j);
     }
 }
+#endif
 
 int32_t run_container_write(const run_container_t *container, char *buf) {
     uint16_t cast_16 = container->n_runs;
@@ -15561,6 +15586,7 @@ void roaring_bitmap_remove_range_closed(roaring_bitmap_t *r, uint32_t min, uint3
 extern inline void roaring_bitmap_add_range(roaring_bitmap_t *r, uint64_t min, uint64_t max);
 extern inline void roaring_bitmap_remove_range(roaring_bitmap_t *r, uint64_t min, uint64_t max);
 
+#ifdef NDPI_ENABLE_DEBUG_MESSAGES
 void roaring_bitmap_printf(const roaring_bitmap_t *r) {
     const roaring_array_t *ra = &r->high_low_container;
 
@@ -15596,6 +15622,7 @@ void roaring_bitmap_printf_describe(const roaring_bitmap_t *r) {
     }
     printf("}");
 }
+#endif
 
 typedef struct min_max_sum_s {
     uint32_t min;