Update to latest nDPId 1.7

Author: stefanDeveloper

Dockerfile.producer

@@ -20,11 +20,11 @@ RUN apk add --no-cache \
     bash \
     make
 
-RUN git clone --branch 1.6 https://github.com/utoni/nDPId.git
+RUN git clone --branch 1.7 https://github.com/utoni/nDPId.git
 
 COPY nDPId/config.h nDPId
 
-RUN cd nDPId && mkdir build && cd build && cmake .. -DBUILD_NDPI=ON && make
+RUN cd nDPId && cmake -S . -B ./build -DBUILD_NDPI=ON  && cmake --build ./build
 
 # ---------- Runtime stage ----------
 FROM alpine:3.22.1 AS runtime

nDPId/config.h

@@ -16,14 +16,16 @@
 #define NETWORK_BUFFER_LENGTH_DIGITS 5u
 #define NETWORK_BUFFER_LENGTH_DIGITS_STR "5"
 
-#define TIME_S_TO_US(s) (s * 1000u * 1000u)
+#define PFRING_BUFFER_SIZE 65536u
+
+#define TIME_S_TO_US(s) (s * 1000llu * 1000llu)
 
 /* nDPId default config options */
 #define nDPId_PIDFILE "/tmp/ndpid.pid"
-#define nDPId_MAX_FLOWS_PER_THREAD 131072u
-#define nDPId_MAX_IDLE_FLOWS_PER_THREAD 131072u
-#define nDPId_MAX_READER_THREADS 64u
-#define nDPId_ERROR_EVENT_THRESHOLD_N 32u
+#define nDPId_MAX_FLOWS_PER_THREAD 65536u
+#define nDPId_MAX_IDLE_FLOWS_PER_THREAD (nDPId_MAX_FLOWS_PER_THREAD / 32u)
+#define nDPId_MAX_READER_THREADS 32u
+#define nDPId_ERROR_EVENT_THRESHOLD_N 16u
 #define nDPId_ERROR_EVENT_THRESHOLD_TIME TIME_S_TO_US(10u)   /* 10 sec */
 #define nDPId_DAEMON_STATUS_INTERVAL TIME_S_TO_US(600u)      /* 600 sec */
 #define nDPId_MEMORY_PROFILING_LOG_INTERVAL TIME_S_TO_US(5u) /* 5 sec */
@@ -38,7 +40,7 @@
 #define nDPId_THREAD_DISTRIBUTION_SEED 0x03dd018b
 #define nDPId_PACKETS_PLEN_MAX 8192u                         /* 8kB */
 #define nDPId_PACKETS_PER_FLOW_TO_SEND 15u
-#define nDPId_PACKETS_PER_FLOW_TO_PROCESS NDPI_DEFAULT_MAX_NUM_PKTS_PER_FLOW_TO_DISSECT
+#define nDPId_PACKETS_PER_FLOW_TO_PROCESS 32u
 #define nDPId_PACKETS_PER_FLOW_TO_ANALYZE 32u
 #define nDPId_ANALYZE_PLEN_MAX 1504u
 #define nDPId_ANALYZE_PLEN_BIN_LEN 32u
@@ -50,4 +52,4 @@
 #define nDPIsrvd_MAX_REMOTE_DESCRIPTORS 128
 #define nDPIsrvd_MAX_WRITE_BUFFERS 1024
 
-#endif
+#endif