Merge pull request #3 from ntop/dev

update to latest

1 files changed, 12 insertions, 7 deletions

diff --git a/src/lib/protocols/mssql_tds.c b/src/lib/protocols/mssql_tds.c
index 8a78266a9..75507fd52 100644
--- a/src/lib/protocols/mssql_tds.c
+++ b/src/lib/protocols/mssql_tds.c
@@ -22,10 +22,15 @@
  */
 
 
-#include "ndpi_protocols.h"
+#include "ndpi_protocol_ids.h"
 
 #ifdef NDPI_PROTOCOL_MSSQL_TDS
 
+#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_MSSQL_TDS
+
+#include "ndpi_api.h"
+
+
 struct tds_packet_header {
   u_int8_t type;
   u_int8_t status;
@@ -46,24 +51,24 @@ void ndpi_search_mssql_tds(struct ndpi_detection_module_struct *ndpi_struct, str
   struct ndpi_packet_struct *packet = &flow->packet;
   struct tds_packet_header *h = (struct tds_packet_header*) packet->payload;
 
-  if (packet->payload_packet_len < sizeof(struct tds_packet_header)) {
-    NDPI_LOG(NDPI_PROTOCOL_MSSQL_TDS, ndpi_struct, NDPI_LOG_DEBUG, "exclude mssql_tds\n");
-    NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MSSQL_TDS);
+  NDPI_LOG_DBG(ndpi_struct, "search mssql_tds\n");
+
+  if(packet->payload_packet_len < sizeof(struct tds_packet_header)) {
+    NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
     return;
   }
   
   if((h->type >= 1 && h->type <= 8) || (h->type >= 14 && h->type <= 18)) {
     if(h->status == 0x00 || h->status == 0x01 || h->status == 0x02 || h->status == 0x04 || h->status == 0x08 || h->status == 0x09 || h->status == 0x10) {
       if(ntohs(h->length) == packet->payload_packet_len && h->window == 0x00) {
-	NDPI_LOG(NDPI_PROTOCOL_MSSQL_TDS, ndpi_struct, NDPI_LOG_DEBUG, "found mssql_tds\n");
+	NDPI_LOG_INFO(ndpi_struct, "found mssql_tds\n");
 	ndpi_int_mssql_tds_add_connection(ndpi_struct, flow);
 	return;
       }
     }
   }
   
-  NDPI_LOG(NDPI_PROTOCOL_MSSQL_TDS, ndpi_struct, NDPI_LOG_DEBUG, "exclude mssql_tds\n");
-  NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_MSSQL_TDS);
+  NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
 }