diff options
Diffstat (limited to 'src/lib/protocols')
| -rw-r--r-- | src/lib/protocols/hangout.c | 107 | ||||
| -rw-r--r-- | src/lib/protocols/stun.c | 32 |
2 files changed, 28 insertions, 111 deletions
diff --git a/src/lib/protocols/hangout.c b/src/lib/protocols/hangout.c deleted file mode 100644 index 720b4045c..000000000 --- a/src/lib/protocols/hangout.c +++ /dev/null @@ -1,107 +0,0 @@ -/* - * hangout.c - * - * Copyright (C) 2012-22 - ntop.org - * - * This module 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. - * - * This module 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. - * If not, see <http://www.gnu.org/licenses/>. - * - */ - -#include "ndpi_protocol_ids.h" - -#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_HANGOUT_DUO - -/* #define DEBUG_LRU 1 */ - -#include "ndpi_api.h" - -/* stun.c */ -extern u_int32_t get_stun_lru_key(struct ndpi_flow_struct *flow, u_int8_t rev); - -/* https://support.google.com/a/answer/1279090?hl=en */ -#define HANGOUT_UDP_LOW_PORT 19302 -#define HANGOUT_UDP_HIGH_PORT 19309 -#define HANGOUT_TCP_LOW_PORT 19305 -#define HANGOUT_TCP_HIGH_PORT 19309 - -/* ***************************************************************** */ - -static u_int8_t isHangoutUDPPort(u_int16_t port) { - if((port >= HANGOUT_UDP_LOW_PORT) && (port <= HANGOUT_UDP_HIGH_PORT)) - return(1); - else - return(0); -} - -/* ***************************************************************** */ - -static u_int8_t isHangoutTCPPort(u_int16_t port) { - if((port >= HANGOUT_TCP_LOW_PORT) && (port <= HANGOUT_TCP_HIGH_PORT)) - return(1); - else - return(0); -} - -/* ***************************************************************** */ - -static void ndpi_search_hangout(struct ndpi_detection_module_struct *ndpi_struct, - struct ndpi_flow_struct *flow) { - struct ndpi_packet_struct * packet = &ndpi_struct->packet; - - NDPI_LOG_DBG(ndpi_struct, "search Hangout\n"); - - if((packet->payload_packet_len > 24) && flow->guessed_protocol_id_by_ip == NDPI_PROTOCOL_GOOGLE) { - int matched_src = 0; - if( - ((packet->udp != NULL) && (matched_src = isHangoutUDPPort(ntohs(packet->udp->source)) - || isHangoutUDPPort(ntohs(packet->udp->dest)))) - || - ((packet->tcp != NULL) && (matched_src = isHangoutTCPPort(ntohs(packet->tcp->source)) - || isHangoutTCPPort(ntohs(packet->tcp->dest))))) { - NDPI_LOG_INFO(ndpi_struct, "found Hangout\n"); - - /* Hangout is over STUN hence the LRU cache is shared */ - - if(ndpi_struct->stun_cache) { - u_int32_t key = get_stun_lru_key(flow, !matched_src); - -#ifdef DEBUG_LRU - printf("[LRU] ADDING %u / %u.%u\n", key, NDPI_PROTOCOL_STUN, NDPI_PROTOCOL_HANGOUT_DUO); -#endif - - ndpi_lru_add_to_cache(ndpi_struct->stun_cache, key, NDPI_PROTOCOL_HANGOUT_DUO, ndpi_get_current_time(flow)); - } - - ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_HANGOUT_DUO, - NDPI_PROTOCOL_STUN, NDPI_CONFIDENCE_DPI); - return; - } - } - - NDPI_EXCLUDE_PROTO(ndpi_struct, flow); -} - -/* ***************************************************************** */ - -void init_hangout_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id) { - ndpi_set_bitmask_protocol_detection("GoogleHangout", ndpi_struct, *id, - NDPI_PROTOCOL_HANGOUT_DUO, - ndpi_search_hangout, - NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION, - SAVE_DETECTION_BITMASK_AS_UNKNOWN, - ADD_TO_DETECTION_BITMASK); - - *id += 1; -} - diff --git a/src/lib/protocols/stun.c b/src/lib/protocols/stun.c index 1bd27643c..be96a1500 100644 --- a/src/lib/protocols/stun.c +++ b/src/lib/protocols/stun.c @@ -125,10 +125,34 @@ static void ndpi_int_stun_add_connection(struct ndpi_detection_module_struct *nd ndpi_confidence_t confidence = NDPI_CONFIDENCE_DPI; if(app_proto == NDPI_PROTOCOL_UNKNOWN) { - if(flow->guessed_protocol_id_by_ip == NDPI_PROTOCOL_GOOGLE) - app_proto = NDPI_PROTOCOL_HANGOUT_DUO; - else if(flow->guessed_protocol_id_by_ip == NDPI_PROTOCOL_FACEBOOK) - app_proto = NDPI_PROTOCOL_FACEBOOK_VOIP; + /* https://support.google.com/a/answer/1279090?hl=en */ + if((ntohs(flow->c_port) >= 19302 && ntohs(flow->c_port) <= 19309) || + ntohs(flow->c_port) == 3478 || + (ntohs(flow->s_port) >= 19302 && ntohs(flow->s_port) <= 19309) || + ntohs(flow->s_port) == 3478) { + if(flow->is_ipv6) { + u_int64_t pref1 = 0x2001486048640005; /* 2001:4860:4864:5::/64 */ + u_int64_t pref2 = 0x2001486048640006; /* 2001:4860:4864:6::/64 */ + + if(memcmp(&flow->c_address.v6, &pref1, sizeof(pref1)) == 0 || + memcmp(&flow->c_address.v6, &pref2, sizeof(pref2)) == 0 || + memcmp(&flow->s_address.v6, &pref1, sizeof(pref1)) == 0 || + memcmp(&flow->s_address.v6, &pref2, sizeof(pref2)) == 0) { + app_proto = NDPI_PROTOCOL_HANGOUT_DUO; + } + } else { + u_int32_t c_address, s_address; + + c_address = ntohl(flow->c_address.v4); + s_address = ntohl(flow->s_address.v4); + if((c_address & 0xFFFFFFF0) == 0x4a7dfa00 || /* 74.125.250.0/24 */ + (c_address & 0xFFFFFFF0) == 0x8efa5200 || /* 142.250.82.0/24 */ + (s_address & 0xFFFFFFF0) == 0x4a7dfa00 || + (s_address & 0xFFFFFFF0) == 0x8efa5200) { + app_proto = NDPI_PROTOCOL_HANGOUT_DUO; + } + } + } } if(ndpi_struct->stun_cache |