deleted meebo dissector (service not availlable anymore) - change Weibo subservice name to Sina service (more correct)
This commit is contained in:
@@ -151,7 +151,7 @@
|
||||
#define NDPI_PROTOCOL_PPTP 115
|
||||
#define NDPI_PROTOCOL_WARCRAFT3 116
|
||||
#define NDPI_PROTOCOL_WORLD_OF_KUNG_FU 117
|
||||
#define NDPI_PROTOCOL_MEEBO 118
|
||||
#define NDPI_SERVICE_SLACK 118
|
||||
#define NDPI_PROTOCOL_DROPBOX 121
|
||||
#define NDPI_PROTOCOL_SKYPE 125
|
||||
#define NDPI_PROTOCOL_DCERPC 127
|
||||
@@ -261,12 +261,11 @@
|
||||
#define NDPI_SERVICE_MS_ONE_DRIVE 207
|
||||
#define NDPI_PROTOCOL_MQTT 208
|
||||
#define NDPI_PROTOCOL_RX 209
|
||||
#define NDPI_SERVICE_WEIBO 210
|
||||
#define NDPI_SERVICE_SINA 210
|
||||
#define NDPI_SERVICE_HANGOUT 215
|
||||
#define NDPI_SERVICE_SLACK 216
|
||||
|
||||
/* UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE */
|
||||
#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_SERVICE_SLACK
|
||||
#define NDPI_LAST_IMPLEMENTED_PROTOCOL NDPI_SERVICE_HANGOUT
|
||||
|
||||
#define NDPI_MAX_SUPPORTED_PROTOCOLS (NDPI_LAST_IMPLEMENTED_PROTOCOL + 1)
|
||||
#define NDPI_MAX_NUM_CUSTOM_PROTOCOLS (NDPI_NUM_BITS-NDPI_LAST_IMPLEMENTED_PROTOCOL)
|
||||
|
||||
@@ -138,7 +138,6 @@ void ndpi_search_mssql_tds(struct ndpi_detection_module_struct *ndpi_struct, str
|
||||
void ndpi_search_pptp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_stealthnet(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_dhcpv6_udp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_meebo(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_afp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_aimini(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
void ndpi_search_florensia(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow);
|
||||
@@ -248,7 +247,6 @@ void init_mail_pop_dissector(struct ndpi_detection_module_struct *ndpi_struct, u
|
||||
void init_mail_smtp_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_maplestory_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_mdns_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_meebo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_megaco_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_mgpc_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
void init_mms_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
|
||||
|
||||
@@ -73,7 +73,6 @@ libndpi_la_SOURCES = ndpi_content_match.c.inc \
|
||||
protocols/mail_smtp.c \
|
||||
protocols/maplestory.c \
|
||||
protocols/mdns.c \
|
||||
protocols/meebo.c \
|
||||
protocols/megaco.c \
|
||||
protocols/mgcp.c \
|
||||
protocols/mms.c \
|
||||
|
||||
@@ -7348,11 +7348,11 @@ ndpi_protocol_match host_match[] = {
|
||||
{ "www-cdn.jtvnw.net", "Twitch", NDPI_SERVICE_TWITCH, NDPI_PROTOCOL_FUN },
|
||||
{ "quickplay.com", "QuickPlay", NDPI_SERVICE_QUICKPLAY, NDPI_PROTOCOL_FUN },
|
||||
{ ".qq.com", "QQ", NDPI_PROTOCOL_QQ, NDPI_PROTOCOL_FUN },
|
||||
{ ".weibo.com", "Weibo", NDPI_SERVICE_WEIBO, NDPI_PROTOCOL_FUN },
|
||||
{ ".sinaimg.cn", "Weibo", NDPI_SERVICE_WEIBO, NDPI_PROTOCOL_FUN },
|
||||
{ ".sinajs.cn", "Weibo", NDPI_SERVICE_WEIBO, NDPI_PROTOCOL_FUN },
|
||||
{ ".sina.cn", "Weibo", NDPI_SERVICE_WEIBO, NDPI_PROTOCOL_FUN },
|
||||
{ ".sina.com.cn", "Weibo", NDPI_SERVICE_WEIBO, NDPI_PROTOCOL_FUN },
|
||||
{ ".weibo.com", "Sina(Weibo)", NDPI_SERVICE_SINA, NDPI_PROTOCOL_FUN },
|
||||
{ ".sinaimg.cn", "Sina", NDPI_SERVICE_SINA, NDPI_PROTOCOL_FUN },
|
||||
{ ".sinajs.cn", "Sina", NDPI_SERVICE_SINA, NDPI_PROTOCOL_FUN },
|
||||
{ ".sina.cn", "Sina", NDPI_SERVICE_SINA, NDPI_PROTOCOL_FUN },
|
||||
{ ".sina.com.cn", "Sina", NDPI_SERVICE_SINA, NDPI_PROTOCOL_FUN },
|
||||
|
||||
|
||||
/* https://support.cipafilter.com/index.php?/Knowledgebase/Article/View/117/0/snapchat---how-to-block */
|
||||
|
||||
@@ -1276,11 +1276,6 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
|
||||
no_master, "WorldOfKungFu",
|
||||
ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
|
||||
ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */);
|
||||
ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_MEEBO,
|
||||
no_master,
|
||||
no_master, "Meebo",
|
||||
ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
|
||||
ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */);
|
||||
ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DCERPC,
|
||||
no_master,
|
||||
no_master, "DCE_RPC",
|
||||
@@ -2441,9 +2436,6 @@ void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *n
|
||||
/* DHCPV6 */
|
||||
init_dhcpv6_dissector(ndpi_struct, &a, detection_bitmask);
|
||||
|
||||
/* MEEBO */
|
||||
init_meebo_dissector(ndpi_struct, &a, detection_bitmask);
|
||||
|
||||
/* AFP */
|
||||
init_afp_dissector(ndpi_struct, &a, detection_bitmask);
|
||||
|
||||
|
||||
@@ -1,181 +0,0 @@
|
||||
/*
|
||||
* meebo.c
|
||||
*
|
||||
* Copyright (C) 2009-2011 by ipoque GmbH
|
||||
* Copyright (C) 2011-15 - ntop.org
|
||||
*
|
||||
* This file is part of nDPI, an open source deep packet inspection
|
||||
* library based on the OpenDPI and PACE technology by ipoque GmbH
|
||||
*
|
||||
* 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_api.h"
|
||||
|
||||
#ifdef NDPI_PROTOCOL_MEEBO
|
||||
|
||||
static void ndpi_int_meebo_add_connection(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_MEEBO, NDPI_PROTOCOL_UNKNOWN);
|
||||
}
|
||||
|
||||
void ndpi_search_meebo(struct ndpi_detection_module_struct
|
||||
*ndpi_struct, struct ndpi_flow_struct *flow)
|
||||
{
|
||||
struct ndpi_packet_struct *packet = &flow->packet;
|
||||
|
||||
|
||||
// struct ndpi_id_struct *src=ndpi_struct->src;
|
||||
// struct ndpi_id_struct *dst=ndpi_struct->dst;
|
||||
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "search meebo.\n");
|
||||
|
||||
/* catch audio/video flows which are flash (rtmp) */
|
||||
if (
|
||||
#ifdef NDPI_CONTENT_FLASH
|
||||
packet->detected_protocol_stack[0] == NDPI_CONTENT_FLASH
|
||||
#else
|
||||
(packet->tcp->source == htons(1935) || packet->tcp->dest == htons(1935))
|
||||
#endif
|
||||
) {
|
||||
|
||||
/* TODO: once we have an amf decoder we can more directly access the rtmp fields
|
||||
* if so, we may also exclude earlier */
|
||||
if (packet->payload_packet_len > 900) {
|
||||
if (memcmp(packet->payload + 116, "tokbox/", NDPI_STATICSTRING_LEN("tokbox/")) == 0 ||
|
||||
memcmp(packet->payload + 316, "tokbox/", NDPI_STATICSTRING_LEN("tokbox/")) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "found meebo/tokbox flash flow.\n");
|
||||
ndpi_int_meebo_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
||||
if (flow->packet_counter < 16 && flow->packet_direction_counter[flow->setup_packet_direction] < 6) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "need next packet.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "exclude meebo.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MEEBO);
|
||||
return;
|
||||
}
|
||||
|
||||
if ((
|
||||
#ifdef NDPI_PROTOCOL_HTTP
|
||||
packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP ||
|
||||
#endif
|
||||
((packet->payload_packet_len > 3 && memcmp(packet->payload, "GET ", 4) == 0)
|
||||
|| (packet->payload_packet_len > 4 && memcmp(packet->payload, "POST ", 5) == 0))
|
||||
) && flow->packet_counter == 1) {
|
||||
u_int8_t host_or_referer_match = 0;
|
||||
|
||||
ndpi_parse_packet_line_info(ndpi_struct, flow);
|
||||
if (packet->host_line.ptr != NULL
|
||||
&& packet->host_line.len >= 9
|
||||
&& memcmp(&packet->host_line.ptr[packet->host_line.len - 9], "meebo.com", 9) == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "Found Meebo host\n");
|
||||
host_or_referer_match = 1;
|
||||
} else if (packet->host_line.ptr != NULL
|
||||
&& packet->host_line.len >= 10
|
||||
&& memcmp(&packet->host_line.ptr[packet->host_line.len - 10], "tokbox.com", 10) == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "Found tokbox host\n");
|
||||
/* set it to 2 to avoid having plain tokbox traffic detected as meebo */
|
||||
host_or_referer_match = 2;
|
||||
} else if (packet->host_line.ptr != NULL && packet->host_line.len >= NDPI_STATICSTRING_LEN("74.114.28.110")
|
||||
&& memcmp(&packet->host_line.ptr[packet->host_line.len - NDPI_STATICSTRING_LEN("74.114.28.110")],
|
||||
"74.114.28.110", NDPI_STATICSTRING_LEN("74.114.28.110")) == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "Found meebo IP\n");
|
||||
host_or_referer_match = 1;
|
||||
} else if (packet->referer_line.ptr != NULL &&
|
||||
packet->referer_line.len >= NDPI_STATICSTRING_LEN("http://www.meebo.com/") &&
|
||||
memcmp(packet->referer_line.ptr, "http://www.meebo.com/",
|
||||
NDPI_STATICSTRING_LEN("http://www.meebo.com/")) == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "Found meebo referer\n");
|
||||
host_or_referer_match = 1;
|
||||
} else if (packet->referer_line.ptr != NULL &&
|
||||
packet->referer_line.len >= NDPI_STATICSTRING_LEN("http://mee.tokbox.com/") &&
|
||||
memcmp(packet->referer_line.ptr, "http://mee.tokbox.com/",
|
||||
NDPI_STATICSTRING_LEN("http://mee.tokbox.com/")) == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "Found tokbox referer\n");
|
||||
host_or_referer_match = 1;
|
||||
} else if (packet->referer_line.ptr != NULL &&
|
||||
packet->referer_line.len >= NDPI_STATICSTRING_LEN("http://74.114.28.110/") &&
|
||||
memcmp(packet->referer_line.ptr, "http://74.114.28.110/",
|
||||
NDPI_STATICSTRING_LEN("http://74.114.28.110/")) == 0) {
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "Found meebo IP referer\n");
|
||||
host_or_referer_match = 1;
|
||||
}
|
||||
|
||||
if (host_or_referer_match) {
|
||||
if (host_or_referer_match == 1) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"Found Meebo traffic based on host/referer\n");
|
||||
ndpi_int_meebo_add_connection(ndpi_struct, flow);
|
||||
return;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_MEEBO) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG,
|
||||
"in case that ssl meebo has been detected return.\n");
|
||||
return;
|
||||
}
|
||||
|
||||
if (flow->packet_counter < 5 && packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN
|
||||
&& NDPI_COMPARE_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_SSL) == 0) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "ssl not yet excluded. need next packet.\n");
|
||||
return;
|
||||
}
|
||||
#ifdef NDPI_CONTENT_FLASH
|
||||
if (flow->packet_counter < 5 && packet->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN &&
|
||||
!NDPI_FLOW_PROTOCOL_EXCLUDED(ndpi_struct, flow, NDPI_CONTENT_FLASH)) {
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "flash not yet excluded. need next packet.\n");
|
||||
return;
|
||||
}
|
||||
#endif
|
||||
|
||||
NDPI_LOG(NDPI_PROTOCOL_MEEBO, ndpi_struct, NDPI_LOG_DEBUG, "exclude meebo.\n");
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MEEBO);
|
||||
}
|
||||
|
||||
|
||||
void init_meebo_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
|
||||
{
|
||||
ndpi_set_bitmask_protocol_detection("Meebo", ndpi_struct, detection_bitmask, *id,
|
||||
NDPI_PROTOCOL_MEEBO,
|
||||
ndpi_search_meebo,
|
||||
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
|
||||
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
|
||||
ADD_TO_DETECTION_BITMASK);
|
||||
|
||||
/* Add protocol bitmask dependencies to detected bitmask*/
|
||||
#ifdef NDPI_CONTENT_FLASH
|
||||
NDPI_ADD_PROTOCOL_TO_BITMASK(ndpi_struct->callback_buffer[*id].detection_bitmask, NDPI_CONTENT_FLASH);
|
||||
#endif
|
||||
|
||||
*id += 1;
|
||||
}
|
||||
|
||||
#endif
|
||||
Reference in New Issue
Block a user