Merge pull request #3 from ntop/dev

update to latest

1 files changed, 13 insertions, 14 deletions

diff --git a/src/lib/protocols/socrates.c b/src/lib/protocols/socrates.c
index 58a9b01ba..2dfad068d 100644
--- a/src/lib/protocols/socrates.c
+++ b/src/lib/protocols/socrates.c
@@ -23,9 +23,13 @@
  */
 
 
-#include "ndpi_protocols.h"
+#include "ndpi_protocol_ids.h"
+
 #ifdef NDPI_PROTOCOL_SOCRATES
 
+#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_SOCRATES
+
+#include "ndpi_api.h"
 
 static void ndpi_socrates_add_connection(struct ndpi_detection_module_struct
 					 *ndpi_struct, struct ndpi_flow_struct *flow)
@@ -38,20 +42,16 @@ void ndpi_search_socrates(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;
-
-
+  NDPI_LOG_DBG(ndpi_struct, "search socrates\n");
 
-  NDPI_LOG(NDPI_PROTOCOL_SOCRATES, ndpi_struct, NDPI_LOG_DEBUG, "search socrates.\n");
   if (packet->udp != NULL) {
     if (packet->payload_packet_len > 9 && packet->payload[0] == 0xfe
 	&& packet->payload[packet->payload_packet_len - 1] == 0x05) {
-      NDPI_LOG(NDPI_PROTOCOL_SOCRATES, ndpi_struct, NDPI_LOG_DEBUG, "found fe.\n");
+      NDPI_LOG_DBG2(ndpi_struct, "found fe\n");
 
-      NDPI_LOG(NDPI_PROTOCOL_SOCRATES, ndpi_struct, NDPI_LOG_DEBUG, "len match.\n");
+      NDPI_LOG_DBG2(ndpi_struct, "len match\n");
       if (memcmp(&packet->payload[2], "socrates", 8) == 0) {
-	NDPI_LOG(NDPI_PROTOCOL_SOCRATES, ndpi_struct, NDPI_LOG_DEBUG, "found socrates udp.\n");
+	NDPI_LOG_INFO(ndpi_struct, "found socrates udp\n");
 	ndpi_socrates_add_connection(ndpi_struct, flow);
       }
 
@@ -59,19 +59,18 @@ void ndpi_search_socrates(struct ndpi_detection_module_struct
   } else if (packet->tcp != NULL) {
     if (packet->payload_packet_len > 13 && packet->payload[0] == 0xfe
 	&& packet->payload[packet->payload_packet_len - 1] == 0x05) {
-      NDPI_LOG(NDPI_PROTOCOL_SOCRATES, ndpi_struct, NDPI_LOG_DEBUG, "found fe.\n");
+      NDPI_LOG_DBG2(ndpi_struct, "found fe\n");
       if (packet->payload_packet_len == ntohl(get_u_int32_t(packet->payload, 2))) {
-	NDPI_LOG(NDPI_PROTOCOL_SOCRATES, ndpi_struct, NDPI_LOG_DEBUG, "len match.\n");
+	NDPI_LOG_DBG2(ndpi_struct, "len match\n");
 	if (memcmp(&packet->payload[6], "socrates", 8) == 0) {
-	  NDPI_LOG(NDPI_PROTOCOL_SOCRATES, ndpi_struct, NDPI_LOG_DEBUG, "found socrates tcp.\n");
+	  NDPI_LOG_INFO(ndpi_struct, "found socrates tcp\n");
 	  ndpi_socrates_add_connection(ndpi_struct, flow);
 	}
       }
     }
   }
 
-  NDPI_LOG(NDPI_PROTOCOL_SOCRATES, ndpi_struct, NDPI_LOG_DEBUG, "exclude socrates.\n");
-  NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_SOCRATES);
+  NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
 }