aboutsummaryrefslogtreecommitdiff
path: root/src/lib/protocols/zattoo.c
diff options
context:
space:
mode:
authorMichele Campus <fci1908@gmail.com>2015-06-29 16:24:51 +0200
committerMichele Campus <fci1908@gmail.com>2015-06-29 16:24:51 +0200
commit8da7af7b7b37724f8dcbce6c0b36962db36ef047 (patch)
tree46e7a842426a872fa49883b4f320a293edb2b55a /src/lib/protocols/zattoo.c
parent40292a737a994f0a9c36bcaf2c20a269e5673594 (diff)
deleted protocol type (real-correlated)
Diffstat (limited to 'src/lib/protocols/zattoo.c')
-rw-r--r--src/lib/protocols/zattoo.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/src/lib/protocols/zattoo.c b/src/lib/protocols/zattoo.c
index f7de4a8e7..b51e8357c 100644
--- a/src/lib/protocols/zattoo.c
+++ b/src/lib/protocols/zattoo.c
@@ -28,15 +28,15 @@
#ifdef NDPI_PROTOCOL_ZATTOO
static void ndpi_int_zattoo_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
- struct ndpi_flow_struct *flow,
- ndpi_protocol_type_t protocol_type)
+ struct ndpi_flow_struct *flow/* , */
+ /* ndpi_protocol_type_t protocol_type */)
{
struct ndpi_packet_struct *packet = &flow->packet;
struct ndpi_id_struct *src = flow->src;
struct ndpi_id_struct *dst = flow->dst;
- ndpi_int_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_ZATTOO, protocol_type);
+ ndpi_int_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_ZATTOO/* , protocol_type */);
if (src != NULL) {
src->zattoo_ts = packet->tick_timestamp;
@@ -91,14 +91,14 @@ void ndpi_search_zattoo(struct ndpi_detection_module_struct *ndpi_struct, struct
if (packet->payload_packet_len > 50 && memcmp(packet->payload, "GET /frontdoor/fd?brand=Zattoo&v=", 33) == 0) {
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct,
NDPI_LOG_DEBUG, "add connection over tcp with pattern GET /frontdoor/fd?brand=Zattoo&v=\n");
- ndpi_int_zattoo_add_connection(ndpi_struct, flow, NDPI_CORRELATED_PROTOCOL);
+ ndpi_int_zattoo_add_connection(ndpi_struct, flow/* , NDPI_CORRELATED_PROTOCOL */);
return;
}
if (packet->payload_packet_len > 50
&& memcmp(packet->payload, "GET /ZattooAdRedirect/redirect.jsp?user=", 40) == 0) {
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct,
NDPI_LOG_DEBUG, "add connection over tcp with pattern GET /ZattooAdRedirect/redirect.jsp?user=\n");
- ndpi_int_zattoo_add_connection(ndpi_struct, flow, NDPI_CORRELATED_PROTOCOL);
+ ndpi_int_zattoo_add_connection(ndpi_struct, flow/* , NDPI_CORRELATED_PROTOCOL */);
return;
}
if (packet->payload_packet_len > 50
@@ -110,7 +110,7 @@ void ndpi_search_zattoo(struct ndpi_detection_module_struct *ndpi_struct, struct
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct,
NDPI_LOG_DEBUG,
"add connection over tcp with pattern POST /channelserver/player/channel/update HTTP/1.1\n");
- ndpi_int_zattoo_add_connection(ndpi_struct, flow, NDPI_CORRELATED_PROTOCOL);
+ ndpi_int_zattoo_add_connection(ndpi_struct, flow/* , NDPI_CORRELATED_PROTOCOL */);
return;
}
}
@@ -121,7 +121,7 @@ void ndpi_search_zattoo(struct ndpi_detection_module_struct *ndpi_struct, struct
* that might be changed later */
ndpi_parse_packet_line_info(ndpi_struct, flow);
if (ndpi_int_zattoo_user_agent_set(ndpi_struct, flow)) {
- ndpi_int_zattoo_add_connection(ndpi_struct, flow, NDPI_CORRELATED_PROTOCOL);
+ ndpi_int_zattoo_add_connection(ndpi_struct, flow/* , NDPI_CORRELATED_PROTOCOL */);
return;
}
} else if (packet->payload_packet_len > 50 && memcmp(packet->payload, "POST http://", 12) == 0) {
@@ -149,7 +149,7 @@ void ndpi_search_zattoo(struct ndpi_detection_module_struct *ndpi_struct, struct
0x0a && packet->payload[packet->empty_line_position + 7] == 0x00) {
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct,
NDPI_LOG_DEBUG, "add connection over tcp with pattern POST http://\n");
- ndpi_int_zattoo_add_connection(ndpi_struct, flow, NDPI_CORRELATED_PROTOCOL);
+ ndpi_int_zattoo_add_connection(ndpi_struct, flow/* , NDPI_CORRELATED_PROTOCOL */);
return;
}
}
@@ -169,7 +169,7 @@ void ndpi_search_zattoo(struct ndpi_detection_module_struct *ndpi_struct, struct
} else if (flow->zattoo_stage == 2 - packet->packet_direction
&& packet->payload_packet_len > 50 && packet->payload[0] == 0x03 && packet->payload[1] == 0x04) {
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct, NDPI_LOG_DEBUG, "add connection over tcp with 0x0304.\n");
- ndpi_int_zattoo_add_connection(ndpi_struct, flow, NDPI_CORRELATED_PROTOCOL);
+ ndpi_int_zattoo_add_connection(ndpi_struct, flow/* , NDPI_CORRELATED_PROTOCOL */);
return;
} else if (flow->zattoo_stage == 1 + packet->packet_direction) {
if (packet->payload_packet_len > 500 && packet->payload[0] == 0x00 && packet->payload[1] == 0x00) {
@@ -190,15 +190,15 @@ void ndpi_search_zattoo(struct ndpi_detection_module_struct *ndpi_struct, struct
} else if (flow->zattoo_stage == 4 - packet->packet_direction
&& packet->payload_packet_len > 50 && packet->payload[0] == 0x03 && packet->payload[1] == 0x04) {
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct, NDPI_LOG_DEBUG, "add connection over tcp with 0x0304.\n");
- ndpi_int_zattoo_add_connection(ndpi_struct, flow, NDPI_CORRELATED_PROTOCOL);
+ ndpi_int_zattoo_add_connection(ndpi_struct, flow/* , NDPI_CORRELATED_PROTOCOL */);
return;
} else if (flow->zattoo_stage == 5 + packet->packet_direction && (packet->payload_packet_len == 125)) {
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct, NDPI_LOG_DEBUG, "detected zattoo.\n");
- ndpi_int_zattoo_add_connection(ndpi_struct, flow, NDPI_CORRELATED_PROTOCOL);
+ ndpi_int_zattoo_add_connection(ndpi_struct, flow/* , NDPI_CORRELATED_PROTOCOL */);
return;
} else if (flow->zattoo_stage == 6 - packet->packet_direction && packet->payload_packet_len == 1412) {
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct, NDPI_LOG_DEBUG, "found zattoo.\n");
- ndpi_int_zattoo_add_connection(ndpi_struct, flow, NDPI_CORRELATED_PROTOCOL);
+ ndpi_int_zattoo_add_connection(ndpi_struct, flow/* , NDPI_CORRELATED_PROTOCOL */);
return;
}
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct, NDPI_LOG_DEBUG,
@@ -216,7 +216,7 @@ void ndpi_search_zattoo(struct ndpi_detection_module_struct *ndpi_struct, struct
|| get_u_int32_t(packet->payload, 0) == htonl(0x03010005))) {
if (++flow->zattoo_stage == 2) {
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct, NDPI_LOG_DEBUG, "add connection over udp.\n");
- ndpi_int_zattoo_add_connection(ndpi_struct, flow, NDPI_REAL_PROTOCOL);
+ ndpi_int_zattoo_add_connection(ndpi_struct, flow/* , NDPI_REAL_PROTOCOL */);
return;
}
NDPI_LOG(NDPI_PROTOCOL_ZATTOO, ndpi_struct, NDPI_LOG_DEBUG, "need next packet udp.\n");