aboutsummaryrefslogtreecommitdiff
path: root/src/lib/protocols/tvuplayer.c
diff options
context:
space:
mode:
authorLuca <deri@ntop.org>2015-07-01 16:45:29 +0200
committerLuca <deri@ntop.org>2015-07-01 16:45:29 +0200
commit07ebed7faea31dd5c52e1c0f912dbfaa23a23698 (patch)
tree3e36b1e056a0c429f13d8ba2e5ee8fac76dcdef2 /src/lib/protocols/tvuplayer.c
parent857020c475947c0aed94e8156be1ba809fa8fe30 (diff)
Removed commented code
Renamed ndpi_int_add_connection() with ndpi_set_detected_protocol()
Diffstat (limited to 'src/lib/protocols/tvuplayer.c')
-rw-r--r--src/lib/protocols/tvuplayer.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib/protocols/tvuplayer.c b/src/lib/protocols/tvuplayer.c
index 92b4c8b77..d14476435 100644
--- a/src/lib/protocols/tvuplayer.c
+++ b/src/lib/protocols/tvuplayer.c
@@ -31,7 +31,7 @@ static void ndpi_int_tvuplayer_add_connection(struct ndpi_detection_module_struc
struct ndpi_flow_struct *flow/* , */
/* ndpi_protocol_type_t protocol_type */)
{
- ndpi_int_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_TVUPLAYER/* , protocol_type */);
+ ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_TVUPLAYER);
}
void ndpi_search_tvuplayer(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
@@ -52,7 +52,7 @@ void ndpi_search_tvuplayer(struct ndpi_detection_module_struct *ndpi_struct, str
&& ntohl(get_u_int32_t(packet->payload, 2)) == 0x31323334
&& ntohl(get_u_int32_t(packet->payload, 6)) == 0x35363837 && packet->payload[10] == 0x01) {
NDPI_LOG(NDPI_PROTOCOL_TVUPLAYER, ndpi_struct, NDPI_LOG_DEBUG, "found tvuplayer over tcp. \n");
- ndpi_int_tvuplayer_add_connection(ndpi_struct, flow/* , NDPI_REAL_PROTOCOL */);
+ ndpi_int_tvuplayer_add_connection(ndpi_struct, flow);
return;
}
@@ -63,7 +63,7 @@ void ndpi_search_tvuplayer(struct ndpi_detection_module_struct *ndpi_struct, str
if (packet->user_agent_line.ptr != NULL &&
packet->user_agent_line.len >= 8 && (memcmp(packet->user_agent_line.ptr, "MacTVUP", 7) == 0)) {
NDPI_LOG(NDPI_PROTOCOL_TVUPLAYER, ndpi_struct, NDPI_LOG_DEBUG, "Found user agent as MacTVUP.\n");
- ndpi_int_tvuplayer_add_connection(ndpi_struct, flow/* , NDPI_CORRELATED_PROTOCOL */);
+ ndpi_int_tvuplayer_add_connection(ndpi_struct, flow);
return;
}
}
@@ -80,7 +80,7 @@ void ndpi_search_tvuplayer(struct ndpi_detection_module_struct *ndpi_struct, str
&& packet->payload[19] == 0x2c && ((packet->payload[26] == 0x05 && packet->payload[27] == 0x14)
|| (packet->payload[26] == 0x14 && packet->payload[27] == 0x05))) {
NDPI_LOG(NDPI_PROTOCOL_TVUPLAYER, ndpi_struct, NDPI_LOG_DEBUG, "found tvuplayer pattern type I. \n");
- ndpi_int_tvuplayer_add_connection(ndpi_struct, flow/* , NDPI_REAL_PROTOCOL */);
+ ndpi_int_tvuplayer_add_connection(ndpi_struct, flow);
return;
}
if (packet->payload_packet_len == 82
@@ -92,7 +92,7 @@ void ndpi_search_tvuplayer(struct ndpi_detection_module_struct *ndpi_struct, str
&& packet->payload[39] == 0x32 && ((packet->payload[46] == 0x05 && packet->payload[47] == 0x14)
|| (packet->payload[46] == 0x14 && packet->payload[47] == 0x05))) {
NDPI_LOG(NDPI_PROTOCOL_TVUPLAYER, ndpi_struct, NDPI_LOG_DEBUG, "found tvuplayer pattern type II. \n");
- ndpi_int_tvuplayer_add_connection(ndpi_struct, flow/* , NDPI_REAL_PROTOCOL */);
+ ndpi_int_tvuplayer_add_connection(ndpi_struct, flow);
return;
}
if (packet->payload_packet_len == 32
@@ -104,7 +104,7 @@ void ndpi_search_tvuplayer(struct ndpi_detection_module_struct *ndpi_struct, str
&& packet->payload[12] == 0x01 && (packet->payload[13] == 0xff || packet->payload[13] == 0x01)
&& packet->payload[19] == 0x14) {
NDPI_LOG(NDPI_PROTOCOL_TVUPLAYER, ndpi_struct, NDPI_LOG_DEBUG, "found tvuplayer pattern type III. \n");
- ndpi_int_tvuplayer_add_connection(ndpi_struct, flow/* , NDPI_REAL_PROTOCOL */);
+ ndpi_int_tvuplayer_add_connection(ndpi_struct, flow);
return;
}
if (packet->payload_packet_len == 84
@@ -114,7 +114,7 @@ void ndpi_search_tvuplayer(struct ndpi_detection_module_struct *ndpi_struct, str
&& packet->payload[19] == 0x14 && packet->payload[32] == 0x03
&& packet->payload[33] == 0xff && packet->payload[34] == 0x01 && packet->payload[39] == 0x34) {
NDPI_LOG(NDPI_PROTOCOL_TVUPLAYER, ndpi_struct, NDPI_LOG_DEBUG, "found tvuplayer pattern type IV. \n");
- ndpi_int_tvuplayer_add_connection(ndpi_struct, flow/* , NDPI_REAL_PROTOCOL */);
+ ndpi_int_tvuplayer_add_connection(ndpi_struct, flow);
return;
}
if (packet->payload_packet_len == 102
@@ -123,7 +123,7 @@ void ndpi_search_tvuplayer(struct ndpi_detection_module_struct *ndpi_struct, str
&& packet->payload[12] == 0x01 && packet->payload[13] == 0xff
&& packet->payload[19] == 0x14 && packet->payload[33] == 0xff && packet->payload[39] == 0x14) {
NDPI_LOG(NDPI_PROTOCOL_TVUPLAYER, ndpi_struct, NDPI_LOG_DEBUG, "found tvuplayer pattern type V. \n");
- ndpi_int_tvuplayer_add_connection(ndpi_struct, flow/* , NDPI_REAL_PROTOCOL */);
+ ndpi_int_tvuplayer_add_connection(ndpi_struct, flow);
return;
}
if (packet->payload_packet_len == 62 && packet->payload[0] == 0x00 && packet->payload[2] == 0x00
@@ -132,7 +132,7 @@ void ndpi_search_tvuplayer(struct ndpi_detection_module_struct *ndpi_struct, str
&& packet->payload[19] == 0x32 && ((packet->payload[26] == 0x05 && packet->payload[27] == 0x14)
|| (packet->payload[26] == 0x14 && packet->payload[27] == 0x05))) {
NDPI_LOG(NDPI_PROTOCOL_TVUPLAYER, ndpi_struct, NDPI_LOG_DEBUG, "found tvuplayer pattern type VI. \n");
- ndpi_int_tvuplayer_add_connection(ndpi_struct, flow/* , NDPI_REAL_PROTOCOL */);
+ ndpi_int_tvuplayer_add_connection(ndpi_struct, flow);
return;
}
// to check, if byte 26, 27, 33,39 match
@@ -141,7 +141,7 @@ void ndpi_search_tvuplayer(struct ndpi_detection_module_struct *ndpi_struct, str
&& packet->payload[10] == 0x00 && packet->payload[11] == 0x00
&& packet->payload[12] == 0x06 && packet->payload[13] == 0x00 && packet->payload[19] == 0x30) {
NDPI_LOG(NDPI_PROTOCOL_TVUPLAYER, ndpi_struct, NDPI_LOG_DEBUG, "found tvuplayer pattern type VII. \n");
- ndpi_int_tvuplayer_add_connection(ndpi_struct, flow/* , NDPI_REAL_PROTOCOL */);
+ ndpi_int_tvuplayer_add_connection(ndpi_struct, flow);
return;
}
}