New flow event: 'analysis'.

 * The goal was to provide a separate event for extracted feature that are not required
   and only useful for a few (e.g. someone who wants do ML).
 * Increased network buffer size to 32kB (8192 * 4).
 * Switched timestamp precision from ms to us for *ALL* timestamps.

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

1 files changed, 14 insertions, 11 deletions

diff --git a/config.h b/config.h
index 2f37bcc8b..cd326a56e 100644
--- a/config.h
+++ b/config.h
@@ -11,29 +11,32 @@
  * NOTE: Buffer size needs to keep in sync with other implementations
  *       e.g. dependencies/nDPIsrvd.py
  */
-#define NETWORK_BUFFER_MAX_SIZE 16384u /* 8192 + 8192 */
+#define NETWORK_BUFFER_MAX_SIZE 32768u /* 8192 + 8192 + 8192 + 8192 */
 #define NETWORK_BUFFER_LENGTH_DIGITS 5u
 #define NETWORK_BUFFER_LENGTH_DIGITS_STR "5"
 
+#define TIME_S_TO_US(s) (s * 1000u * 1000u)
+
 /* nDPId default config options */
 #define nDPId_PIDFILE "/tmp/ndpid.pid"
 #define nDPId_MAX_FLOWS_PER_THREAD 4096u
 #define nDPId_MAX_IDLE_FLOWS_PER_THREAD (nDPId_MAX_FLOWS_PER_THREAD / 32u)
 #define nDPId_TICK_RESOLUTION 1000u
 #define nDPId_MAX_READER_THREADS 32u
-#define nDPId_DAEMON_STATUS_INTERVAL 600000u /* 600 sec */
-#define nDPId_MEMORY_PROFILING_LOG_INTERVAL 5000u /* 5 sec */
-#define nDPId_COMPRESSION_SCAN_INTERVAL 20000u /* 20 sec */
-#define nDPId_COMPRESSION_FLOW_INACTIVITY 30000u /* 30 sec */
-#define nDPId_FLOW_SCAN_INTERVAL 10000u /* 10 sec */
-#define nDPId_GENERIC_IDLE_TIME 600000u /* 600 sec */
-#define nDPId_ICMP_IDLE_TIME 120000u /* 120 sec */
-#define nDPId_TCP_IDLE_TIME 7440000u /* 7440 sec */
-#define nDPId_UDP_IDLE_TIME 180000u /* 180 sec */
-#define nDPId_TCP_POST_END_FLOW_TIME 120000u /* 120 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 */
+#define nDPId_COMPRESSION_SCAN_INTERVAL TIME_S_TO_US(20u) /* 20 sec */
+#define nDPId_COMPRESSION_FLOW_INACTIVITY TIME_S_TO_US(30u) /* 30 sec */
+#define nDPId_FLOW_SCAN_INTERVAL TIME_S_TO_US(10u) /* 10 sec */
+#define nDPId_GENERIC_IDLE_TIME TIME_S_TO_US(600u) /* 600 sec */
+#define nDPId_ICMP_IDLE_TIME TIME_S_TO_US(120u) /* 120 sec */
+#define nDPId_TCP_IDLE_TIME TIME_S_TO_US(7440u) /* 7440 sec */
+#define nDPId_UDP_IDLE_TIME TIME_S_TO_US(180u) /* 180 sec */
+#define nDPId_TCP_POST_END_FLOW_TIME TIME_S_TO_US(120u) /* 120 sec */
 #define nDPId_THREAD_DISTRIBUTION_SEED 0x03dd018b
 #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_ANALYZE 32u
 #define nDPId_FLOW_STRUCT_SEED 0x5defc104
 
 /* nDPIsrvd default config options */