aboutsummaryrefslogtreecommitdiff
path: root/src/lib/protocols/shoutcast.c
diff options
context:
space:
mode:
authorLuca <deri@ntop.org>2018-07-21 16:02:54 +0200
committerLuca <deri@ntop.org>2018-07-21 16:02:54 +0200
commit667e77c609d842a9a41930b590de206fb2b917fe (patch)
treea3a5fade626cc5e875948ec3684f8141e1a4e097 /src/lib/protocols/shoutcast.c
parenta499f369a560107b214e935dfbef22b4534f76a4 (diff)
Major code cleanup
Converted some not popular protocols to NDPI_PROTOCOL_GENERIC with category detection
Diffstat (limited to 'src/lib/protocols/shoutcast.c')
-rw-r--r--src/lib/protocols/shoutcast.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/src/lib/protocols/shoutcast.c b/src/lib/protocols/shoutcast.c
index 2115c574f..10486c0bd 100644
--- a/src/lib/protocols/shoutcast.c
+++ b/src/lib/protocols/shoutcast.c
@@ -2,7 +2,7 @@
* shoutcast.c
*
* Copyright (C) 2009-2011 by ipoque GmbH
- * Copyright (C) 2011-15 - ntop.org
+ * Copyright (C) 2011-18 - 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
@@ -24,8 +24,6 @@
#include "ndpi_protocol_ids.h"
-#ifdef NDPI_PROTOCOL_SHOUTCAST
-
#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_SHOUTCAST
#include "ndpi_api.h"
@@ -52,9 +50,7 @@ void ndpi_search_shoutcast_tcp(struct ndpi_detection_module_struct
return;
}
if (flow->packet_counter < 3
-#ifdef NDPI_PROTOCOL_HTTP
&& packet->detected_protocol_stack[0] == NDPI_PROTOCOL_HTTP
-#endif
) {
NDPI_LOG_DBG2(ndpi_struct,
"http detected, need next packet for shoutcast detection.\n");
@@ -119,4 +115,4 @@ void init_shoutcast_dissector(struct ndpi_detection_module_struct *ndpi_struct,
*id += 1;
}
-#endif
+