Merge branch 'YumingMa-dev' into dev

This commit is contained in:
Campus 2017-06-26 12:14:50 +02:00
commit 100062a156
2 changed files with 3 additions and 4 deletions

View file

@ -2270,7 +2270,7 @@ void automataUnitTest() {
* @brief Produce port based pbf filter for port array
* and saves it in .json format
*/
#ifdef HAVE_JSON_C
void bpf_filter_produce_filter(int port_array[], int size, char *filePath){
char *prefix = "bpf_filter_";
char _filterFilePath[1024];
@ -2319,7 +2319,7 @@ void bpf_filter_produce_filter(int port_array[], int size, char *filePath){
printf("created: %s\n", _filterFilePath);
}
#endif
/* *********************************************** */
/**
* @brief Initialize port array

View file

@ -98,7 +98,6 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *
case 0x8054: /* Candidate Identifier */
if((len == 4)
&& ((payload[offset+4] == 0x31) || (payload[offset+4] == 0x34))
&& (payload[offset+5] == 0x00)
&& (payload[offset+6] == 0x00)
&& (payload[offset+7] == 0x00)) {
@ -266,7 +265,7 @@ void ndpi_search_stun(struct ndpi_detection_module_struct *ndpi_struct, struct n
NDPI_LOG(NDPI_PROTOCOL_STUN, ndpi_struct, NDPI_LOG_DEBUG, "found UDP stun.\n");
ndpi_int_stun_add_connection(ndpi_struct,
is_whatsapp ? NDPI_PROTOCOL_WHATSAPP_VOICE : NDPI_PROTOCOL_STUN, flow);
}
}
return;
}
}