diff options
author | Ivan Nardi <12729895+IvanNardi@users.noreply.github.com> | 2021-10-19 21:42:55 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-10-19 21:42:55 +0200 |
commit | 8db8c8ae34da09dd09453c312fe9ebdac897f73d (patch) | |
tree | 1d345c5d19661e266e919d6f2d9c52133c766c1f /src | |
parent | fea3991ad168ee0a69a35c7be15e0732f2351d56 (diff) |
Fix QUIC log and remove SoulSeek leftovers after b97dc6ba (#1351)
Update .gitignore file
Fix a function prototype
Close #1349
Diffstat (limited to 'src')
-rw-r--r-- | src/include/ndpi_api.h.in | 2 | ||||
-rw-r--r-- | src/include/ndpi_define.h.in | 1 | ||||
-rw-r--r-- | src/include/ndpi_protocols.h | 1 | ||||
-rw-r--r-- | src/include/ndpi_typedefs.h | 11 | ||||
-rw-r--r-- | src/lib/protocols/quic.c | 2 |
5 files changed, 2 insertions, 15 deletions
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; } |