Merge pull request #3 from ntop/dev

update to latest

1 files changed, 15 insertions, 19 deletions

diff --git a/src/lib/protocols/warcraft3.c b/src/lib/protocols/warcraft3.c
index ab07571eb..bbc1d8388 100644
--- a/src/lib/protocols/warcraft3.c
+++ b/src/lib/protocols/warcraft3.c
@@ -22,12 +22,13 @@
  * 
  */
 
+#include "ndpi_protocol_ids.h"
 
+#ifdef NDPI_PROTOCOL_WARCRAFT3
 
-/* include files */
+#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_WARCRAFT3
 
-#include "ndpi_protocols.h"
-#ifdef NDPI_PROTOCOL_WARCRAFT3
+#include "ndpi_api.h"
 
 static void ndpi_int_warcraft3_add_connection(struct ndpi_detection_module_struct
 					      *ndpi_struct, struct ndpi_flow_struct *flow)
@@ -40,52 +41,48 @@ void ndpi_search_warcraft3(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;
-
   u_int16_t l; /* 
 		  Leave it as u_int32_t because otherwise 'u_int16_t temp' 
 		  might overflood it and thus generate an infinite loop
 	       */
 
-  NDPI_LOG(NDPI_PROTOCOL_WARCRAFT3, ndpi_struct, NDPI_LOG_DEBUG, "search WARCRAFT3\n");
+  NDPI_LOG_DBG(ndpi_struct, "search WARCRAFT3\n");
 
 
   if (flow->packet_counter == 1 && packet->payload_packet_len == 1 && packet->payload[0] == 0x01) {
-    NDPI_LOG(NDPI_PROTOCOL_WARCRAFT3, ndpi_struct, NDPI_LOG_DEBUG, "maybe warcraft3: packet_len == 1\n");
+    NDPI_LOG_DBG2(ndpi_struct, "maybe warcraft3: packet_len == 1\n");
     return;
   } else if (packet->payload_packet_len >= 4 && (packet->payload[0] == 0xf7 || packet->payload[0] == 0xff)) {
 
-    NDPI_LOG(NDPI_PROTOCOL_WARCRAFT3, ndpi_struct, NDPI_LOG_DEBUG, "packet_payload begins with 0xf7 or 0xff\n");
+    NDPI_LOG_DBG2(ndpi_struct, "packet_payload begins with 0xf7 or 0xff\n");
 
     l = packet->payload[2] + (packet->payload[3] << 8);	// similar to ntohs
 
-    NDPI_LOG(NDPI_PROTOCOL_WARCRAFT3, ndpi_struct, NDPI_LOG_DEBUG, "l = %u \n", l);
+    NDPI_LOG_DBG2(ndpi_struct, "l = %u \n", l);
 
     while (l <= (packet->payload_packet_len - 4)) {
       if (packet->payload[l] == 0xf7) {
 	u_int16_t temp = (packet->payload[l + 2 + 1] << 8) + packet->payload[l + 2];
-	NDPI_LOG(NDPI_PROTOCOL_WARCRAFT3, ndpi_struct, NDPI_LOG_DEBUG, "another f7 visited.\n");
+	NDPI_LOG_DBG2(ndpi_struct, "another f7 visited\n");
 
 	if((temp <= 2) || (temp > 1500)) {
-	  NDPI_LOG(NDPI_PROTOCOL_WARCRAFT3, ndpi_struct, NDPI_LOG_DEBUG, "break\n");
+	  NDPI_LOG_DBG2(ndpi_struct, "break\n");
 	  break;
 	} else {
 	  l += temp;
-	  NDPI_LOG(NDPI_PROTOCOL_WARCRAFT3, ndpi_struct, NDPI_LOG_DEBUG, "l = %u \n", l);
+	  NDPI_LOG_DBG2(ndpi_struct, "l = %u \n", l);
 	}
       } else {
-	NDPI_LOG(NDPI_PROTOCOL_WARCRAFT3, ndpi_struct, NDPI_LOG_DEBUG, "break\n");
+	NDPI_LOG_DBG2(ndpi_struct, "break\n");
 	break;
       }
     }
 
     if (l == packet->payload_packet_len) {
-      NDPI_LOG(NDPI_PROTOCOL_WARCRAFT3, ndpi_struct, NDPI_LOG_DEBUG, "maybe WARCRAFT3\n");
-      NDPI_LOG(NDPI_PROTOCOL_WARCRAFT3, ndpi_struct, NDPI_LOG_DEBUG, "flow->packet_counter = %u \n",
+      NDPI_LOG_DBG2(ndpi_struct, "maybe WARCRAFT3 flow->packet_counter = %u \n",
 	       flow->packet_counter);
       if (flow->packet_counter > 2) {
-	NDPI_LOG(NDPI_PROTOCOL_WARCRAFT3, ndpi_struct, NDPI_LOG_DEBUG, "detected WARCRAFT3\n");
+	NDPI_LOG_INFO(ndpi_struct, "found WARCRAFT3\n");
 	ndpi_int_warcraft3_add_connection(ndpi_struct, flow);
 	return;
       }
@@ -93,8 +90,7 @@ void ndpi_search_warcraft3(struct ndpi_detection_module_struct
     }
   }
 
-  NDPI_LOG(NDPI_PROTOCOL_WARCRAFT3, ndpi_struct, NDPI_LOG_DEBUG, "no warcraft3 detected.\n");
-  NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_WARCRAFT3);
+  NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
 }