Removed VEOHTV protocol and replaced with HTTPDownload

Fixed bug that prevented content type to be properly detected
This commit is contained in:
Luca Deri
2016-02-28 23:19:13 +01:00
parent 20374b542d
commit ead8c4933e
8 changed files with 31 additions and 155 deletions
+5 -9
View File
@@ -37,18 +37,14 @@ static void ndpi_int_http_add_connection(struct ndpi_detection_module_struct *nd
/* If no custom protocol has been detected */
if(flow->detected_protocol_stack[0] == NDPI_PROTOCOL_UNKNOWN) {
if(protocol != NDPI_PROTOCOL_HTTP) {
ndpi_search_tcp_or_udp(ndpi_struct, flow);
ndpi_set_detected_protocol(ndpi_struct, flow, protocol, NDPI_PROTOCOL_UNKNOWN);
} else {
if(protocol == NDPI_PROTOCOL_HTTP)
ndpi_int_reset_protocol(flow);
ndpi_set_detected_protocol(ndpi_struct, flow, protocol, NDPI_PROTOCOL_UNKNOWN);
}
ndpi_set_detected_protocol(ndpi_struct, flow, protocol, NDPI_PROTOCOL_UNKNOWN);
}
flow->http_detected = 1;
}
}
#ifdef NDPI_CONTENT_FLASH
@@ -202,10 +198,10 @@ static void parseHttpSubprotocol(struct ndpi_detection_module_struct *ndpi_struc
/*
NOTE
If http_dont_dissect_response = 1 dissection of HTTP response
mime types won't happen
*/
*/
ndpi_match_host_subprotocol(ndpi_struct, flow, (char *)flow->host_server_name,
strlen((const char *)flow->host_server_name),
NDPI_PROTOCOL_HTTP);
-130
View File
@@ -1,130 +0,0 @@
/*
* veohtv.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_HTTP_APPLICATION_VEOHTV
static void ndpi_int_veohtv_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
struct ndpi_flow_struct *flow/* , ndpi_protocol_type_t protocol_type */)
{
ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_HTTP_APPLICATION_VEOHTV, NDPI_PROTOCOL_UNKNOWN);
}
void ndpi_search_veohtv_tcp(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;
if (packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP_APPLICATION_VEOHTV)
return;
if (flow->l4.tcp.veoh_tv_stage == 1 || flow->l4.tcp.veoh_tv_stage == 2) {
if (packet->packet_direction != flow->setup_packet_direction &&
packet->payload_packet_len > NDPI_STATICSTRING_LEN("HTTP/1.1 20")
&& memcmp(packet->payload, "HTTP/1.1 ", NDPI_STATICSTRING_LEN("HTTP/1.1 ")) == 0 &&
(packet->payload[NDPI_STATICSTRING_LEN("HTTP/1.1 ")] == '2' ||
packet->payload[NDPI_STATICSTRING_LEN("HTTP/1.1 ")] == '3' ||
packet->payload[NDPI_STATICSTRING_LEN("HTTP/1.1 ")] == '4' ||
packet->payload[NDPI_STATICSTRING_LEN("HTTP/1.1 ")] == '5')) {
#ifdef NDPI_CONTENT_FLASH
ndpi_parse_packet_line_info(ndpi_struct, flow);
if (packet->detected_protocol_stack[0] == NDPI_CONTENT_FLASH &&
packet->server_line.ptr != NULL &&
packet->server_line.len > NDPI_STATICSTRING_LEN("Veoh-") &&
memcmp(packet->server_line.ptr, "Veoh-", NDPI_STATICSTRING_LEN("Veoh-")) == 0) {
NDPI_LOG(NDPI_PROTOCOL_HTTP_APPLICATION_VEOHTV, ndpi_struct, NDPI_LOG_DEBUG, "VeohTV detected.\n");
ndpi_int_veohtv_add_connection(ndpi_struct, flow);
return;
}
#endif
if (flow->l4.tcp.veoh_tv_stage == 2) {
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask,
NDPI_PROTOCOL_HTTP_APPLICATION_VEOHTV);
return;
}
NDPI_LOG(NDPI_PROTOCOL_HTTP_APPLICATION_VEOHTV, ndpi_struct, NDPI_LOG_DEBUG, "VeohTV detected.\n");
ndpi_int_veohtv_add_connection(ndpi_struct, flow);
return;
} else if (flow->packet_direction_counter[(flow->setup_packet_direction == 1) ? 0 : 1] > 3) {
if (flow->l4.tcp.veoh_tv_stage == 2) {
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask,
NDPI_PROTOCOL_HTTP_APPLICATION_VEOHTV);
return;
}
NDPI_LOG(NDPI_PROTOCOL_HTTP_APPLICATION_VEOHTV, ndpi_struct, NDPI_LOG_DEBUG, "VeohTV detected.\n");
ndpi_int_veohtv_add_connection(ndpi_struct, flow);
return;
} else {
if (flow->packet_counter > 10) {
if (flow->l4.tcp.veoh_tv_stage == 2) {
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask,
NDPI_PROTOCOL_HTTP_APPLICATION_VEOHTV);
return;
}
NDPI_LOG(NDPI_PROTOCOL_HTTP_APPLICATION_VEOHTV, ndpi_struct, NDPI_LOG_DEBUG, "VeohTV detected.\n");
ndpi_int_veohtv_add_connection(ndpi_struct, flow);
return;
}
return;
}
} else if (packet->udp) {
/* UDP packets from Veoh Client Player
*
* packet starts with 16 byte random? value
* then a 4 byte mode value
* values between 21 and 26 has been seen
* then a 4 byte counter */
if (packet->payload_packet_len == 28 &&
get_u_int32_t(packet->payload, 16) == htonl(0x00000021) &&
get_u_int32_t(packet->payload, 20) == htonl(0x00000000) && get_u_int32_t(packet->payload, 24) == htonl(0x01040000)) {
NDPI_LOG(NDPI_PROTOCOL_HTTP_APPLICATION_VEOHTV, ndpi_struct, NDPI_LOG_DEBUG, "UDP VeohTV found.\n");
ndpi_int_veohtv_add_connection(ndpi_struct, flow);
return;
}
}
NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_HTTP_APPLICATION_VEOHTV);
}
void init_veohtv_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
{
ndpi_set_bitmask_protocol_detection("HTTP_APPLICATION_VEOHTV", ndpi_struct, detection_bitmask, *id,
NDPI_PROTOCOL_HTTP_APPLICATION_VEOHTV,
ndpi_search_veohtv_tcp,
NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_TCP_OR_UDP_WITH_PAYLOAD_WITHOUT_RETRANSMISSION,
SAVE_DETECTION_BITMASK_AS_UNKNOWN,
ADD_TO_DETECTION_BITMASK);
*id += 1;
}
#endif