Merge pull request #3 from ntop/dev

update to latest

1 files changed, 16 insertions, 18 deletions

diff --git a/src/lib/protocols/crossfire.c b/src/lib/protocols/crossfire.c
index 5dfddf5c3..ea1dce66a 100644
--- a/src/lib/protocols/crossfire.c
+++ b/src/lib/protocols/crossfire.c
@@ -21,11 +21,14 @@
  *
  */
 
+#include "ndpi_protocol_ids.h"
 
-/* include files */
-#include "ndpi_protocols.h"
 #ifdef NDPI_PROTOCOL_CROSSFIRE
 
+#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_CROSSFIRE
+
+#include "ndpi_api.h"
+
 
 static void ndpi_int_crossfire_add_connection(struct ndpi_detection_module_struct *ndpi_struct, 
 					      struct ndpi_flow_struct *flow/* , ndpi_protocol_type_t protocol_type */)
@@ -37,21 +40,17 @@ static void ndpi_int_crossfire_add_connection(struct ndpi_detection_module_struc
 void ndpi_search_crossfire_tcp_udp(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
 {
 	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_CROSSFIRE, ndpi_struct, NDPI_LOG_DEBUG, "search crossfire.\n");
 
+	NDPI_LOG_DBG(ndpi_struct, "search crossfire\n");
 
 	if (packet->udp != 0) {
-		if (packet->payload_packet_len == 25 && get_u_int32_t(packet->payload, 0) == ntohl(0xc7d91999)
+		if (packet->payload_packet_len == 25
+			&& get_u_int32_t(packet->payload, 0) == ntohl(0xc7d91999)
 			&& get_u_int16_t(packet->payload, 4) == ntohs(0x0200)
-			&& get_u_int16_t(packet->payload, 22) == ntohs(0x7d00)
-			) {
-			NDPI_LOG(NDPI_PROTOCOL_CROSSFIRE, ndpi_struct, NDPI_LOG_DEBUG, "Crossfire: found udp packet.\n");
-			ndpi_int_crossfire_add_connection(ndpi_struct, flow);
-			return;
+			&& get_u_int16_t(packet->payload, 22) == ntohs(0x7d00)) {
+		    NDPI_LOG_INFO(ndpi_struct, "found Crossfire: udp packet\n");
+		    ndpi_int_crossfire_add_connection(ndpi_struct, flow);
+		    return;
 		}
 
 	} else if (packet->tcp != 0) {
@@ -67,16 +66,15 @@ void ndpi_search_crossfire_tcp_udp(struct ndpi_detection_module_struct *ndpi_str
 					&& (memcmp(packet->host_line.ptr, "crossfire", 9) == 0
 						|| memcmp(packet->host_line.ptr, "www.crossfire", 13) == 0))
 				) {
-				NDPI_LOG(NDPI_PROTOCOL_CROSSFIRE, ndpi_struct, NDPI_LOG_DEBUG, "Crossfire: found HTTP request.\n");
-				ndpi_int_crossfire_add_connection(ndpi_struct, flow);
-				return;
+			     NDPI_LOG_DBG(ndpi_struct, "found Crossfire: HTTP request\n");
+			     ndpi_int_crossfire_add_connection(ndpi_struct, flow);
+			     return;
 			}
 		}
 
 	}
 
-	NDPI_LOG(NDPI_PROTOCOL_CROSSFIRE, ndpi_struct, NDPI_LOG_DEBUG, "exclude crossfire.\n");
-	NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_CROSSFIRE);
+	NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
 }