Merge branch 'vel21ripn-dev' into dev

1 files changed, 8 insertions, 7 deletions

diff --git a/src/lib/protocols/openft.c b/src/lib/protocols/openft.c
index c4a10645b..4a86a067f 100644
--- a/src/lib/protocols/openft.c
+++ b/src/lib/protocols/openft.c
@@ -22,10 +22,14 @@
  * 
  */
 
+#include "ndpi_protocol_ids.h"
 
-#include "ndpi_protocols.h"
 #ifdef NDPI_PROTOCOL_OPENFT
 
+#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_OPENFT
+
+#include "ndpi_protocols.h"
+
 static void ndpi_int_openft_add_connection(struct ndpi_detection_module_struct
 					   *ndpi_struct, struct ndpi_flow_struct *flow)
 {
@@ -37,21 +41,18 @@ void ndpi_search_openft_tcp(struct ndpi_detection_module_struct
 {
 	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->payload_packet_len > 5 && memcmp(packet->payload, "GET /", 5) == 0) {
-		NDPI_LOG(NDPI_PROTOCOL_OPENFT, ndpi_struct, NDPI_LOG_DEBUG, "HTTP packet detected.\n");
+		NDPI_LOG_DBG2(ndpi_struct, "HTTP packet detected\n");
 		ndpi_parse_packet_line_info(ndpi_struct, flow);
 		if (packet->parsed_lines >= 2
 			&& packet->line[1].len > 13 && memcmp(packet->line[1].ptr, "X-OpenftAlias:", 14) == 0) {
-			NDPI_LOG(NDPI_PROTOCOL_OPENFT, ndpi_struct, NDPI_LOG_DEBUG, "OpenFT detected.\n");
+			NDPI_LOG_INFO(ndpi_struct, "found OpenFT\n");
 			ndpi_int_openft_add_connection(ndpi_struct, flow);
 			return;
 		}
 	}
 
-	NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_OPENFT);
+	NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
 }