Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2ce4223e37 | ||
|
|
6a38ede42b | ||
|
|
206ce0a317 | ||
|
|
2184e0f7c2 | ||
|
|
0a46cba821 | ||
|
|
f719ef4fb0 |
+2
-2
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
NDPI_MAJOR="2"
|
NDPI_MAJOR="3"
|
||||||
NDPI_MINOR="9"
|
NDPI_MINOR="0"
|
||||||
NDPI_PATCH="0"
|
NDPI_PATCH="0"
|
||||||
NDPI_VERSION_SHORT="$NDPI_MAJOR.$NDPI_MINOR.$NDPI_PATCH"
|
NDPI_VERSION_SHORT="$NDPI_MAJOR.$NDPI_MINOR.$NDPI_PATCH"
|
||||||
|
|
||||||
|
|||||||
+21
-52
@@ -412,9 +412,15 @@ static void help(u_int long_help) {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
if(long_help) {
|
if(long_help) {
|
||||||
|
NDPI_PROTOCOL_BITMASK all;
|
||||||
|
|
||||||
printf("\n\nnDPI supported protocols:\n");
|
printf("\n\nnDPI supported protocols:\n");
|
||||||
printf("%3s %-22s %-12s %s\n", "Id", "Protocol", "Breed", "Category");
|
printf("%3s %-22s %-8s %-12s %s\n", "Id", "Protocol", "Layer_4", "Breed", "Category");
|
||||||
num_threads = 1;
|
num_threads = 1;
|
||||||
|
|
||||||
|
NDPI_BITMASK_SET_ALL(all);
|
||||||
|
ndpi_set_protocol_detection_bitmask2(ndpi_info_mod, &all);
|
||||||
|
|
||||||
ndpi_dump_protocols(ndpi_info_mod);
|
ndpi_dump_protocols(ndpi_info_mod);
|
||||||
}
|
}
|
||||||
exit(!long_help);
|
exit(!long_help);
|
||||||
@@ -1000,12 +1006,13 @@ static void printFlow(u_int16_t id, struct ndpi_flow_info *flow, u_int16_t threa
|
|||||||
json_object *jObj;
|
json_object *jObj;
|
||||||
#endif
|
#endif
|
||||||
FILE *out = results_file ? results_file : stdout;
|
FILE *out = results_file ? results_file : stdout;
|
||||||
|
u_int8_t known_tls;
|
||||||
|
|
||||||
if(csv_fp != NULL) {
|
if(csv_fp != NULL) {
|
||||||
char buf[32];
|
char buf[32];
|
||||||
float data_ratio = ndpi_data_ratio(flow->src2dst_bytes, flow->dst2src_bytes);
|
float data_ratio = ndpi_data_ratio(flow->src2dst_bytes, flow->dst2src_bytes);
|
||||||
float f = (float)flow->first_seen, l = (float)flow->last_seen;
|
float f = (float)flow->first_seen, l = (float)flow->last_seen;
|
||||||
|
|
||||||
/* PLEASE KEEP IN SYNC WITH printCSVHeader() */
|
/* PLEASE KEEP IN SYNC WITH printCSVHeader() */
|
||||||
|
|
||||||
fprintf(csv_fp, "%u,%u,%.3f,%.3f,%s,%u,%s,%u,",
|
fprintf(csv_fp, "%u,%u,%.3f,%.3f,%s,%u,%s,%u,",
|
||||||
@@ -1043,7 +1050,7 @@ static void printFlow(u_int16_t id, struct ndpi_flow_info *flow, u_int16_t threa
|
|||||||
(flow->ssh_tls.server_info[0] != '\0') ? flow->ssh_tls.server_info : "");
|
(flow->ssh_tls.server_info[0] != '\0') ? flow->ssh_tls.server_info : "");
|
||||||
|
|
||||||
fprintf(csv_fp, "%s,%s,%s,",
|
fprintf(csv_fp, "%s,%s,%s,",
|
||||||
(flow->ssh_tls.ssl_version != 0) ? ndpi_ssl_version2str(flow->ssh_tls.ssl_version) : "",
|
(flow->ssh_tls.ssl_version != 0) ? ndpi_ssl_version2str(flow->ssh_tls.ssl_version, &known_tls) : "",
|
||||||
(flow->ssh_tls.ja3_client[0] != '\0') ? flow->ssh_tls.ja3_client : "",
|
(flow->ssh_tls.ja3_client[0] != '\0') ? flow->ssh_tls.ja3_client : "",
|
||||||
(flow->ssh_tls.ja3_client[0] != '\0') ? is_unsafe_cipher(flow->ssh_tls.client_unsafe_cipher) : "");
|
(flow->ssh_tls.ja3_client[0] != '\0') ? is_unsafe_cipher(flow->ssh_tls.client_unsafe_cipher) : "");
|
||||||
|
|
||||||
@@ -1140,7 +1147,7 @@ static void printFlow(u_int16_t id, struct ndpi_flow_info *flow, u_int16_t threa
|
|||||||
fprintf(out, "[URL: %s][StatusCode: %u]",
|
fprintf(out, "[URL: %s][StatusCode: %u]",
|
||||||
flow->http.url, flow->http.response_status_code);
|
flow->http.url, flow->http.response_status_code);
|
||||||
|
|
||||||
if(flow->ssh_tls.ssl_version != 0) fprintf(out, "[%s]", ndpi_ssl_version2str(flow->ssh_tls.ssl_version));
|
if(flow->ssh_tls.ssl_version != 0) fprintf(out, "[%s]", ndpi_ssl_version2str(flow->ssh_tls.ssl_version, &known_tls));
|
||||||
if(flow->ssh_tls.client_info[0] != '\0') fprintf(out, "[Client: %s]", flow->ssh_tls.client_info);
|
if(flow->ssh_tls.client_info[0] != '\0') fprintf(out, "[Client: %s]", flow->ssh_tls.client_info);
|
||||||
if(flow->ssh_tls.client_hassh[0] != '\0') fprintf(out, "[HASSH-C: %s]", flow->ssh_tls.client_hassh);
|
if(flow->ssh_tls.client_hassh[0] != '\0') fprintf(out, "[HASSH-C: %s]", flow->ssh_tls.client_hassh);
|
||||||
|
|
||||||
@@ -1304,9 +1311,13 @@ static void node_proto_guess_walker(const void *node, ndpi_VISIT which, int dept
|
|||||||
u_int16_t thread_id = *((u_int16_t *) user_data);
|
u_int16_t thread_id = *((u_int16_t *) user_data);
|
||||||
|
|
||||||
if((which == ndpi_preorder) || (which == ndpi_leaf)) { /* Avoid walking the same node multiple times */
|
if((which == ndpi_preorder) || (which == ndpi_leaf)) { /* Avoid walking the same node multiple times */
|
||||||
if((!flow->detection_completed) && flow->ndpi_flow)
|
if((!flow->detection_completed) && flow->ndpi_flow) {
|
||||||
flow->detected_protocol = ndpi_detection_giveup(ndpi_thread_info[0].workflow->ndpi_struct, flow->ndpi_flow, enable_protocol_guess);
|
u_int8_t proto_guessed;
|
||||||
|
|
||||||
|
flow->detected_protocol = ndpi_detection_giveup(ndpi_thread_info[0].workflow->ndpi_struct,
|
||||||
|
flow->ndpi_flow, enable_protocol_guess, &proto_guessed);
|
||||||
|
}
|
||||||
|
|
||||||
process_ndpi_collected_info(ndpi_thread_info[thread_id].workflow, flow);
|
process_ndpi_collected_info(ndpi_thread_info[thread_id].workflow, flow);
|
||||||
|
|
||||||
ndpi_thread_info[thread_id].workflow->stats.protocol_counter[flow->detected_protocol.app_protocol] += flow->src2dst_packets + flow->dst2src_packets;
|
ndpi_thread_info[thread_id].workflow->stats.protocol_counter[flow->detected_protocol.app_protocol] += flow->src2dst_packets + flow->dst2src_packets;
|
||||||
@@ -1873,50 +1884,8 @@ static void setupDetection(u_int16_t thread_id, pcap_t * pcap_handle) {
|
|||||||
if(_protoFilePath != NULL)
|
if(_protoFilePath != NULL)
|
||||||
ndpi_load_protocols_file(ndpi_thread_info[thread_id].workflow->ndpi_struct, _protoFilePath);
|
ndpi_load_protocols_file(ndpi_thread_info[thread_id].workflow->ndpi_struct, _protoFilePath);
|
||||||
|
|
||||||
if(_customCategoryFilePath) {
|
if(_customCategoryFilePath)
|
||||||
FILE *fd = fopen(_customCategoryFilePath, "r");
|
ndpi_load_categories_file(ndpi_thread_info[thread_id].workflow->ndpi_struct, _customCategoryFilePath);
|
||||||
|
|
||||||
if(fd) {
|
|
||||||
while(fd) {
|
|
||||||
char buffer[512], *line, *name, *category;
|
|
||||||
int i;
|
|
||||||
|
|
||||||
if(!(line = fgets(buffer, sizeof(buffer), fd)))
|
|
||||||
break;
|
|
||||||
|
|
||||||
if(((i = strlen(line)) <= 1) || (line[0] == '#'))
|
|
||||||
continue;
|
|
||||||
else
|
|
||||||
line[i-1] = '\0';
|
|
||||||
|
|
||||||
name = strtok(line, "\t");
|
|
||||||
if(name) {
|
|
||||||
category = strtok(NULL, "\t");
|
|
||||||
|
|
||||||
if(category) {
|
|
||||||
int fields[4];
|
|
||||||
|
|
||||||
|
|
||||||
if(verbose && !quiet_mode) printf("[Category] Loading %s\t%s\n", name, category);
|
|
||||||
|
|
||||||
if(sscanf(name, "%d.%d.%d.%d", &fields[0], &fields[1], &fields[2], &fields[3]) == 4)
|
|
||||||
ndpi_load_ip_category(ndpi_thread_info[thread_id].workflow->ndpi_struct,
|
|
||||||
name, (ndpi_protocol_category_t)atoi(category));
|
|
||||||
else {
|
|
||||||
/* TODO free the strdup */
|
|
||||||
ndpi_load_hostname_category(ndpi_thread_info[thread_id].workflow->ndpi_struct,
|
|
||||||
strdup(name), (ndpi_protocol_category_t)atoi(category));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
ndpi_enable_loaded_categories(ndpi_thread_info[thread_id].workflow->ndpi_struct);
|
|
||||||
} else
|
|
||||||
printf("ERROR: Unable to read file %s\n", _customCategoryFilePath);
|
|
||||||
|
|
||||||
fclose(fd);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* *********************************************** */
|
/* *********************************************** */
|
||||||
|
|||||||
+14
-3
@@ -966,6 +966,14 @@ void process_ndpi_collected_info(struct ndpi_workflow * workflow, struct ndpi_fl
|
|||||||
else if(flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UBNTAC2) {
|
else if(flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UBNTAC2) {
|
||||||
snprintf(flow->info, sizeof(flow->info), "%s", flow->ndpi_flow->protos.ubntac2.version);
|
snprintf(flow->info, sizeof(flow->info), "%s", flow->ndpi_flow->protos.ubntac2.version);
|
||||||
}
|
}
|
||||||
|
/* KERBEROS */
|
||||||
|
else if(flow->detected_protocol.app_protocol == NDPI_PROTOCOL_KERBEROS) {
|
||||||
|
if(flow->ndpi_flow->protos.kerberos.cname[0] != '\0') {
|
||||||
|
snprintf(flow->info, sizeof(flow->info), "%s (%s)",
|
||||||
|
flow->ndpi_flow->protos.kerberos.cname,
|
||||||
|
flow->ndpi_flow->protos.kerberos.realm);
|
||||||
|
}
|
||||||
|
}
|
||||||
/* HTTP */
|
/* HTTP */
|
||||||
else if(flow->detected_protocol.master_protocol == NDPI_PROTOCOL_HTTP) {
|
else if(flow->detected_protocol.master_protocol == NDPI_PROTOCOL_HTTP) {
|
||||||
if(flow->ndpi_flow->http.url != NULL) {
|
if(flow->ndpi_flow->http.url != NULL) {
|
||||||
@@ -1230,10 +1238,13 @@ static struct ndpi_proto packet_processing(struct ndpi_workflow * workflow,
|
|||||||
if(ndpi_flow && ndpi_flow->check_extra_packets)
|
if(ndpi_flow && ndpi_flow->check_extra_packets)
|
||||||
flow->check_extra_packets = 1;
|
flow->check_extra_packets = 1;
|
||||||
|
|
||||||
if(flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN)
|
if(flow->detected_protocol.app_protocol == NDPI_PROTOCOL_UNKNOWN) {
|
||||||
|
u_int8_t proto_guessed;
|
||||||
|
|
||||||
flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow,
|
flow->detected_protocol = ndpi_detection_giveup(workflow->ndpi_struct, flow->ndpi_flow,
|
||||||
enable_protocol_guess);
|
enable_protocol_guess, &proto_guessed);
|
||||||
|
}
|
||||||
|
|
||||||
process_ndpi_collected_info(workflow, flow);
|
process_ndpi_collected_info(workflow, flow);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+27
-8
@@ -225,12 +225,14 @@ extern "C" {
|
|||||||
* @par ndpi_struct = the detection module
|
* @par ndpi_struct = the detection module
|
||||||
* @par flow = the flow given for the detection module
|
* @par flow = the flow given for the detection module
|
||||||
* @par enable_guess = guess protocol if unknown
|
* @par enable_guess = guess protocol if unknown
|
||||||
|
* @par protocol_was_guessed = 1 if the protocol was guesses (requires enable_guess = 1), 0 otherwise
|
||||||
* @return the detected protocol even if the flow is not completed;
|
* @return the detected protocol even if the flow is not completed;
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
ndpi_protocol ndpi_detection_giveup(struct ndpi_detection_module_struct *ndpi_struct,
|
ndpi_protocol ndpi_detection_giveup(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
struct ndpi_flow_struct *flow,
|
struct ndpi_flow_struct *flow,
|
||||||
u_int8_t enable_guess);
|
u_int8_t enable_guess,
|
||||||
|
u_int8_t *protocol_was_guessed);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Processes an extra packet in order to get more information for a given protocol
|
* Processes an extra packet in order to get more information for a given protocol
|
||||||
@@ -613,6 +615,16 @@ extern "C" {
|
|||||||
int ndpi_load_protocols_file(struct ndpi_detection_module_struct *ndpi_mod,
|
int ndpi_load_protocols_file(struct ndpi_detection_module_struct *ndpi_mod,
|
||||||
const char* path);
|
const char* path);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Read a file and load the categories
|
||||||
|
*
|
||||||
|
* @par ndpi_mod = the detection module
|
||||||
|
* @par path = the path of the file
|
||||||
|
* @return 0 if the file is loaded correctly;
|
||||||
|
* -1 else
|
||||||
|
*/
|
||||||
|
int ndpi_load_categories_file(struct ndpi_detection_module_struct *ndpi_str, const char* path);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the total number of the supported protocols
|
* Get the total number of the supported protocols
|
||||||
*
|
*
|
||||||
@@ -744,26 +756,32 @@ extern "C" {
|
|||||||
*/
|
*/
|
||||||
int ndpi_match_string(void *_automa, char *string_to_match);
|
int ndpi_match_string(void *_automa, char *string_to_match);
|
||||||
|
|
||||||
void ndpi_load_ip_category(struct ndpi_detection_module_struct *ndpi_struct,
|
int ndpi_load_ip_category(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
char *ip_address_and_mask, ndpi_protocol_category_t category);
|
const char *ip_address_and_mask, ndpi_protocol_category_t category);
|
||||||
int ndpi_load_hostname_category(struct ndpi_detection_module_struct *ndpi_struct,
|
int ndpi_load_hostname_category(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
char *name, ndpi_protocol_category_t category);
|
const char *name_to_add, ndpi_protocol_category_t category);
|
||||||
|
int ndpi_load_category(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
|
const char *ip_or_name, ndpi_protocol_category_t category);
|
||||||
int ndpi_enable_loaded_categories(struct ndpi_detection_module_struct *ndpi_struct);
|
int ndpi_enable_loaded_categories(struct ndpi_detection_module_struct *ndpi_struct);
|
||||||
int ndpi_fill_ip_protocol_category(struct ndpi_detection_module_struct *ndpi_struct,
|
int ndpi_fill_ip_protocol_category(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
u_int32_t saddr,
|
u_int32_t saddr,
|
||||||
u_int32_t daddr,
|
u_int32_t daddr,
|
||||||
ndpi_protocol *ret);
|
ndpi_protocol *ret);
|
||||||
int ndpi_match_custom_category(struct ndpi_detection_module_struct *ndpi_struct,
|
int ndpi_match_custom_category(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
char *name, unsigned long *id);
|
char *name, u_int name_len, unsigned long *id);
|
||||||
void ndpi_fill_protocol_category(struct ndpi_detection_module_struct *ndpi_struct,
|
void ndpi_fill_protocol_category(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
struct ndpi_flow_struct *flow,
|
struct ndpi_flow_struct *flow,
|
||||||
ndpi_protocol *ret);
|
ndpi_protocol *ret);
|
||||||
int ndpi_get_custom_category_match(struct ndpi_detection_module_struct *ndpi_struct,
|
int ndpi_get_custom_category_match(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
char *name_or_ip, unsigned long *id);
|
char *name_or_ip, u_int name_len, unsigned long *id);
|
||||||
int ndpi_set_detection_preferences(struct ndpi_detection_module_struct *ndpi_mod,
|
int ndpi_set_detection_preferences(struct ndpi_detection_module_struct *ndpi_mod,
|
||||||
ndpi_detection_preference pref,
|
ndpi_detection_preference pref,
|
||||||
int value);
|
int value);
|
||||||
|
|
||||||
|
/* Tells to called on what l4 protocol given application protocol can be found */
|
||||||
|
ndpi_l4_proto_info ndpi_get_l4_proto_info(struct ndpi_detection_module_struct *ndpi_struct, u_int16_t ndpi_proto_id);
|
||||||
|
const char* ndpi_get_l4_proto_name(ndpi_l4_proto_info proto);
|
||||||
|
|
||||||
ndpi_proto_defaults_t* ndpi_get_proto_defaults(struct ndpi_detection_module_struct *ndpi_mod);
|
ndpi_proto_defaults_t* ndpi_get_proto_defaults(struct ndpi_detection_module_struct *ndpi_mod);
|
||||||
u_int ndpi_get_ndpi_num_supported_protocols(struct ndpi_detection_module_struct *ndpi_mod);
|
u_int ndpi_get_ndpi_num_supported_protocols(struct ndpi_detection_module_struct *ndpi_mod);
|
||||||
u_int ndpi_get_ndpi_num_custom_protocols(struct ndpi_detection_module_struct *ndpi_mod);
|
u_int ndpi_get_ndpi_num_custom_protocols(struct ndpi_detection_module_struct *ndpi_mod);
|
||||||
@@ -782,11 +800,12 @@ extern "C" {
|
|||||||
*
|
*
|
||||||
* @par The automata initialized with ndpi_init_automa();
|
* @par The automata initialized with ndpi_init_automa();
|
||||||
* @par The (sub)string to search
|
* @par The (sub)string to search
|
||||||
|
* @par The (sub)string length
|
||||||
* @par The id associated with the matched string or 0 id not found.
|
* @par The id associated with the matched string or 0 id not found.
|
||||||
* @return 0 in case of match, or -1 if no match, or -2 if an error occurred.
|
* @return 0 in case of match, or -1 if no match, or -2 if an error occurred.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
int ndpi_match_string_id(void *_automa, char *string_to_match, unsigned long *id);
|
int ndpi_match_string_id(void *_automa, char *string_to_match, u_int match_len, unsigned long *id);
|
||||||
|
|
||||||
/* Utility functions to set ndpi malloc/free/print wrappers */
|
/* Utility functions to set ndpi malloc/free/print wrappers */
|
||||||
void set_ndpi_malloc(void* (*__ndpi_malloc)(size_t size));
|
void set_ndpi_malloc(void* (*__ndpi_malloc)(size_t size));
|
||||||
@@ -816,7 +835,7 @@ extern "C" {
|
|||||||
char *buffer, u_int buffer_size,
|
char *buffer, u_int buffer_size,
|
||||||
u_int8_t min_string_match_len, /* Will return 0 if no string > min_string_match_len have been found */
|
u_int8_t min_string_match_len, /* Will return 0 if no string > min_string_match_len have been found */
|
||||||
char *outbuf, u_int outbuf_len);
|
char *outbuf, u_int outbuf_len);
|
||||||
char* ndpi_ssl_version2str(u_int16_t version);
|
char* ndpi_ssl_version2str(u_int16_t version, u_int8_t *unknown_tls_version);
|
||||||
|
|
||||||
/* Serializer */
|
/* Serializer */
|
||||||
int ndpi_init_serializer_ll(ndpi_serializer *serializer, ndpi_serialization_format fmt,
|
int ndpi_init_serializer_ll(ndpi_serializer *serializer, ndpi_serialization_format fmt,
|
||||||
|
|||||||
@@ -35,6 +35,13 @@ typedef enum {
|
|||||||
NDPI_LOG_DEBUG_EXTRA
|
NDPI_LOG_DEBUG_EXTRA
|
||||||
} ndpi_log_level_t;
|
} ndpi_log_level_t;
|
||||||
|
|
||||||
|
typedef enum {
|
||||||
|
ndpi_l4_proto_unknown = 0,
|
||||||
|
ndpi_l4_proto_tcp_only,
|
||||||
|
ndpi_l4_proto_udp_only,
|
||||||
|
ndpi_l4_proto_tcp_and_udp,
|
||||||
|
} ndpi_l4_proto_info;
|
||||||
|
|
||||||
/* NDPI_VISIT */
|
/* NDPI_VISIT */
|
||||||
typedef enum {
|
typedef enum {
|
||||||
ndpi_preorder,
|
ndpi_preorder,
|
||||||
@@ -1182,6 +1189,10 @@ struct ndpi_flow_struct {
|
|||||||
u_int8_t version;
|
u_int8_t version;
|
||||||
} ntp;
|
} ntp;
|
||||||
|
|
||||||
|
struct {
|
||||||
|
char cname[24], realm[24];
|
||||||
|
} kerberos;
|
||||||
|
|
||||||
struct {
|
struct {
|
||||||
struct {
|
struct {
|
||||||
u_int16_t ssl_version;
|
u_int16_t ssl_version;
|
||||||
|
|||||||
+193
-69
@@ -368,7 +368,7 @@ static void addDefaultPort(struct ndpi_detection_module_struct *ndpi_str,
|
|||||||
for(port=range->port_low; port<=range->port_high; port++) {
|
for(port=range->port_low; port<=range->port_high; port++) {
|
||||||
ndpi_default_ports_tree_node_t *node = (ndpi_default_ports_tree_node_t*)ndpi_malloc(sizeof(ndpi_default_ports_tree_node_t));
|
ndpi_default_ports_tree_node_t *node = (ndpi_default_ports_tree_node_t*)ndpi_malloc(sizeof(ndpi_default_ports_tree_node_t));
|
||||||
ndpi_default_ports_tree_node_t *ret;
|
ndpi_default_ports_tree_node_t *ret;
|
||||||
|
|
||||||
if(!node) {
|
if(!node) {
|
||||||
NDPI_LOG_ERR(ndpi_str, "%s:%d not enough memory\n", _func, _line);
|
NDPI_LOG_ERR(ndpi_str, "%s:%d not enough memory\n", _func, _line);
|
||||||
break;
|
break;
|
||||||
@@ -404,7 +404,7 @@ static int removeDefaultPort(ndpi_port_range *range,
|
|||||||
|
|
||||||
for(port=range->port_low; port<=range->port_high; port++) {
|
for(port=range->port_low; port<=range->port_high; port++) {
|
||||||
ndpi_default_ports_tree_node_t *ret;
|
ndpi_default_ports_tree_node_t *ret;
|
||||||
|
|
||||||
node.proto = def, node.default_port = port;
|
node.proto = def, node.default_port = port;
|
||||||
ret = (ndpi_default_ports_tree_node_t*)ndpi_tdelete(&node, (void*)root,
|
ret = (ndpi_default_ports_tree_node_t*)ndpi_tdelete(&node, (void*)root,
|
||||||
ndpi_default_ports_tree_node_t_cmp); /* Add it to the tree */
|
ndpi_default_ports_tree_node_t_cmp); /* Add it to the tree */
|
||||||
@@ -2234,7 +2234,7 @@ int ndpi_match_string(void *_automa, char *string_to_match) {
|
|||||||
|
|
||||||
/* ****************************************************** */
|
/* ****************************************************** */
|
||||||
|
|
||||||
int ndpi_match_string_id(void *_automa, char *string_to_match, unsigned long *id) {
|
int ndpi_match_string_id(void *_automa, char *string_to_match, u_int match_len, unsigned long *id) {
|
||||||
AC_TEXT_t ac_input_text;
|
AC_TEXT_t ac_input_text;
|
||||||
AC_AUTOMATA_t *automa = (AC_AUTOMATA_t*)_automa;
|
AC_AUTOMATA_t *automa = (AC_AUTOMATA_t*)_automa;
|
||||||
AC_REP_t match = { NDPI_PROTOCOL_UNKNOWN, NDPI_PROTOCOL_CATEGORY_UNSPECIFIED, NDPI_PROTOCOL_UNRATED };
|
AC_REP_t match = { NDPI_PROTOCOL_UNKNOWN, NDPI_PROTOCOL_CATEGORY_UNSPECIFIED, NDPI_PROTOCOL_UNRATED };
|
||||||
@@ -2246,7 +2246,7 @@ int ndpi_match_string_id(void *_automa, char *string_to_match, unsigned long *id
|
|||||||
|| (string_to_match[0] == '\0'))
|
|| (string_to_match[0] == '\0'))
|
||||||
return(-2);
|
return(-2);
|
||||||
|
|
||||||
ac_input_text.astring = string_to_match, ac_input_text.length = strlen(string_to_match);
|
ac_input_text.astring = string_to_match, ac_input_text.length = match_len;
|
||||||
rc = ac_automata_search(automa, &ac_input_text, &match);
|
rc = ac_automata_search(automa, &ac_input_text, &match);
|
||||||
ac_automata_reset(automa);
|
ac_automata_reset(automa);
|
||||||
|
|
||||||
@@ -2283,7 +2283,7 @@ static int hyperscanCustomEventHandler(unsigned int id,
|
|||||||
/* *********************************************** */
|
/* *********************************************** */
|
||||||
|
|
||||||
int ndpi_match_custom_category(struct ndpi_detection_module_struct *ndpi_str,
|
int ndpi_match_custom_category(struct ndpi_detection_module_struct *ndpi_str,
|
||||||
char *name, unsigned long *id) {
|
char *name, u_int name_len, unsigned long *id) {
|
||||||
#ifdef HAVE_HYPERSCAN
|
#ifdef HAVE_HYPERSCAN
|
||||||
if(ndpi_str->custom_categories.hostnames == NULL)
|
if(ndpi_str->custom_categories.hostnames == NULL)
|
||||||
return(-1);
|
return(-1);
|
||||||
@@ -2293,7 +2293,7 @@ int ndpi_match_custom_category(struct ndpi_detection_module_struct *ndpi_str,
|
|||||||
*id = (unsigned long)-1;
|
*id = (unsigned long)-1;
|
||||||
|
|
||||||
rc = hs_scan(ndpi_str->custom_categories.hostnames->database,
|
rc = hs_scan(ndpi_str->custom_categories.hostnames->database,
|
||||||
name, strlen(name), 0,
|
name, name_len, 0,
|
||||||
ndpi_str->custom_categories.hostnames->scratch,
|
ndpi_str->custom_categories.hostnames->scratch,
|
||||||
hyperscanCustomEventHandler, id);
|
hyperscanCustomEventHandler, id);
|
||||||
|
|
||||||
@@ -2306,21 +2306,27 @@ int ndpi_match_custom_category(struct ndpi_detection_module_struct *ndpi_str,
|
|||||||
return(-1);
|
return(-1);
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
return(ndpi_match_string_id(ndpi_str->custom_categories.hostnames.ac_automa, name, id));
|
return(ndpi_match_string_id(ndpi_str->custom_categories.hostnames.ac_automa, name, name_len, id));
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
/* *********************************************** */
|
/* *********************************************** */
|
||||||
|
|
||||||
int ndpi_get_custom_category_match(struct ndpi_detection_module_struct *ndpi_str,
|
int ndpi_get_custom_category_match(struct ndpi_detection_module_struct *ndpi_str,
|
||||||
char *name_or_ip, unsigned long *id) {
|
char *name_or_ip, u_int name_len, unsigned long *id) {
|
||||||
char ipbuf[64], *ptr;
|
char ipbuf[64], *ptr;
|
||||||
struct in_addr pin;
|
struct in_addr pin;
|
||||||
|
u_int cp_len = ndpi_min(sizeof(ipbuf)-1, name_len);
|
||||||
|
|
||||||
if(!ndpi_str->custom_categories.categories_loaded)
|
if(!ndpi_str->custom_categories.categories_loaded)
|
||||||
return(-1);
|
return(-1);
|
||||||
|
|
||||||
snprintf(ipbuf, sizeof(ipbuf)-1, "%s", name_or_ip);
|
if(cp_len > 0) {
|
||||||
|
memcpy(ipbuf, name_or_ip, cp_len);
|
||||||
|
ipbuf[cp_len] = '\0';
|
||||||
|
} else
|
||||||
|
ipbuf[0] = '\0';
|
||||||
|
|
||||||
ptr = strrchr(ipbuf, '/');
|
ptr = strrchr(ipbuf, '/');
|
||||||
|
|
||||||
if(ptr)
|
if(ptr)
|
||||||
@@ -2343,7 +2349,7 @@ int ndpi_get_custom_category_match(struct ndpi_detection_module_struct *ndpi_str
|
|||||||
return(-1);
|
return(-1);
|
||||||
} else
|
} else
|
||||||
/* Search Host */
|
/* Search Host */
|
||||||
return(ndpi_match_custom_category(ndpi_str, name_or_ip, id));
|
return(ndpi_match_custom_category(ndpi_str, name_or_ip, name_len, id));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* *********************************************** */
|
/* *********************************************** */
|
||||||
@@ -2405,10 +2411,10 @@ void ndpi_exit_detection_module(struct ndpi_detection_module_struct *ndpi_str) {
|
|||||||
free_hyperscan_memory(ndpi_str->custom_categories.hostnames);
|
free_hyperscan_memory(ndpi_str->custom_categories.hostnames);
|
||||||
#else
|
#else
|
||||||
if(ndpi_str->custom_categories.hostnames.ac_automa != NULL)
|
if(ndpi_str->custom_categories.hostnames.ac_automa != NULL)
|
||||||
ac_automata_release((AC_AUTOMATA_t*)ndpi_str->custom_categories.hostnames.ac_automa, 0);
|
ac_automata_release((AC_AUTOMATA_t*)ndpi_str->custom_categories.hostnames.ac_automa, 1 /* free patterns strings memory */);
|
||||||
|
|
||||||
if(ndpi_str->custom_categories.hostnames_shadow.ac_automa != NULL)
|
if(ndpi_str->custom_categories.hostnames_shadow.ac_automa != NULL)
|
||||||
ac_automata_release((AC_AUTOMATA_t*)ndpi_str->custom_categories.hostnames_shadow.ac_automa, 0);
|
ac_automata_release((AC_AUTOMATA_t*)ndpi_str->custom_categories.hostnames_shadow.ac_automa, 1 /* free patterns strings memory */);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if(ndpi_str->custom_categories.ipAddresses != NULL)
|
if(ndpi_str->custom_categories.ipAddresses != NULL)
|
||||||
@@ -2449,7 +2455,7 @@ static ndpi_default_ports_tree_node_t* ndpi_get_guessed_protocol_id(struct ndpi_
|
|||||||
int low = ndpi_min(sport, dport);
|
int low = ndpi_min(sport, dport);
|
||||||
int high = ndpi_max(sport, dport);
|
int high = ndpi_max(sport, dport);
|
||||||
const void *ret;
|
const void *ret;
|
||||||
|
|
||||||
node.default_port = low; /* Check server port first */
|
node.default_port = low; /* Check server port first */
|
||||||
ret = ndpi_tfind(&node,
|
ret = ndpi_tfind(&node,
|
||||||
(proto == IPPROTO_TCP) ? (void*)&ndpi_str->tcpRoot : (void*)&ndpi_str->udpRoot,
|
(proto == IPPROTO_TCP) ? (void*)&ndpi_str->tcpRoot : (void*)&ndpi_str->udpRoot,
|
||||||
@@ -2691,6 +2697,57 @@ int ndpi_handle_rule(struct ndpi_detection_module_struct *ndpi_str,
|
|||||||
|
|
||||||
/* ******************************************************************** */
|
/* ******************************************************************** */
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Format:
|
||||||
|
*
|
||||||
|
* <host|ip> <category_id>
|
||||||
|
*
|
||||||
|
* Notes:
|
||||||
|
* - host and category are separated by a single TAB
|
||||||
|
* - empty lines or lines starting with # are ignored
|
||||||
|
*/
|
||||||
|
int ndpi_load_categories_file(struct ndpi_detection_module_struct *ndpi_str, const char* path) {
|
||||||
|
char buffer[512], *line, *name, *category, *saveptr;
|
||||||
|
FILE *fd;
|
||||||
|
int len;
|
||||||
|
|
||||||
|
fd = fopen(path, "r");
|
||||||
|
|
||||||
|
if(fd == NULL) {
|
||||||
|
NDPI_LOG_ERR(ndpi_str, "Unable to open file %s [%s]\n", path, strerror(errno));
|
||||||
|
return(-1);
|
||||||
|
}
|
||||||
|
|
||||||
|
while(fd) {
|
||||||
|
line = fgets(buffer, sizeof(buffer), fd);
|
||||||
|
|
||||||
|
if(line == NULL)
|
||||||
|
break;
|
||||||
|
|
||||||
|
len = strlen(line);
|
||||||
|
|
||||||
|
if((len <= 1) || (line[0] == '#'))
|
||||||
|
continue;
|
||||||
|
|
||||||
|
line[len-1] = '\0';
|
||||||
|
name = strtok_r(line, "\t", &saveptr);
|
||||||
|
|
||||||
|
if(name) {
|
||||||
|
category = strtok_r(NULL, "\t", &saveptr);
|
||||||
|
|
||||||
|
if(category)
|
||||||
|
ndpi_load_category(ndpi_str, name, (ndpi_protocol_category_t) atoi(category));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fclose(fd);
|
||||||
|
ndpi_enable_loaded_categories(ndpi_str);
|
||||||
|
|
||||||
|
return(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ******************************************************************** */
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Format:
|
Format:
|
||||||
<tcp|udp>:<port>,<tcp|udp>:<port>,.....@<proto>
|
<tcp|udp>:<port>,<tcp|udp>:<port>,.....@<proto>
|
||||||
@@ -3368,8 +3425,7 @@ void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *n
|
|||||||
for(a = 0; a < ndpi_str->callback_buffer_size; a++) {
|
for(a = 0; a < ndpi_str->callback_buffer_size; a++) {
|
||||||
if((ndpi_str->callback_buffer[a].ndpi_selection_bitmask & (NDPI_SELECTION_BITMASK_PROTOCOL_INT_TCP |
|
if((ndpi_str->callback_buffer[a].ndpi_selection_bitmask & (NDPI_SELECTION_BITMASK_PROTOCOL_INT_TCP |
|
||||||
NDPI_SELECTION_BITMASK_PROTOCOL_INT_UDP |
|
NDPI_SELECTION_BITMASK_PROTOCOL_INT_UDP |
|
||||||
NDPI_SELECTION_BITMASK_PROTOCOL_INT_TCP_OR_UDP))
|
NDPI_SELECTION_BITMASK_PROTOCOL_INT_TCP_OR_UDP)) == 0
|
||||||
== 0
|
|
||||||
|| (ndpi_str->
|
|| (ndpi_str->
|
||||||
callback_buffer[a].ndpi_selection_bitmask & NDPI_SELECTION_BITMASK_PROTOCOL_COMPLETE_TRAFFIC) != 0) {
|
callback_buffer[a].ndpi_selection_bitmask & NDPI_SELECTION_BITMASK_PROTOCOL_COMPLETE_TRAFFIC) != 0) {
|
||||||
if(_ndpi_debug_callbacks) NDPI_LOG_DBG2(ndpi_str,
|
if(_ndpi_debug_callbacks) NDPI_LOG_DBG2(ndpi_str,
|
||||||
@@ -4043,9 +4099,13 @@ ndpi_protocol ndpi_get_partial_detection(struct ndpi_detection_module_struct *nd
|
|||||||
/* ********************************************************************************* */
|
/* ********************************************************************************* */
|
||||||
|
|
||||||
ndpi_protocol ndpi_detection_giveup(struct ndpi_detection_module_struct *ndpi_str,
|
ndpi_protocol ndpi_detection_giveup(struct ndpi_detection_module_struct *ndpi_str,
|
||||||
struct ndpi_flow_struct *flow, u_int8_t enable_guess) {
|
struct ndpi_flow_struct *flow,
|
||||||
|
u_int8_t enable_guess,
|
||||||
|
u_int8_t *protocol_was_guessed) {
|
||||||
ndpi_protocol ret = { NDPI_PROTOCOL_UNKNOWN, NDPI_PROTOCOL_UNKNOWN, NDPI_PROTOCOL_CATEGORY_UNSPECIFIED };
|
ndpi_protocol ret = { NDPI_PROTOCOL_UNKNOWN, NDPI_PROTOCOL_UNKNOWN, NDPI_PROTOCOL_CATEGORY_UNSPECIFIED };
|
||||||
|
|
||||||
|
*protocol_was_guessed = 0;
|
||||||
|
|
||||||
if(flow == NULL)
|
if(flow == NULL)
|
||||||
return(ret);
|
return(ret);
|
||||||
|
|
||||||
@@ -4109,7 +4169,6 @@ ndpi_protocol ndpi_detection_giveup(struct ndpi_detection_module_struct *ndpi_st
|
|||||||
&& (flow->protos.stun_ssl.stun.num_processed_pkts > 0))
|
&& (flow->protos.stun_ssl.stun.num_processed_pkts > 0))
|
||||||
guessed_protocol_id = NDPI_PROTOCOL_STUN;
|
guessed_protocol_id = NDPI_PROTOCOL_STUN;
|
||||||
|
|
||||||
|
|
||||||
if(flow->host_server_name[0] != '\0') {
|
if(flow->host_server_name[0] != '\0') {
|
||||||
ndpi_protocol_match_result ret_match;
|
ndpi_protocol_match_result ret_match;
|
||||||
|
|
||||||
@@ -4166,7 +4225,7 @@ ndpi_protocol ndpi_detection_giveup(struct ndpi_detection_module_struct *ndpi_st
|
|||||||
&& (ret.app_protocol == NDPI_PROTOCOL_UNKNOWN)
|
&& (ret.app_protocol == NDPI_PROTOCOL_UNKNOWN)
|
||||||
&& flow->packet.iph /* Guess only IPv4 */
|
&& flow->packet.iph /* Guess only IPv4 */
|
||||||
&& (flow->packet.tcp || flow->packet.udp)
|
&& (flow->packet.tcp || flow->packet.udp)
|
||||||
)
|
) {
|
||||||
ret = ndpi_guess_undetected_protocol(ndpi_str,
|
ret = ndpi_guess_undetected_protocol(ndpi_str,
|
||||||
flow,
|
flow,
|
||||||
flow->packet.l4_protocol,
|
flow->packet.l4_protocol,
|
||||||
@@ -4175,7 +4234,9 @@ ndpi_protocol ndpi_detection_giveup(struct ndpi_detection_module_struct *ndpi_st
|
|||||||
ntohl(flow->packet.iph->daddr),
|
ntohl(flow->packet.iph->daddr),
|
||||||
ntohs(flow->packet.udp ? flow->packet.udp->dest : flow->packet.tcp->dest)
|
ntohs(flow->packet.udp ? flow->packet.udp->dest : flow->packet.tcp->dest)
|
||||||
);
|
);
|
||||||
|
*protocol_was_guessed = 1;
|
||||||
|
}
|
||||||
|
|
||||||
ndpi_fill_protocol_category(ndpi_str, flow, &ret);
|
ndpi_fill_protocol_category(ndpi_str, flow, &ret);
|
||||||
|
|
||||||
return(ret);
|
return(ret);
|
||||||
@@ -4226,38 +4287,46 @@ void ndpi_process_extra_packet(struct ndpi_detection_module_struct *ndpi_str,
|
|||||||
|
|
||||||
/* ********************************************************************************* */
|
/* ********************************************************************************* */
|
||||||
|
|
||||||
void ndpi_load_ip_category(struct ndpi_detection_module_struct *ndpi_str,
|
int ndpi_load_ip_category(struct ndpi_detection_module_struct *ndpi_str,
|
||||||
char *ip_address_and_mask, ndpi_protocol_category_t category) {
|
const char *ip_address_and_mask, ndpi_protocol_category_t category) {
|
||||||
patricia_node_t *node;
|
patricia_node_t *node;
|
||||||
struct in_addr pin;
|
struct in_addr pin;
|
||||||
int bits = 32;
|
int bits = 32;
|
||||||
char *ptr = strrchr(ip_address_and_mask, '/');
|
char *ptr;
|
||||||
|
char ipbuf[64];
|
||||||
|
|
||||||
|
strncpy(ipbuf, ip_address_and_mask, sizeof(ipbuf));
|
||||||
|
ipbuf[sizeof(ipbuf) - 1] = '\0';
|
||||||
|
|
||||||
|
ptr = strrchr(ipbuf, '/');
|
||||||
|
|
||||||
if(ptr) {
|
if(ptr) {
|
||||||
ptr++;
|
*(ptr++) = '\0';
|
||||||
if(atoi(ptr)>=0 && atoi(ptr)<=32)
|
if(atoi(ptr)>=0 && atoi(ptr)<=32)
|
||||||
bits = atoi(ptr);
|
bits = atoi(ptr);
|
||||||
}
|
}
|
||||||
|
|
||||||
inet_pton(AF_INET, ip_address_and_mask, &pin);
|
if(inet_pton(AF_INET, ipbuf, &pin) != 1) {
|
||||||
|
NDPI_LOG_DBG2(ndpi_str, "Invalid ip/ip+netmask: %s\n", ip_address_and_mask);
|
||||||
|
return(-1);
|
||||||
|
}
|
||||||
|
|
||||||
if((node = add_to_ptree(ndpi_str->custom_categories.ipAddresses_shadow,
|
if((node = add_to_ptree(ndpi_str->custom_categories.ipAddresses_shadow,
|
||||||
AF_INET, &pin, bits)) != NULL)
|
AF_INET, &pin, bits)) != NULL)
|
||||||
node->value.user_value = (int)category;
|
node->value.user_value = (int)category;
|
||||||
|
return(0);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ********************************************************************************* */
|
/* ********************************************************************************* */
|
||||||
|
|
||||||
/*
|
|
||||||
*
|
|
||||||
* IMPORTANT
|
|
||||||
*
|
|
||||||
* The *name pointer MUST be kept allocated until the automa is finalized and it
|
|
||||||
* cannot be recycled across multiple ndpi_load_hostname_category() calls
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
int ndpi_load_hostname_category(struct ndpi_detection_module_struct *ndpi_str,
|
int ndpi_load_hostname_category(struct ndpi_detection_module_struct *ndpi_str,
|
||||||
char *name, ndpi_protocol_category_t category) {
|
const char *name_to_add, ndpi_protocol_category_t category) {
|
||||||
|
char *name;
|
||||||
|
|
||||||
|
if(name_to_add == NULL)
|
||||||
|
return(-1);
|
||||||
|
|
||||||
|
name = ndpi_strdup(name_to_add);
|
||||||
|
|
||||||
if(name == NULL)
|
if(name == NULL)
|
||||||
return(-1);
|
return(-1);
|
||||||
@@ -4271,30 +4340,32 @@ int ndpi_load_hostname_category(struct ndpi_detection_module_struct *ndpi_str,
|
|||||||
struct hs_list *h = (struct hs_list*)ndpi_malloc(sizeof(struct hs_list));
|
struct hs_list *h = (struct hs_list*)ndpi_malloc(sizeof(struct hs_list));
|
||||||
|
|
||||||
if(h) {
|
if(h) {
|
||||||
h->expression = ndpi_strdup(name), h->id = (unsigned int)category;
|
h->expression = name, h->id = (unsigned int)category;
|
||||||
if(h->expression == NULL) {
|
|
||||||
ndpi_free(h);
|
|
||||||
return(-2);
|
|
||||||
}
|
|
||||||
|
|
||||||
h->next = ndpi_str->custom_categories.to_load;
|
h->next = ndpi_str->custom_categories.to_load;
|
||||||
ndpi_str->custom_categories.to_load = h;
|
ndpi_str->custom_categories.to_load = h;
|
||||||
ndpi_str->custom_categories.num_to_load++;
|
ndpi_str->custom_categories.num_to_load++;
|
||||||
} else
|
} else {
|
||||||
return(-1);
|
free(name);
|
||||||
|
return(-1);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
AC_PATTERN_t ac_pattern;
|
AC_PATTERN_t ac_pattern;
|
||||||
|
|
||||||
memset(&ac_pattern, 0, sizeof(ac_pattern));
|
memset(&ac_pattern, 0, sizeof(ac_pattern));
|
||||||
|
|
||||||
if(ndpi_str->custom_categories.hostnames_shadow.ac_automa == NULL)
|
if(ndpi_str->custom_categories.hostnames_shadow.ac_automa == NULL) {
|
||||||
|
free(name);
|
||||||
return(-1);
|
return(-1);
|
||||||
|
}
|
||||||
|
|
||||||
ac_pattern.astring = name, ac_pattern.length = strlen(ac_pattern.astring);
|
ac_pattern.astring = name, ac_pattern.length = strlen(ac_pattern.astring);
|
||||||
ac_pattern.rep.number = (int)category;
|
ac_pattern.rep.number = (int)category;
|
||||||
|
|
||||||
ac_automata_add(ndpi_str->custom_categories.hostnames_shadow.ac_automa, &ac_pattern);
|
if(ac_automata_add(ndpi_str->custom_categories.hostnames_shadow.ac_automa, &ac_pattern) != ACERR_SUCCESS) {
|
||||||
|
free(name);
|
||||||
|
return(-1);
|
||||||
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
return(0);
|
return(0);
|
||||||
@@ -4302,21 +4373,30 @@ int ndpi_load_hostname_category(struct ndpi_detection_module_struct *ndpi_str,
|
|||||||
|
|
||||||
/* ********************************************************************************* */
|
/* ********************************************************************************* */
|
||||||
|
|
||||||
|
/* Loads an IP or name category */
|
||||||
|
int ndpi_load_category(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
|
const char *ip_or_name, ndpi_protocol_category_t category) {
|
||||||
|
int rv;
|
||||||
|
|
||||||
|
/* Try to load as IP address first */
|
||||||
|
rv = ndpi_load_ip_category(ndpi_struct, ip_or_name, category);
|
||||||
|
|
||||||
|
if(rv < 0) {
|
||||||
|
/* IP load failed, load as hostname */
|
||||||
|
rv = ndpi_load_hostname_category(ndpi_struct, ip_or_name, category);
|
||||||
|
}
|
||||||
|
|
||||||
|
return(rv);
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ********************************************************************************* */
|
||||||
|
|
||||||
int ndpi_enable_loaded_categories(struct ndpi_detection_module_struct *ndpi_str) {
|
int ndpi_enable_loaded_categories(struct ndpi_detection_module_struct *ndpi_str) {
|
||||||
int i, ip_addr[4];
|
int i;
|
||||||
|
|
||||||
/* First add the nDPI known categories matches */
|
/* First add the nDPI known categories matches */
|
||||||
for(i=0; category_match[i].string_to_match != NULL; i++) {
|
for(i=0; category_match[i].string_to_match != NULL; i++)
|
||||||
if(sscanf(category_match[i].string_to_match, "%d.%d.%d.%d", &ip_addr[0], &ip_addr[1], &ip_addr[2], &ip_addr[3]) == 4){
|
ndpi_load_category(ndpi_str, category_match[i].string_to_match, category_match[i].protocol_category);
|
||||||
ndpi_load_ip_category(ndpi_str,
|
|
||||||
category_match[i].string_to_match,
|
|
||||||
category_match[i].protocol_category);
|
|
||||||
} else{
|
|
||||||
ndpi_load_hostname_category(ndpi_str,
|
|
||||||
category_match[i].string_to_match,
|
|
||||||
category_match[i].protocol_category);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#ifdef HAVE_HYPERSCAN
|
#ifdef HAVE_HYPERSCAN
|
||||||
if(ndpi_str->custom_categories.num_to_load > 0) {
|
if(ndpi_str->custom_categories.num_to_load > 0) {
|
||||||
@@ -4383,7 +4463,7 @@ int ndpi_enable_loaded_categories(struct ndpi_detection_module_struct *ndpi_str)
|
|||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
/* Free */
|
/* Free */
|
||||||
ac_automata_release((AC_AUTOMATA_t*)ndpi_str->custom_categories.hostnames.ac_automa, 0);
|
ac_automata_release((AC_AUTOMATA_t*)ndpi_str->custom_categories.hostnames.ac_automa, 1 /* free patterns strings memory */);
|
||||||
|
|
||||||
/* Finalize */
|
/* Finalize */
|
||||||
ac_automata_finalize((AC_AUTOMATA_t*)ndpi_str->custom_categories.hostnames_shadow.ac_automa);
|
ac_automata_finalize((AC_AUTOMATA_t*)ndpi_str->custom_categories.hostnames_shadow.ac_automa);
|
||||||
@@ -4425,7 +4505,7 @@ int ndpi_fill_ip_protocol_category(struct ndpi_detection_module_struct *ndpi_str
|
|||||||
32, ((patricia_tree_t*)ndpi_str->protocols_ptree)->maxbits);
|
32, ((patricia_tree_t*)ndpi_str->protocols_ptree)->maxbits);
|
||||||
node = ndpi_patricia_search_best(ndpi_str->custom_categories.ipAddresses, &prefix);
|
node = ndpi_patricia_search_best(ndpi_str->custom_categories.ipAddresses, &prefix);
|
||||||
}
|
}
|
||||||
|
|
||||||
if(!node) {
|
if(!node) {
|
||||||
if(daddr != 0)
|
if(daddr != 0)
|
||||||
fill_prefix_v4(&prefix, (struct in_addr *)&daddr,
|
fill_prefix_v4(&prefix, (struct in_addr *)&daddr,
|
||||||
@@ -4457,7 +4537,8 @@ void ndpi_fill_protocol_category(struct ndpi_detection_module_struct *ndpi_str,
|
|||||||
|
|
||||||
if(flow->host_server_name[0] != '\0') {
|
if(flow->host_server_name[0] != '\0') {
|
||||||
unsigned long id;
|
unsigned long id;
|
||||||
int rc = ndpi_match_custom_category(ndpi_str, (char *)flow->host_server_name, &id);
|
int rc = ndpi_match_custom_category(ndpi_str, (char *)flow->host_server_name,
|
||||||
|
strlen((char *)flow->host_server_name), &id);
|
||||||
|
|
||||||
if(rc == 0) {
|
if(rc == 0) {
|
||||||
flow->category = ret->category = (ndpi_protocol_category_t)id;
|
flow->category = ret->category = (ndpi_protocol_category_t)id;
|
||||||
@@ -4469,6 +4550,7 @@ void ndpi_fill_protocol_category(struct ndpi_detection_module_struct *ndpi_str,
|
|||||||
unsigned long id;
|
unsigned long id;
|
||||||
int rc = ndpi_match_custom_category(ndpi_str,
|
int rc = ndpi_match_custom_category(ndpi_str,
|
||||||
(char *)flow->protos.stun_ssl.ssl.client_certificate,
|
(char *)flow->protos.stun_ssl.ssl.client_certificate,
|
||||||
|
strlen(flow->protos.stun_ssl.ssl.client_certificate),
|
||||||
&id);
|
&id);
|
||||||
|
|
||||||
if(rc == 0) {
|
if(rc == 0) {
|
||||||
@@ -4656,8 +4738,10 @@ ndpi_protocol ndpi_detection_process_packet(struct ndpi_detection_module_struct
|
|||||||
if(user_defined_proto && flow->guessed_protocol_id != NDPI_PROTOCOL_UNKNOWN) {
|
if(user_defined_proto && flow->guessed_protocol_id != NDPI_PROTOCOL_UNKNOWN) {
|
||||||
if(flow->packet.iph) {
|
if(flow->packet.iph) {
|
||||||
if(flow->guessed_host_protocol_id != NDPI_PROTOCOL_UNKNOWN) {
|
if(flow->guessed_host_protocol_id != NDPI_PROTOCOL_UNKNOWN) {
|
||||||
|
u_int8_t protocol_was_guessed;
|
||||||
|
|
||||||
/* ret.master_protocol = flow->guessed_protocol_id , ret.app_protocol = flow->guessed_host_protocol_id; /\* ****** *\/ */
|
/* ret.master_protocol = flow->guessed_protocol_id , ret.app_protocol = flow->guessed_host_protocol_id; /\* ****** *\/ */
|
||||||
ret = ndpi_detection_giveup(ndpi_str, flow, 0);
|
ret = ndpi_detection_giveup(ndpi_str, flow, 0, &protocol_was_guessed);
|
||||||
}
|
}
|
||||||
|
|
||||||
ndpi_fill_protocol_category(ndpi_str, flow, &ret);
|
ndpi_fill_protocol_category(ndpi_str, flow, &ret);
|
||||||
@@ -4750,6 +4834,8 @@ ndpi_protocol ndpi_detection_process_packet(struct ndpi_detection_module_struct
|
|||||||
&& (flow->packet.tcp->syn == 0)
|
&& (flow->packet.tcp->syn == 0)
|
||||||
&& (flow->guessed_protocol_id == 0)
|
&& (flow->guessed_protocol_id == 0)
|
||||||
) {
|
) {
|
||||||
|
u_int8_t protocol_was_guessed;
|
||||||
|
|
||||||
/*
|
/*
|
||||||
This is a TCP flow
|
This is a TCP flow
|
||||||
- whose first packet is NOT a SYN
|
- whose first packet is NOT a SYN
|
||||||
@@ -4758,7 +4844,7 @@ ndpi_protocol ndpi_detection_process_packet(struct ndpi_detection_module_struct
|
|||||||
We don't see how future packets can match anything
|
We don't see how future packets can match anything
|
||||||
hence we giveup here
|
hence we giveup here
|
||||||
*/
|
*/
|
||||||
ret = ndpi_detection_giveup(ndpi_str, flow, 0);
|
ret = ndpi_detection_giveup(ndpi_str, flow, 0, &protocol_was_guessed);
|
||||||
}
|
}
|
||||||
|
|
||||||
invalidate_ptr:
|
invalidate_ptr:
|
||||||
@@ -5889,7 +5975,7 @@ int ndpi_get_category_id(struct ndpi_detection_module_struct *ndpi_str, char *ca
|
|||||||
|
|
||||||
for(i = 0; i < NDPI_PROTOCOL_NUM_CATEGORIES; i++) {
|
for(i = 0; i < NDPI_PROTOCOL_NUM_CATEGORIES; i++) {
|
||||||
const char *name = ndpi_category_get_name(ndpi_str, i);
|
const char *name = ndpi_category_get_name(ndpi_str, i);
|
||||||
|
|
||||||
if(strcasecmp(cat, name) == 0)
|
if(strcasecmp(cat, name) == 0)
|
||||||
return(i);
|
return(i);
|
||||||
}
|
}
|
||||||
@@ -5903,8 +5989,9 @@ void ndpi_dump_protocols(struct ndpi_detection_module_struct *ndpi_str) {
|
|||||||
int i;
|
int i;
|
||||||
|
|
||||||
for(i=0; i<(int)ndpi_str->ndpi_num_supported_protocols; i++)
|
for(i=0; i<(int)ndpi_str->ndpi_num_supported_protocols; i++)
|
||||||
printf("%3d %-22s %-12s %s\n", i,
|
printf("%3d %-22s %-8s %-12s %s\n", i,
|
||||||
ndpi_str->proto_defaults[i].protoName,
|
ndpi_str->proto_defaults[i].protoName,
|
||||||
|
ndpi_get_l4_proto_name(ndpi_get_l4_proto_info(ndpi_str, i)),
|
||||||
ndpi_get_proto_breed_name(ndpi_str, ndpi_str->proto_defaults[i].protoBreed),
|
ndpi_get_proto_breed_name(ndpi_str, ndpi_str->proto_defaults[i].protoBreed),
|
||||||
ndpi_category_get_name(ndpi_str, ndpi_str->proto_defaults[i].protoCategory)
|
ndpi_category_get_name(ndpi_str, ndpi_str->proto_defaults[i].protoCategory)
|
||||||
);
|
);
|
||||||
@@ -5924,7 +6011,7 @@ char* ndpi_strnstr(const char *s, const char *find, size_t slen) {
|
|||||||
len = strnlen(find, slen);
|
len = strnlen(find, slen);
|
||||||
do {
|
do {
|
||||||
char sc;
|
char sc;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
if(slen-- < 1 || (sc = *s++) == '\0')
|
if(slen-- < 1 || (sc = *s++) == '\0')
|
||||||
return(NULL);
|
return(NULL);
|
||||||
@@ -5951,7 +6038,7 @@ char* ndpi_strncasestr(const char *s, const char *find, size_t slen) {
|
|||||||
len = strlen(find);
|
len = strlen(find);
|
||||||
do {
|
do {
|
||||||
char sc;
|
char sc;
|
||||||
|
|
||||||
do {
|
do {
|
||||||
if(slen-- < 1 || (sc = *s++) == '\0')
|
if(slen-- < 1 || (sc = *s++) == '\0')
|
||||||
return(NULL);
|
return(NULL);
|
||||||
@@ -6117,15 +6204,15 @@ u_int16_t ndpi_match_host_subprotocol(struct ndpi_detection_module_struct *ndpi_
|
|||||||
if((flow->category == NDPI_PROTOCOL_CATEGORY_UNSPECIFIED)
|
if((flow->category == NDPI_PROTOCOL_CATEGORY_UNSPECIFIED)
|
||||||
&& (ret_match->protocol_category == NDPI_PROTOCOL_CATEGORY_UNSPECIFIED)) {
|
&& (ret_match->protocol_category == NDPI_PROTOCOL_CATEGORY_UNSPECIFIED)) {
|
||||||
unsigned long id = ret_match->protocol_category;
|
unsigned long id = ret_match->protocol_category;
|
||||||
|
|
||||||
if(ndpi_get_custom_category_match(ndpi_str, string_to_match, &id) != -1) {
|
if(ndpi_get_custom_category_match(ndpi_str, string_to_match, string_to_match_len, &id) != -1) {
|
||||||
if(id != -1) {
|
if(id != -1) {
|
||||||
flow->category = ret_match->protocol_category = id;
|
flow->category = ret_match->protocol_category = id;
|
||||||
rc = master_protocol_id;
|
rc = master_protocol_id;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return(rc);
|
return(rc);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -6358,8 +6445,6 @@ u_int8_t ndpi_extra_dissection_possible(struct ndpi_detection_module_struct *ndp
|
|||||||
proto);
|
proto);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
if(flow->check_extra_packets) return(1);
|
|
||||||
|
|
||||||
switch(proto) {
|
switch(proto) {
|
||||||
case NDPI_PROTOCOL_TLS:
|
case NDPI_PROTOCOL_TLS:
|
||||||
if(!flow->l4.tcp.tls_srv_cert_fingerprint_processed)
|
if(!flow->l4.tcp.tls_srv_cert_fingerprint_processed)
|
||||||
@@ -6388,3 +6473,42 @@ u_int8_t ndpi_extra_dissection_possible(struct ndpi_detection_module_struct *ndp
|
|||||||
}
|
}
|
||||||
|
|
||||||
/* ******************************************************************** */
|
/* ******************************************************************** */
|
||||||
|
|
||||||
|
const char* ndpi_get_l4_proto_name(ndpi_l4_proto_info proto) {
|
||||||
|
switch(proto) {
|
||||||
|
case ndpi_l4_proto_unknown:
|
||||||
|
return("");
|
||||||
|
break;
|
||||||
|
|
||||||
|
case ndpi_l4_proto_tcp_only:
|
||||||
|
return("TCP");
|
||||||
|
break;
|
||||||
|
|
||||||
|
case ndpi_l4_proto_udp_only:
|
||||||
|
return("UDP");
|
||||||
|
break;
|
||||||
|
|
||||||
|
case ndpi_l4_proto_tcp_and_udp:
|
||||||
|
return("TCP/UDP");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
return("");
|
||||||
|
}
|
||||||
|
|
||||||
|
/* ******************************************************************** */
|
||||||
|
|
||||||
|
ndpi_l4_proto_info ndpi_get_l4_proto_info(struct ndpi_detection_module_struct *ndpi_struct,
|
||||||
|
u_int16_t ndpi_proto_id) {
|
||||||
|
|
||||||
|
if(ndpi_proto_id < ndpi_struct->ndpi_num_supported_protocols) {
|
||||||
|
u_int16_t idx = ndpi_struct->proto_defaults[ndpi_proto_id].protoIdx;
|
||||||
|
NDPI_SELECTION_BITMASK_PROTOCOL_SIZE bm = ndpi_struct->callback_buffer[idx].ndpi_selection_bitmask;
|
||||||
|
|
||||||
|
if(bm & NDPI_SELECTION_BITMASK_PROTOCOL_INT_TCP) return(ndpi_l4_proto_tcp_only);
|
||||||
|
else if(bm & NDPI_SELECTION_BITMASK_PROTOCOL_INT_UDP) return(ndpi_l4_proto_udp_only);
|
||||||
|
else if(bm & NDPI_SELECTION_BITMASK_PROTOCOL_INT_TCP_OR_UDP) return(ndpi_l4_proto_tcp_and_udp);
|
||||||
|
}
|
||||||
|
|
||||||
|
return(ndpi_l4_proto_unknown); /* default */
|
||||||
|
}
|
||||||
|
|||||||
+10
-6
@@ -710,24 +710,28 @@ int ndpi_has_human_readeable_string(struct ndpi_detection_module_struct *ndpi_st
|
|||||||
|
|
||||||
/* ********************************** */
|
/* ********************************** */
|
||||||
|
|
||||||
char* ndpi_ssl_version2str(u_int16_t version) {
|
char* ndpi_ssl_version2str(u_int16_t version, u_int8_t *unknown_tls_version) {
|
||||||
static char v[8];
|
static char v[12];
|
||||||
|
|
||||||
|
*unknown_tls_version = 0;
|
||||||
|
|
||||||
switch(version) {
|
switch(version) {
|
||||||
case 0x0300: return("SSLv3");
|
case 0x0300: return("SSLv3");
|
||||||
case 0x0301: return("TLSv1");
|
case 0x0301: return("TLSv1");
|
||||||
case 0x0302: return("TLSv1.1");
|
case 0x0302: return("TLSv1.1");
|
||||||
case 0x0303: return("TLSv1.2");
|
case 0x0303: return("TLSv1.2");
|
||||||
case 0x0304: return("TLSv1.3");
|
case 0x0304: return("TLSv1.3");
|
||||||
case 0xfb1a: return("TLSv1.3 (Fizz)"); /* https://engineering.fb.com/security/fizz/ */
|
case 0XFB1A: return("TLSv1.3 (Fizz)"); /* https://engineering.fb.com/security/fizz/ */
|
||||||
case 0xfeff: return("DTLSv1.0");
|
case 0XFEFF: return("DTLSv1.0");
|
||||||
case 0xfefd: return("DTLSv1.2");
|
case 0XFEFD: return("DTLSv1.2");
|
||||||
}
|
}
|
||||||
|
|
||||||
if((version >= 0x7f00) && (version <= 0x7fff))
|
if((version >= 0x7f00) && (version <= 0x7fff))
|
||||||
return("TLSv1.3 (draft)");
|
return("TLSv1.3 (draft)");
|
||||||
|
|
||||||
snprintf(v, sizeof(v), "%04X", version);
|
*unknown_tls_version = 1;
|
||||||
|
snprintf(v, sizeof(v), "TLS (%04X)", version);
|
||||||
|
|
||||||
return(v);
|
return(v);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+13
-5
@@ -786,7 +786,12 @@ int getSSCertificateFingerprint(struct ndpi_detection_module_struct *ndpi_struct
|
|||||||
#endif
|
#endif
|
||||||
return(1); /* More packets please */
|
return(1); /* More packets please */
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if(packet->payload_packet_len <= flow->l4.tcp.tls_record_offset) {
|
||||||
|
/* Avoid invalid memory accesses */
|
||||||
|
return(1);
|
||||||
|
}
|
||||||
|
|
||||||
if(packet->payload[flow->l4.tcp.tls_record_offset] == 0x15 /* Alert */) {
|
if(packet->payload[flow->l4.tcp.tls_record_offset] == 0x15 /* Alert */) {
|
||||||
u_int len = ntohs(*(u_int16_t*)&packet->payload[flow->l4.tcp.tls_record_offset+3]) + 5 /* SSL header len */;
|
u_int len = ntohs(*(u_int16_t*)&packet->payload[flow->l4.tcp.tls_record_offset+3]) + 5 /* SSL header len */;
|
||||||
@@ -815,9 +820,12 @@ int getSSCertificateFingerprint(struct ndpi_detection_module_struct *ndpi_struct
|
|||||||
|
|
||||||
if(flow->l4.tcp.tls_srv_cert_fingerprint_ctx == NULL)
|
if(flow->l4.tcp.tls_srv_cert_fingerprint_ctx == NULL)
|
||||||
flow->l4.tcp.tls_srv_cert_fingerprint_ctx = (void*)ndpi_malloc(sizeof(SHA1_CTX));
|
flow->l4.tcp.tls_srv_cert_fingerprint_ctx = (void*)ndpi_malloc(sizeof(SHA1_CTX));
|
||||||
else
|
else {
|
||||||
printf("[TLS] Internal error: double allocation\n:");
|
#ifdef DEBUG_TLS
|
||||||
|
printf("[TLS] Internal error: double allocation\n");
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
if(flow->l4.tcp.tls_srv_cert_fingerprint_ctx) {
|
if(flow->l4.tcp.tls_srv_cert_fingerprint_ctx) {
|
||||||
SHA1Init(flow->l4.tcp.tls_srv_cert_fingerprint_ctx);
|
SHA1Init(flow->l4.tcp.tls_srv_cert_fingerprint_ctx);
|
||||||
flow->l4.tcp.tls_srv_cert_fingerprint_found = 1;
|
flow->l4.tcp.tls_srv_cert_fingerprint_found = 1;
|
||||||
@@ -833,7 +841,7 @@ int getSSCertificateFingerprint(struct ndpi_detection_module_struct *ndpi_struct
|
|||||||
return(0); /* That's all */
|
return(0); /* That's all */
|
||||||
} else if(flow->l4.tcp.tls_seen_certificate)
|
} else if(flow->l4.tcp.tls_seen_certificate)
|
||||||
return(0); /* That's all */
|
return(0); /* That's all */
|
||||||
else {
|
else if(packet->payload_packet_len > flow->l4.tcp.tls_record_offset+7) {
|
||||||
/* This is a handshake but not a certificate record */
|
/* This is a handshake but not a certificate record */
|
||||||
u_int16_t len = ntohs(*(u_int16_t*)&packet->payload[flow->l4.tcp.tls_record_offset+7]);
|
u_int16_t len = ntohs(*(u_int16_t*)&packet->payload[flow->l4.tcp.tls_record_offset+7]);
|
||||||
|
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ void ndpi_search_viber(struct ndpi_detection_module_struct *ndpi_struct, struct
|
|||||||
|
|
||||||
NDPI_LOG_DBG(ndpi_struct, "search for VIBER\n");
|
NDPI_LOG_DBG(ndpi_struct, "search for VIBER\n");
|
||||||
|
|
||||||
if(packet->udp != NULL) {
|
if((packet->udp != NULL) && (packet->payload_packet_len > 5)) {
|
||||||
NDPI_LOG_DBG2(ndpi_struct, "calculating dport over udp\n");
|
NDPI_LOG_DBG2(ndpi_struct, "calculating dport over udp\n");
|
||||||
|
|
||||||
if((packet->payload[2] == 0x03 && packet->payload[3] == 0x00)
|
if((packet->payload[2] == 0x03 && packet->payload[3] == 0x00)
|
||||||
|
|||||||
Reference in New Issue
Block a user