diff options
| author | Luca <deri@ntop.org> | 2015-07-11 16:04:58 +0200 |
|---|---|---|
| committer | Luca <deri@ntop.org> | 2015-07-11 16:04:58 +0200 |
| commit | 2f347a33d8564ebb9f2bf42d344398912f682898 (patch) | |
| tree | 40bec29c9066ab267c8794fa239a73f8a16bffa0 /src/include | |
| parent | 436af982fdbb9e71237d9e6c6a045db9df96e166 (diff) | |
Fixes for issues #40 -> #52
Implemented sub-protocol detection for SSL/HTTP/HTTPS
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/ndpi_api.h | 8 | ||||
| -rw-r--r-- | src/include/ndpi_protocol_ids.h | 16 |
2 files changed, 18 insertions, 6 deletions
diff --git a/src/include/ndpi_api.h b/src/include/ndpi_api.h index d3fff5cfd..30948706b 100644 --- a/src/include/ndpi_api.h +++ b/src/include/ndpi_api.h @@ -173,11 +173,13 @@ extern "C" { u_int8_t proto, u_int32_t shost, u_int16_t sport, u_int32_t dhost, u_int16_t dport); ndpi_protocol ndpi_guess_undetected_protocol(struct ndpi_detection_module_struct *ndpi_struct, u_int8_t proto, u_int32_t shost, u_int16_t sport, u_int32_t dhost, u_int16_t dport); - int ndpi_match_string_subprotocol(struct ndpi_detection_module_struct *ndpi_struct, - struct ndpi_flow_struct *flow, char *string_to_match, u_int string_to_match_len); + int ndpi_match_host_subprotocol(struct ndpi_detection_module_struct *ndpi_struct, + struct ndpi_flow_struct *flow, char *string_to_match, u_int string_to_match_len, + u_int16_t master_protocol_id); int ndpi_match_content_subprotocol(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow, - char *string_to_match, u_int string_to_match_len); + char *string_to_match, u_int string_to_match_len, + u_int16_t master_protocol_id); int ndpi_match_bigram(struct ndpi_detection_module_struct *ndpi_struct, ndpi_automa *automa, char *bigram_to_match); char* ndpi_protocol2name(struct ndpi_detection_module_struct *ndpi_mod, ndpi_protocol proto, char *buf, u_int buf_len); diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h index 67b6189b7..bd31f50b6 100644 --- a/src/include/ndpi_protocol_ids.h +++ b/src/include/ndpi_protocol_ids.h @@ -220,7 +220,7 @@ #define NDPI_SERVICE_GOOGLE 126 #define NDPI_SERVICE_NETFLIX 133 #define NDPI_SERVICE_LASTFM 134 -#define NDPI_SERVICE_GROOVESHARK 135 +#define NDPI_SERVICE_WAZE 135 #define NDPI_SERVICE_APPLE 140 #define NDPI_SERVICE_WHATSAPP 142 #define NDPI_SERVICE_APPLE_ICLOUD 143 @@ -237,7 +237,7 @@ #define NDPI_SERVICE_YAHOO NDPI_PROTOCOL_YAHOO /* Tomasz Bujlow <tomasz@skatnet.dk> */ #define NDPI_SERVICE_PANDORA 187 #define NDPI_PROTOCOL_EAQ 190 -#define NDPI_SERVICE_MEU 191 +#define NDPI_SERVICE_TIMMEU 191 #define NDPI_SERVICE_TORCEDOR 192 #define NDPI_SERVICE_KAKAOTALK 193 /* KakaoTalk Chat (no voice call) */ #define NDPI_SERVICE_KAKAOTALK_VOICE 194 /* KakaoTalk Voice */ @@ -246,9 +246,19 @@ #define NDPI_SERVICE_TIM 197 /* Traffic for tim.com.br and tim.it */ #define NDPI_PROTOCOL_MPEGTS 198 #define NDPI_SERVICE_SNAPCHAT 199 +#define NDPI_SERVICE_SIMET 200 +#define NDPI_SERVICE_OPENSIGNAL 201 +#define NDPI_SERVICE_99TAXI 202 +#define NDPI_SERVICE_EASYTAXI 203 +#define NDPI_SERVICE_GLOBOTV 204 +#define NDPI_SERVICE_TIMSOMDECHAMADA 205 +#define NDPI_SERVICE_TIMMENU 206 +#define NDPI_SERVICE_TIMPORTASABERTAS 207 +#define NDPI_SERVICE_TIMRECARGA 208 +#define NDPI_SERVICE_TIMBETA 209 /* UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE */ -#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_SERVICE_SNAPCHAT +#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_SERVICE_TIMBETA #define NDPI_MAX_SUPPORTED_PROTOCOLS (NDPI_LAST_IMPLEMENTED_PROTOCOL + 1) #define NDPI_MAX_NUM_CUSTOM_PROTOCOLS (NDPI_NUM_BITS-NDPI_LAST_IMPLEMENTED_PROTOCOL) |