Fix QUIC log and remove SoulSeek leftovers after b97dc6ba (#1351)

Update .gitignore file
Fix a function prototype
Close #1349

8 files changed, 24 insertions, 30 deletions

diff --git a/.gitignore b/.gitignore
index f9425afd1..da3e85894 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,6 +20,7 @@ compile
 /example/ndpiReader
 /example/Makefile.dpdk
 /example/build
+/example/ndpiSimpleIntegration
 *.in
 /install-sh
 *.ko
@@ -44,6 +45,7 @@ compile
 .settings
 /src/include/Makefile
 /src/include/ndpi_config.h
+/src/include/ndpi_api.h
 /src/include/ndpi_define.h
 /src/lib/.deps/
 /src/lib/Makefile
@@ -53,3 +55,23 @@ stamp-h1
 *.swp
 /test-driver
 /tests/Makefile
+/fuzz/.deps/
+/fuzz/Makefile
+/fuzz/fuzz_ndpi_reader
+/fuzz/fuzz_ndpi_reader_with_main
+/fuzz/fuzz_process_packet
+/fuzz/fuzz_process_packet_with_main
+/python/Makefile
+/tests/dga/Makefile
+/tests/do.sh
+/tests/unit/Makefile
+/example/libndpiReader.a
+/example/ndpiReader.exe
+/src/lib/libndpi.a
+/src/lib/libndpi.so*
+/src/lib/libndpi
+/src/lib/libndpi-4.1.0.dll
+/src/lib/libndpi.4
+/tests/dga/dga_evaluate
+/tests/unit/unit
+/tags
diff --git a/python/ndpi.py b/python/ndpi.py
index a567d789b..0d75da3de 100644
--- a/python/ndpi.py
+++ b/python/ndpi.py
@@ -464,9 +464,6 @@ struct ndpi_id_struct {
   /* NDPI_PROTOCOL_DIRECTCONNECT */
   uint32_t directconnect_last_safe_access_time;
 
-  /* NDPI_PROTOCOL_SOULSEEK */
-  uint32_t soulseek_last_safe_access_time;
-
   /* NDPI_PROTOCOL_DIRECTCONNECT */
   uint16_t detected_directconnect_port;
   uint16_t detected_directconnect_udp_port;
@@ -481,9 +478,6 @@ struct ndpi_id_struct {
   uint16_t detected_gnutella_udp_port1;
   uint16_t detected_gnutella_udp_port2;
 
-  /* NDPI_PROTOCOL_SOULSEEK */
-  uint16_t soulseek_listen_port;
-
   /* NDPI_PROTOCOL_IRC */
   uint8_t irc_number_of_port;
 
@@ -517,9 +511,6 @@ struct ndpi_flow_tcp_struct {
   uint32_t irc_direction:2;
   uint32_t irc_0x1000_full:1;
 
-  /* NDPI_PROTOCOL_SOULSEEK */
-  uint32_t soulseek_stage:2;
-
   /* NDPI_PROTOCOL_USENET */
   uint32_t usenet_stage:2;
 
@@ -918,8 +909,6 @@ struct ndpi_detection_module_struct {
   uint32_t gnutella_timeout;
   /* thunder parameters */
   uint32_t thunder_timeout;
-  /* SoulSeek parameters */
-  uint32_t soulseek_connection_ip_tick_timeout;
   /* rstp */
   uint32_t orb_rstp_ts_timeout;
   uint32_t zattoo_connection_timeout;
diff --git a/python/ndpi_typestruct.py b/python/ndpi_typestruct.py
index 179cc7def..e743fe215 100644
--- a/python/ndpi_typestruct.py
+++ b/python/ndpi_typestruct.py
@@ -261,7 +261,6 @@ NDPIDetectionModuleStruct._fields_ = [
     ("gnutella_timeout", c_uint32),
     ("battlefield_timeout", c_uint32),
     ("thunder_timeout", c_uint32),
-    ("soulseek_connection_ip_tick_timeout", c_uint32),
     ("tvants_connection_timeout", c_uint32),
     ("orb_rstp_ts_timeout", c_uint32),
     ("zattoo_connection_timeout", c_uint32),
@@ -318,7 +317,6 @@ class NDPIIdStruct(Structure):
         ('zattoo_ts', c_uint32),
         ('jabber_stun_or_ft_ts', c_uint32),
         ('directconnect_last_safe_access_time', c_uint32),
-        ('soulseek_last_safe_access_time', c_uint32),
         ('detected_directconnect_port', c_uint16),
         ('detected_directconnect_udp_port', c_uint16),
         ('detected_directconnect_ssl_port', c_uint16),
@@ -326,7 +324,6 @@ class NDPIIdStruct(Structure):
         ('jabber_file_transfer_port', c_uint16 * 2),
         ('detected_gnutella_udp_port1', c_uint16),
         ('detected_gnutella_udp_port2', c_uint16),
-        ('soulseek_listen_port', c_uint16),
         ('irc_number_of_port', c_uint8),
         ('oscar_ssl_session_id', c_uint8 * 33),
         ('jabber_voice_stun_used_ports', c_uint8),
@@ -347,7 +344,6 @@ class NDPIFlowTcpStruct(Structure):
         ('irc_stage2', c_uint32, 5),
         ('irc_direction', c_uint32, 2),
         ('irc_0x1000_full', c_uint32, 1),
-        ('soulseek_stage', c_uint32, 2),
         ('usenet_stage', c_uint32, 2),
         ('http_stage', c_uint32, 2),
         ('http_empty_line_seen', c_uint32, 1),
diff --git a/src/include/ndpi_api.h.in b/src/include/ndpi_api.h.in
index a9c3cdb7b..e9d34d821 100644
--- a/src/include/ndpi_api.h.in
+++ b/src/include/ndpi_api.h.in
@@ -1620,7 +1620,7 @@ extern "C" {
   
   /* ******************************* */
 
-  ndpi_bitmap* ndpi_bitmap_alloc();
+  ndpi_bitmap* ndpi_bitmap_alloc(void);
   void ndpi_bitmap_free(ndpi_bitmap* b);
   u_int64_t ndpi_bitmap_cardinality(ndpi_bitmap* b);
   void ndpi_bitmap_set(ndpi_bitmap* b, u_int32_t value);
diff --git a/src/include/ndpi_define.h.in b/src/include/ndpi_define.h.in
index 3c4a0ee6c..d82a7a4f8 100644
--- a/src/include/ndpi_define.h.in
+++ b/src/include/ndpi_define.h.in
@@ -177,7 +177,6 @@
 #define NDPI_ZATTOO_FLASH_TIMEOUT                                5
 #define NDPI_JABBER_STUN_TIMEOUT                                30
 #define NDPI_JABBER_FT_TIMEOUT				         5
-#define NDPI_SOULSEEK_CONNECTION_IP_TICK_TIMEOUT               600
 
 #ifdef NDPI_ENABLE_DEBUG_MESSAGES
  #define NDPI_LOG(proto, m, log_level, args...)		                                 \
diff --git a/src/include/ndpi_protocols.h b/src/include/ndpi_protocols.h
index 31682278e..d74ceb80c 100644
--- a/src/include/ndpi_protocols.h
+++ b/src/include/ndpi_protocols.h
@@ -142,7 +142,6 @@ void init_smb_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int3
 void init_snmp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
 void init_socrates_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
 void init_sopcast_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
-void init_soulseek_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
 void init_socks_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
 void init_spotify_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
 void init_ssh_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h
index b55224be2..642a60325 100644
--- a/src/include/ndpi_typedefs.h
+++ b/src/include/ndpi_typedefs.h
@@ -599,9 +599,6 @@ struct ndpi_id_struct {
   /* NDPI_PROTOCOL_DIRECTCONNECT */
   u_int32_t directconnect_last_safe_access_time;
 
-  /* NDPI_PROTOCOL_SOULSEEK */
-  u_int32_t soulseek_last_safe_access_time;
-
   /* NDPI_PROTOCOL_DIRECTCONNECT */
   u_int16_t detected_directconnect_port;
   u_int16_t detected_directconnect_udp_port;
@@ -616,9 +613,6 @@ struct ndpi_id_struct {
   u_int16_t detected_gnutella_udp_port1;
   u_int16_t detected_gnutella_udp_port2;
 
-  /* NDPI_PROTOCOL_SOULSEEK */
-  u_int16_t soulseek_listen_port;
-
   /* NDPI_PROTOCOL_IRC */
   u_int8_t irc_number_of_port;
 
@@ -654,9 +648,6 @@ struct ndpi_flow_tcp_struct {
   u_int32_t irc_direction:2;
   u_int32_t irc_0x1000_full:1;
 
-  /* NDPI_PROTOCOL_SOULSEEK */
-  u_int32_t soulseek_stage:2;
-
   /* NDPI_PROTOCOL_USENET */
   u_int32_t usenet_stage:2;
 
@@ -1118,8 +1109,6 @@ struct ndpi_detection_module_struct {
   u_int32_t gnutella_timeout;
   /* thunder parameters */
   u_int32_t thunder_timeout;
-  /* SoulSeek parameters */
-  u_int32_t soulseek_connection_ip_tick_timeout;
   /* rstp */
   u_int32_t orb_rstp_ts_timeout;
   u_int32_t zattoo_connection_timeout;
diff --git a/src/lib/protocols/quic.c b/src/lib/protocols/quic.c
index af19fe7ea..206c3b951 100644
--- a/src/lib/protocols/quic.c
+++ b/src/lib/protocols/quic.c
@@ -1474,7 +1474,7 @@ static int may_be_initial_pkt(struct ndpi_detection_module_struct *ndpi_struct,
       grease_quic_bit transport parameter." */
   if((*version & 0x0F0F0F0F) == 0x0a0a0a0a &&
      !(pub_bit1 == 1 && pub_bit2 == 1)) {
-    NDPI_LOG_DBG2(ndpi_struct, "Version 0x%x with first byte 0x%x\n", first_byte);
+    NDPI_LOG_DBG2(ndpi_struct, "Version 0x%x with first byte 0x%x\n", *version, first_byte);
     return 0;
   }