Merge pull request #3 from ntop/dev

update to latest

1 files changed, 18 insertions, 20 deletions

diff --git a/src/lib/protocols/florensia.c b/src/lib/protocols/florensia.c
index c694a2939..217874a6a 100644
--- a/src/lib/protocols/florensia.c
+++ b/src/lib/protocols/florensia.c
@@ -22,11 +22,14 @@
  *
  */
 
+#include "ndpi_protocol_ids.h"
 
-
-#include "ndpi_protocols.h"
 #ifdef NDPI_PROTOCOL_FLORENSIA
 
+#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_FLORENSIA
+
+#include "ndpi_api.h"
+
 
 static void ndpi_florensia_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
 {
@@ -37,44 +40,40 @@ void ndpi_search_florensia(struct ndpi_detection_module_struct *ndpi_struct, str
 {
 	struct ndpi_packet_struct *packet = &flow->packet;
 	
-//      struct ndpi_id_struct         *src=ndpi_struct->src;
-//      struct ndpi_id_struct         *dst=ndpi_struct->dst;
-
-
-	NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "search florensia.\n");
+	NDPI_LOG_DBG(ndpi_struct, "search florensia\n");
 
 	if (packet->tcp != NULL) {
 		if (packet->payload_packet_len == 5 && get_l16(packet->payload, 0) == packet->payload_packet_len
 			&& packet->payload[2] == 0x65 && packet->payload[4] == 0xff) {
 			if (flow->florensia_stage == 1) {
-				NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "found florensia.\n");
+				NDPI_LOG_INFO(ndpi_struct, "found florensia\n");
 				ndpi_florensia_add_connection(ndpi_struct, flow);
 				return;
 			}
-			NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "maybe florensia -> stage is set to 1.\n");
+			NDPI_LOG_DBG2(ndpi_struct, "maybe florensia -> stage is set to 1\n");
 			flow->florensia_stage = 1;
 			return;
 		}
 		if (packet->payload_packet_len > 8 && get_l16(packet->payload, 0) == packet->payload_packet_len
 			&& get_u_int16_t(packet->payload, 2) == htons(0x0201) && get_u_int32_t(packet->payload, 4) == htonl(0xFFFFFFFF)) {
-			NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "maybe florensia -> stage is set to 1.\n");
+			NDPI_LOG_DBG2(ndpi_struct, "maybe florensia -> stage is set to 1\n");
 			flow->florensia_stage = 1;
 			return;
 		}
 		if (packet->payload_packet_len == 406 && get_l16(packet->payload, 0) == packet->payload_packet_len
 			&& packet->payload[2] == 0x63) {
-			NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "maybe florensia -> stage is set to 1.\n");
+			NDPI_LOG_DBG2(ndpi_struct, "maybe florensia -> stage is set to 1\n");
 			flow->florensia_stage = 1;
 			return;
 		}
 		if (packet->payload_packet_len == 12 && get_l16(packet->payload, 0) == packet->payload_packet_len
 			&& get_u_int16_t(packet->payload, 2) == htons(0x0301)) {
 			if (flow->florensia_stage == 1) {
-				NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "found florensia.\n");
+				NDPI_LOG_INFO(ndpi_struct, "found florensia\n");
 				ndpi_florensia_add_connection(ndpi_struct, flow);
 				return;
 			}
-			NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "maybe florensia -> stage is set to 1.\n");
+			NDPI_LOG_DBG2(ndpi_struct, "maybe florensia -> stage is set to 1\n");
 			flow->florensia_stage = 1;
 			return;
 		}
@@ -82,19 +81,19 @@ void ndpi_search_florensia(struct ndpi_detection_module_struct *ndpi_struct, str
 		if (flow->florensia_stage == 1) {
 			if (packet->payload_packet_len == 8 && get_l16(packet->payload, 0) == packet->payload_packet_len
 				&& get_u_int16_t(packet->payload, 2) == htons(0x0302) && get_u_int32_t(packet->payload, 4) == htonl(0xFFFFFFFF)) {
-				NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "found florensia asymmetrically.\n");
+				NDPI_LOG_INFO(ndpi_struct, "found florensia asymmetrically\n");
 				ndpi_florensia_add_connection(ndpi_struct, flow);
 				return;
 			}
 			if (packet->payload_packet_len == 24 && get_l16(packet->payload, 0) == packet->payload_packet_len
 				&& get_u_int16_t(packet->payload, 2) == htons(0x0202)
 				&& get_u_int32_t(packet->payload, packet->payload_packet_len - 4) == htonl(0xFFFFFFFF)) {
-				NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "found florensia.\n");
+				NDPI_LOG_INFO(ndpi_struct, "found florensia\n");
 				ndpi_florensia_add_connection(ndpi_struct, flow);
 				return;
 			}
 			if (flow->packet_counter < 10 && get_l16(packet->payload, 0) == packet->payload_packet_len) {
-				NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "maybe florensia.\n");
+				NDPI_LOG_DBG2(ndpi_struct, "maybe florensia\n");
 				return;
 			}
 		}
@@ -103,20 +102,19 @@ void ndpi_search_florensia(struct ndpi_detection_module_struct *ndpi_struct, str
 	if (packet->udp != NULL) {
 		if (flow->florensia_stage == 0 && packet->payload_packet_len == 6
 			&& get_u_int16_t(packet->payload, 0) == ntohs(0x0503) && get_u_int32_t(packet->payload, 2) == htonl(0xFFFF0000)) {
-			NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "maybe florensia -> stage is set to 1.\n");
+			NDPI_LOG_DBG2(ndpi_struct, "maybe florensia -> stage is set to 1\n");
 			flow->florensia_stage = 1;
 			return;
 		}
 		if (flow->florensia_stage == 1 && packet->payload_packet_len == 8
 			&& get_u_int16_t(packet->payload, 0) == ntohs(0x0500) && get_u_int16_t(packet->payload, 4) == htons(0x4191)) {
-			NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "found florensia.\n");
+			NDPI_LOG_INFO(ndpi_struct, "found florensia\n");
 			ndpi_florensia_add_connection(ndpi_struct, flow);
 			return;
 		}
 	}
 
-	NDPI_LOG(NDPI_PROTOCOL_FLORENSIA, ndpi_struct, NDPI_LOG_DEBUG, "exclude florensia.\n");
-	NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_FLORENSIA);
+	NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
 }