Reworked sockets support
Fixed TFTP support
This commit is contained in:
@@ -55,8 +55,8 @@
|
||||
#define NDPI_PROTOCOL_HTTP_APPLICATION_ACTIVESYNC 110
|
||||
#define NDPI_PROTOCOL_HTTP_CONNECT 130
|
||||
#define NDPI_PROTOCOL_HTTP_PROXY 131
|
||||
#define NDPI_PROTOCOL_SOCKS5 172 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#define NDPI_PROTOCOL_SOCKS4 173 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#define NDPI_PROTOCOL_SOCKS 172 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
|
||||
|
||||
#define NDPI_PROTOCOL_FTP_CONTROL 1 /* Tomasz Bujlow <tomasz@skatnet.dk> */
|
||||
#define NDPI_PROTOCOL_MAIL_POP 2
|
||||
@@ -203,7 +203,7 @@
|
||||
#define NDPI_PROTOCOL_TEREDO 214
|
||||
#define NDPI_PROTOCOL_HEP 216 /* Sipcapture.org QXIP BV */
|
||||
#define NDPI_PROTOCOL_UBNTAC2 217 /* Ubiquity UBNT AirControl 2 - Thomas Fjellstrom <thomas+ndpi@fjellstrom.ca> */
|
||||
#define NDPI_PROTOCOL_MS_LYNC 221
|
||||
#define NDPI_PROTOCOL_MS_LYNC 173
|
||||
|
||||
|
||||
|
||||
@@ -271,7 +271,7 @@
|
||||
#define NDPI_SERVICE_CLOUDFLARE 220
|
||||
|
||||
/* UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE */
|
||||
#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_PROTOCOL_MS_LYNC
|
||||
#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_SERVICE_CLOUDFLARE
|
||||
|
||||
#define NDPI_MAX_SUPPORTED_PROTOCOLS (NDPI_LAST_IMPLEMENTED_PROTOCOL + 1)
|
||||
#define NDPI_MAX_NUM_CUSTOM_PROTOCOLS (NDPI_NUM_BITS-NDPI_LAST_IMPLEMENTED_PROTOCOL)
|
||||
|
||||
@@ -298,6 +298,7 @@ void init_snmp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int
|
||||
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);
|
||||
void init_ssl_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
|
||||
@@ -975,10 +975,8 @@ struct ndpi_flow_struct {
|
||||
#ifdef NDPI_PROTOCOL_FLORENSIA
|
||||
u_int32_t florensia_stage:1;
|
||||
#endif
|
||||
#ifdef NDPI_PROTOCOL_SOCKS5
|
||||
#ifdef NDPI_PROTOCOL_SOCKS
|
||||
u_int32_t socks5_stage:2; // 0 - 3
|
||||
#endif
|
||||
#ifdef NDPI_PROTOCOL_SOCKS4
|
||||
u_int32_t socks4_stage:2; // 0 - 3
|
||||
#endif
|
||||
#ifdef NDPI_PROTOCOL_EDONKEY
|
||||
|
||||
Reference in New Issue
Block a user