diff options
| author | Luca Deri <deri@ntop.org> | 2018-05-18 00:55:21 +0200 |
|---|---|---|
| committer | Luca Deri <deri@ntop.org> | 2018-05-18 00:55:21 +0200 |
| commit | f56b083bc374919f8b90b0c947d4bbaee33492ec (patch) | |
| tree | 0c87bf397b850f3748cb7e7f0df35604d48ec5c8 /src/include | |
| parent | 79be44ddea78734d0527fa5d3c973830f6dae844 (diff) | |
Implemented FacebookZero protocol support
https://code.facebook.com/posts/608854979307125/building-zero-protocol-for-fast-secure-mobile-connections/
Discontinued filetopia protocol
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ndpi_protocol_ids.h | 2 | ||||
| -rw-r--r-- | src/include/ndpi_protocols.h | 2 | ||||
| -rw-r--r-- | src/include/ndpi_typedefs.h | 4 |
3 files changed, 3 insertions, 5 deletions
diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index d1f29ea7f..c626d3d9f 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -67,7 +67,7 @@ #define NDPI_PROTOCOL_COAP 27 #define NDPI_PROTOCOL_VMWARE 28 #define NDPI_PROTOCOL_MAIL_SMTPS 29 -#define NDPI_PROTOCOL_FILETOPIA 30 +#define NDPI_PROTOCOL_FBZERO 30 #define NDPI_PROTOCOL_UBNTAC2 31 /* Ubiquity UBNT AirControl 2 - Thomas Fjellstrom <thomas+ndpi@fjellstrom.ca> */ #define NDPI_PROTOCOL_KONTIKI 32 #define NDPI_PROTOCOL_OPENFT 33 diff --git a/src/include/ndpi_protocols.h b/src/include/ndpi_protocols.h index 189b35a8e..f08b1de73 100644 --- a/src/include/ndpi_protocols.h +++ b/src/include/ndpi_protocols.h @@ -232,7 +232,6 @@ void init_eaq_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int3 void init_edonkey_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_fasttrack_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_fiesta_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); -void init_filetopia_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_florensia_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_ftp_control_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_ftp_data_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); @@ -356,4 +355,5 @@ void init_checkmk_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_ void init_apple_push_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_whatsapp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); void init_ajp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); +void init_fbzero_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask); #endif /* __NDPI_PROTOCOLS_H__ */ diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h index 2bffb4001..9ec6b7158 100644 --- a/src/include/ndpi_typedefs.h +++ b/src/include/ndpi_typedefs.h @@ -490,6 +490,7 @@ struct ndpi_flow_tcp_struct { u_int8_t irc_stage; u_int8_t irc_port; #endif + #ifdef NDPI_PROTOCOL_H323 u_int8_t h323_valid_packets; #endif @@ -505,9 +506,6 @@ struct ndpi_flow_tcp_struct { #ifdef NDPI_PROTOCOL_SOULSEEK u_int32_t soulseek_stage:2; #endif -#ifdef NDPI_PROTOCOL_FILETOPIA - u_int32_t filetopia_stage:2; -#endif #ifdef NDPI_PROTOCOL_TDS u_int32_t tds_stage:3; #endif |