diff options
author | Vito Piserchia <vito.piserchia@dreamlab.net> | 2016-10-13 13:50:29 +0200 |
---|---|---|
committer | Vito Piserchia <vito.piserchia@dreamlab.net> | 2016-10-13 13:50:29 +0200 |
commit | 4c467d7cad5b352c692b6e73b43e6d23325b4b38 (patch) | |
tree | 045721c039d518c3d32e6dc88d7c9780ee10da95 /src/lib/protocols/ppstream.c | |
parent | a17553cbf1c7dd1bb92e83d800e6904d159fc016 (diff) | |
parent | db794beb84331f1f15f68b4685c6b87e56560597 (diff) |
Merge remote-tracking branch 'upstream/dev' into dev
Diffstat (limited to 'src/lib/protocols/ppstream.c')
-rw-r--r-- | src/lib/protocols/ppstream.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/src/lib/protocols/ppstream.c b/src/lib/protocols/ppstream.c index d60966798..f3323697b 100644 --- a/src/lib/protocols/ppstream.c +++ b/src/lib/protocols/ppstream.c @@ -1,8 +1,7 @@ /* * ppstream.c * - * Copyright (C) 2009-2011 by ipoque GmbH - * Copyright (C) 2011-15 - ntop.org + * Copyright (C) 2016 - 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 @@ -21,9 +20,8 @@ * along with nDPI. If not, see <http://www.gnu.org/licenses/>. * */ - - #include "ndpi_protocols.h" + #ifdef NDPI_PROTOCOL_PPSTREAM static void ndpi_int_ppstream_add_connection(struct ndpi_detection_module_struct @@ -36,13 +34,7 @@ void ndpi_search_ppstream(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; - - - + /* check TCP Connections -> Videodata */ if (packet->tcp != NULL) { if (packet->payload_packet_len >= 60 && get_u_int32_t(packet->payload, 52) == 0 |