Merge branch 'dev' of https://github.com/ntop/nDPI into dev
This commit is contained in:
@@ -325,6 +325,7 @@ void init_tor_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int3
|
||||
void init_tvants_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_tvuplayer_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_usenet_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_upnp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_veohtv_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_vhua_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_viber_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
|
||||
@@ -1080,7 +1080,7 @@ struct ndpi_flow_struct {
|
||||
|
||||
struct {
|
||||
struct {
|
||||
char client_certificate[48], server_certificate[48];
|
||||
char client_certificate[64], server_certificate[64];
|
||||
} ssl;
|
||||
|
||||
struct {
|
||||
|
||||
@@ -706,6 +706,7 @@ static ndpi_network host_protocol_list[] = {
|
||||
{ 0x287F816D /* 40.126.129.109 */, 32, NDPI_PROTOCOL_SKYPE },
|
||||
{ 0x4237DF00 /* 65.55.223.0 */, 26, NDPI_PROTOCOL_SKYPE },
|
||||
{ 0x17600000 /* 23.96.0.0 */, 13, NDPI_PROTOCOL_SKYPE },
|
||||
{ 0x34724A05 /* 52.114.74.5 */, 32, NDPI_PROTOCOL_SKYPE },
|
||||
|
||||
/*
|
||||
Blizzard Entertainment, Inc
|
||||
|
||||
+20
-2
@@ -3170,6 +3170,9 @@ void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *n
|
||||
/* REDIS */
|
||||
init_redis_dissector(ndpi_struct, &a, detection_bitmask);
|
||||
|
||||
/* UPnP */
|
||||
init_upnp_dissector(ndpi_struct, &a, detection_bitmask);
|
||||
|
||||
/* VHUA */
|
||||
init_vhua_dissector(ndpi_struct, &a, detection_bitmask);
|
||||
|
||||
@@ -3968,6 +3971,12 @@ ndpi_protocol ndpi_detection_giveup(struct ndpi_detection_module_struct *ndpi_st
|
||||
|
||||
if((guessed_protocol_id != NDPI_PROTOCOL_UNKNOWN)
|
||||
|| (guessed_host_protocol_id != NDPI_PROTOCOL_UNKNOWN)) {
|
||||
|
||||
if((guessed_protocol_id == 0)
|
||||
&& (flow->protos.stun_ssl.stun.num_binding_requests > 0)
|
||||
&& (flow->protos.stun_ssl.stun.num_processed_pkts > 0))
|
||||
guessed_protocol_id = NDPI_PROTOCOL_STUN;
|
||||
|
||||
ndpi_int_change_protocol(ndpi_struct, flow,
|
||||
guessed_host_protocol_id,
|
||||
guessed_protocol_id);
|
||||
@@ -3985,16 +3994,25 @@ ndpi_protocol ndpi_detection_giveup(struct ndpi_detection_module_struct *ndpi_st
|
||||
&& (flow->guessed_protocol_id == NDPI_PROTOCOL_STUN)) {
|
||||
check_stun_export:
|
||||
if(flow->protos.stun_ssl.stun.num_processed_pkts > 0) {
|
||||
if(flow->protos.stun_ssl.stun.num_processed_pkts >= NDPI_MIN_NUM_STUN_DETECTION) {
|
||||
if(/* (flow->protos.stun_ssl.stun.num_processed_pkts >= NDPI_MIN_NUM_STUN_DETECTION) */
|
||||
flow->protos.stun_ssl.stun.is_skype) {
|
||||
u_int16_t proto = (flow->protos.stun_ssl.stun.num_binding_requests < 4) ? NDPI_PROTOCOL_SKYPE_CALL_IN : NDPI_PROTOCOL_SKYPE_CALL_OUT;
|
||||
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, proto, NDPI_PROTOCOL_SKYPE);
|
||||
} else
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_STUN, flow->guessed_host_protocol_id);
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, flow->guessed_host_protocol_id, NDPI_PROTOCOL_STUN);
|
||||
}
|
||||
}
|
||||
|
||||
ret.master_protocol = flow->detected_protocol_stack[1], ret.app_protocol = flow->detected_protocol_stack[0];
|
||||
|
||||
if(ret.master_protocol == NDPI_PROTOCOL_STUN) {
|
||||
if(ret.app_protocol == NDPI_PROTOCOL_FACEBOOK)
|
||||
ret.app_protocol = NDPI_PROTOCOL_MESSENGER;
|
||||
else if(ret.app_protocol == NDPI_PROTOCOL_GOOGLE)
|
||||
ret.app_protocol = NDPI_PROTOCOL_HANGOUT;
|
||||
}
|
||||
|
||||
ndpi_fill_protocol_category(ndpi_struct, flow, &ret);
|
||||
|
||||
return(ret);
|
||||
|
||||
@@ -1,10 +1,30 @@
|
||||
/*
|
||||
* list.c
|
||||
*
|
||||
* Copyright (C) 2017-18 - ntop.org
|
||||
*
|
||||
* nDPI is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* nDPI is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "ndpi_protocol_ids.h"
|
||||
|
||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_LISP
|
||||
|
||||
#include "ndpi_api.h"
|
||||
|
||||
#define LISP_PORT 4341
|
||||
#define LISP_PORT 4341
|
||||
#define LISP_PORT1 4342
|
||||
|
||||
static void ndpi_int_lisp_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
|
||||
+13
-2
@@ -284,9 +284,18 @@ int getSSLcertificate(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
#endif
|
||||
|
||||
if(extension_id == 0) {
|
||||
u_int begin = 0,len;
|
||||
char *server_name = (char*)&packet->payload[offset+extension_offset];
|
||||
#if 1
|
||||
u_int16_t len;
|
||||
|
||||
len = (packet->payload[offset+extension_offset+3] << 8) + packet->payload[offset+extension_offset+4];
|
||||
len = (u_int)ndpi_min(len, buffer_len-1);
|
||||
strncpy(buffer, (char*)&packet->payload[offset+extension_offset+5], len);
|
||||
buffer[len] = '\0';
|
||||
#else
|
||||
/* old code */
|
||||
u_int begin = 0;
|
||||
char *server_name = (char*)&packet->payload[offset+extension_offset];
|
||||
|
||||
while(begin < extension_len) {
|
||||
if((!ndpi_isprint(server_name[begin]))
|
||||
|| ndpi_ispunct(server_name[begin])
|
||||
@@ -299,6 +308,8 @@ int getSSLcertificate(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
len = (u_int)ndpi_min(extension_len-begin, buffer_len-1);
|
||||
strncpy(buffer, &server_name[begin], len);
|
||||
buffer[len] = '\0';
|
||||
#endif
|
||||
|
||||
stripCertificateTrailer(buffer, buffer_len);
|
||||
|
||||
if(!ndpi_struct->disable_metadata_export) {
|
||||
|
||||
@@ -106,7 +106,7 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *
|
||||
case 0x4002:
|
||||
/* These are the only messages apparently whatsapp voice can use */
|
||||
break;
|
||||
|
||||
|
||||
case 0x8054: /* Candidate Identifier */
|
||||
if((len == 4)
|
||||
&& ((offset+7) < payload_length)
|
||||
@@ -119,6 +119,20 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *
|
||||
}
|
||||
break;
|
||||
|
||||
case 0x8055: /* MS Service Quality (skype?) */
|
||||
break;
|
||||
|
||||
/* Proprietary fields found on skype calls */
|
||||
case 0x24DF:
|
||||
case 0x3802:
|
||||
case 0x8036:
|
||||
case 0x8095:
|
||||
case 0x0800:
|
||||
/* printf("====>>>> %04X\n", attribute); */
|
||||
flow->protos.stun_ssl.stun.is_skype = 1;
|
||||
return(NDPI_IS_STUN);
|
||||
break;
|
||||
|
||||
case 0x8070: /* Implementation Version */
|
||||
if((len == 4)
|
||||
&& ((offset+7) < payload_length)
|
||||
|
||||
@@ -0,0 +1,65 @@
|
||||
/*
|
||||
* upnp.c
|
||||
*
|
||||
* Copyright (C) 2018 - ntop.org
|
||||
*
|
||||
* nDPI is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Lesser General Public License as published by
|
||||
* the Free Software Foundation, either version 3 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* nDPI is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Lesser General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Lesser General Public License
|
||||
* along with nDPI. If not, see <http://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
#include "ndpi_protocol_ids.h"
|
||||
|
||||
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_UPNP
|
||||
|
||||
#include "ndpi_api.h"
|
||||
|
||||
#define UPNP_PORT 3702
|
||||
|
||||
void ndpi_search_upnp(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
struct ndpi_flow_struct *flow) {
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
NDPI_LOG_DBG(ndpi_struct, "search upnp\n");
|
||||
|
||||
if(packet->udp
|
||||
&& (
|
||||
(packet->iph && ((ntohl(packet->iph->daddr) & 0xF0000000) == 0xE0000000 /* A multicast address */))
|
||||
#ifdef NDPI_DETECTION_SUPPORT_IPV6
|
||||
||
|
||||
(packet->iphv6 && ntohl(packet->iphv6->ip6_dst.u6_addr.u6_addr32[0]) == 0xFF020000)
|
||||
#endif
|
||||
)
|
||||
&& (ntohs(packet->udp->dest) == UPNP_PORT)
|
||||
&& (packet->payload_packet_len >= 40)
|
||||
&& (strncmp((char*)packet->payload, "<?xml", 5) == 0)
|
||||
) {
|
||||
NDPI_LOG_INFO(ndpi_struct,"found teredo\n");
|
||||
ndpi_int_change_protocol(ndpi_struct, flow, NDPI_PROTOCOL_UPNP, NDPI_PROTOCOL_UNKNOWN);
|
||||
} else {
|
||||
NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void init_upnp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id,
|
||||
NDPI_PROTOCOL_BITMASK *detection_bitmask) {
|
||||
ndpi_set_bitmask_protocol_detection("UPNP", ndpi_struct, detection_bitmask, *id,
|
||||
NDPI_PROTOCOL_UPNP,
|
||||
ndpi_search_upnp,
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
|
||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||
ADD_TO_DETECTION_BITMASK);
|
||||
*id += 1;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user