fix check for issue https://github.com/ntop/nDPI/issues/272

1 files changed, 26 insertions, 27 deletions

diff --git a/src/lib/protocols/whoisdas.c b/src/lib/protocols/whoisdas.c
index 2b086bb2f..968449cbd 100644
--- a/src/lib/protocols/whoisdas.c
+++ b/src/lib/protocols/whoisdas.c
@@ -1,7 +1,7 @@
 /*
  * whoisdas.c
  *
- * Copyright (C) 2013 - ntop.org
+ * Copyright (C) 2016 - ntop.org
  *
  * nDPI is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
@@ -17,44 +17,43 @@
  * along with nDPI.  If not, see <http://www.gnu.org/licenses/>.
  *
  */
-
-
 #include "ndpi_protocols.h"
+
 #ifdef NDPI_PROTOCOL_WHOIS_DAS
 
 void ndpi_search_whois_das(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
 {
   struct ndpi_packet_struct *packet = &flow->packet;
-  u_int16_t sport = ntohs(packet->tcp->source), dport = ntohs(packet->tcp->dest);
 
-  if ((packet->tcp != NULL)
-      && (
-	  ((sport == 43) || (dport == 43))
-	  ||
-	  ((sport == 4343) || (dport == 4343))
-	  )
-      ) {
-    if(packet->payload_packet_len > 0) {
-      u_int max_len = sizeof(flow->host_server_name)-1;
-      u_int i, j;
+  if(packet->tcp != NULL) {
+    u_int16_t sport = ntohs(packet->tcp->source), dport = ntohs(packet->tcp->dest);
+    
+    if(((sport == 43) || (dport == 43)) || ((sport == 4343) || (dport == 4343))) {
 
-      for(i=strlen((const char *)flow->host_server_name), j=0; (i<max_len) && (j<packet->payload_packet_len); i++, j++) {
-	if((packet->payload[j] == '\n') || (packet->payload[j] == '\r')) break;
+      if(packet->payload_packet_len > 0) {
+	
+	u_int max_len = sizeof(flow->host_server_name) - 1;
+	u_int i, j;
+	
+	for(i=strlen((const char *)flow->host_server_name), j=0; (i<max_len) && (j<packet->payload_packet_len); i++, j++) {
 
-	flow->host_server_name[i] = packet->payload[j];
+	  if((packet->payload[j] == '\n') || (packet->payload[j] == '\r')) break;
+	  
+	  flow->host_server_name[i] = packet->payload[j];
+	}
+	
+	flow->host_server_name[i] = '\0';
+	flow->server_id = ((sport == 43) || (sport == 4343)) ? flow->src : flow->dst;
+	
+	NDPI_LOG(NDPI_PROTOCOL_WHOIS_DAS, ndpi_struct, NDPI_LOG_DEBUG, "[WHOIS/DAS] %s\n", flow->host_server_name);
+	ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_WHOIS_DAS, NDPI_PROTOCOL_UNKNOWN);
+	return;
       }
-
-      flow->host_server_name[i] = '\0';      
-      flow->server_id = ((sport == 43) || (sport == 4343)) ? flow->src : flow->dst;
-
-      NDPI_LOG(NDPI_PROTOCOL_WHOIS_DAS, ndpi_struct, NDPI_LOG_DEBUG, "[WHOIS/DAS] %s\n", flow->host_server_name);
     }
-
-    ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_WHOIS_DAS, NDPI_PROTOCOL_UNKNOWN);
-  } else {
-    NDPI_LOG(NDPI_PROTOCOL_WHOIS_DAS, ndpi_struct, NDPI_LOG_TRACE, "WHOIS Excluded.\n");
-    NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_WHOIS_DAS);
   }
+  /* exclude WHOIS */
+  NDPI_LOG(NDPI_PROTOCOL_WHOIS_DAS, ndpi_struct, NDPI_LOG_TRACE, "WHOIS Excluded.\n");
+  NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_WHOIS_DAS);
 }