Merge branch 'dev' of https://github.com/ntop/nDPI into dev
This commit is contained in:
@@ -612,7 +612,7 @@ extern "C" {
|
||||
*
|
||||
*/
|
||||
int ndpi_load_protocols_file(struct ndpi_detection_module_struct *ndpi_mod,
|
||||
char* path);
|
||||
const char* path);
|
||||
|
||||
/**
|
||||
* Get the total number of the supported protocols
|
||||
|
||||
@@ -360,6 +360,7 @@ typedef enum {
|
||||
NDPI_HTTP_METHOD_OPTIONS,
|
||||
NDPI_HTTP_METHOD_GET,
|
||||
NDPI_HTTP_METHOD_HEAD,
|
||||
NDPI_HTTP_METHOD_PATCH,
|
||||
NDPI_HTTP_METHOD_POST,
|
||||
NDPI_HTTP_METHOD_PUT,
|
||||
NDPI_HTTP_METHOD_DELETE,
|
||||
|
||||
@@ -661,7 +661,12 @@ static ndpi_network host_protocol_list[] = {
|
||||
{ 0x022E8A340 /* 34.232.163.64/28 */, 28, NDPI_PROTOCOL_VIBER },
|
||||
{ 0x022F67200 /* 34.246.114.0/23 */, 23, NDPI_PROTOCOL_VIBER },
|
||||
{ 0x3400FC00 /* 52.0.252.0/22 */, 22, NDPI_PROTOCOL_VIBER },
|
||||
{ 0x3403A746 /* 52.3.167.70/32 */, 32, NDPI_PROTOCOL_VIBER },
|
||||
{ 0x34162CEB /* 52.22.44.235/32 */, 32, NDPI_PROTOCOL_VIBER },
|
||||
{ 0x34165F0F /* 52.22.95.15/32 */, 32, NDPI_PROTOCOL_VIBER },
|
||||
{ 0x3640BFF0 /* 54.64.191.240/28 */, 28, NDPI_PROTOCOL_VIBER },
|
||||
{ 0x3655545D /* 54.85.84.93/32 */, 32, NDPI_PROTOCOL_VIBER },
|
||||
{ 0x3655565D /* 54.85.86.93/32 */, 32, NDPI_PROTOCOL_VIBER },
|
||||
{ 0x36A5FFD0 /* 54.165.255.208/28 */, 28, NDPI_PROTOCOL_VIBER },
|
||||
{ 0x36A5FFE0 /* 54.165.255.224/27 */, 27, NDPI_PROTOCOL_VIBER },
|
||||
{ 0x36DBBFA0 /* 54.219.191.160/28 */, 28, NDPI_PROTOCOL_VIBER },
|
||||
|
||||
+1
-1
@@ -2889,7 +2889,7 @@ int ndpi_handle_rule(struct ndpi_detection_module_struct *ndpi_mod,
|
||||
udp:139@NETBIOS
|
||||
|
||||
*/
|
||||
int ndpi_load_protocols_file(struct ndpi_detection_module_struct *ndpi_mod, char* path) {
|
||||
int ndpi_load_protocols_file(struct ndpi_detection_module_struct *ndpi_mod, const char* path) {
|
||||
FILE *fd;
|
||||
char *buffer, *old_buffer;
|
||||
int chunk_len = 512, buffer_len = chunk_len, old_buffer_len;
|
||||
|
||||
@@ -30,6 +30,11 @@ void ndpi_search_csgo(struct ndpi_detection_module_struct* ndpi_struct, struct n
|
||||
struct ndpi_packet_struct* packet = &flow->packet;
|
||||
|
||||
if (packet->udp != NULL) {
|
||||
if (packet->payload_packet_len < sizeof(uint32_t)) {
|
||||
NDPI_LOG_DBG2(ndpi_struct, "Short csgo packet\n");
|
||||
return;
|
||||
}
|
||||
|
||||
uint32_t w = htonl(get_u_int32_t(packet->payload, 0));
|
||||
NDPI_LOG_DBG2(ndpi_struct, "CSGO: word %08x\n", w);
|
||||
|
||||
|
||||
@@ -184,6 +184,7 @@ static void check_content_type_and_change_protocol(struct ndpi_detection_module_
|
||||
|
||||
case 'P':
|
||||
switch(flow->packet.http_method.ptr[1]) {
|
||||
case 'A': flow->http.method = NDPI_HTTP_METHOD_PATCH; break;
|
||||
case 'O': flow->http.method = NDPI_HTTP_METHOD_POST; break;
|
||||
case 'U': flow->http.method = NDPI_HTTP_METHOD_PUT; break;
|
||||
}
|
||||
@@ -414,6 +415,7 @@ static struct l_string {
|
||||
STATIC_STRING_L("OPTIONS "),
|
||||
STATIC_STRING_L("HEAD "),
|
||||
STATIC_STRING_L("PUT "),
|
||||
STATIC_STRING_L("PATCH "),
|
||||
STATIC_STRING_L("DELETE "),
|
||||
STATIC_STRING_L("CONNECT "),
|
||||
STATIC_STRING_L("PROPFIND "),
|
||||
|
||||
@@ -89,7 +89,7 @@
|
||||
|
||||
#define MEMCACHED_MIN_MATCH 2 /* Minimum number of command/responses required */
|
||||
|
||||
#define MEMCACHED_MATCH(cr) memcmp(offset, cr, cr ## _LEN)
|
||||
#define MEMCACHED_MATCH(cr) (cr ## _LEN > length || memcmp(offset, cr, cr ## _LEN))
|
||||
|
||||
static void ndpi_int_memcached_add_connection(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
@@ -105,6 +105,7 @@ void ndpi_search_memcached(
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
const u_int8_t *offset = packet->payload;
|
||||
const u_int16_t length = packet->payload_packet_len;
|
||||
u_int8_t *matches;
|
||||
|
||||
NDPI_LOG_DBG(ndpi_struct, "search memcached\n");
|
||||
|
||||
Reference in New Issue
Block a user