Merge branch 'vel21ripn-dev' into dev

1 files changed, 33 insertions, 26 deletions

diff --git a/src/lib/protocols/eaq.c b/src/lib/protocols/eaq.c
index 96ecacdde..3929b4ef6 100644
--- a/src/lib/protocols/eaq.c
+++ b/src/lib/protocols/eaq.c
@@ -24,12 +24,18 @@
 
   http://www.brasilbandalarga.com.br
  */
+
+#include "ndpi_protocol_ids.h"
+
+#ifdef NDPI_PROTOCOL_EAQ
+
+#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_EAQ
+
 #include "ndpi_api.h"
 
 #define EAQ_DEFAULT_PORT   6000
 #define EAQ_DEFAULT_SIZE     16
 
-#ifdef NDPI_PROTOCOL_EAQ
 static void ndpi_int_eaq_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
 					struct ndpi_flow_struct *flow) {
   ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_EAQ, NDPI_PROTOCOL_UNKNOWN);
@@ -40,33 +46,34 @@ void ndpi_search_eaq(struct ndpi_detection_module_struct *ndpi_struct, struct nd
   struct ndpi_packet_struct *packet = &flow->packet;
   u_int16_t sport = ntohs(packet->udp->source), dport = ntohs(packet->udp->dest);
   
-  if((packet->payload_packet_len != EAQ_DEFAULT_SIZE)
-     || ((sport != EAQ_DEFAULT_PORT) && (dport != EAQ_DEFAULT_PORT))) {
-  exclude_eaq:
-    NDPI_LOG(NDPI_PROTOCOL_EAQ, ndpi_struct, NDPI_LOG_DEBUG, "Exclude eaq.\n");
-    NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_EAQ);
-    return;
-  }
-
-  if(packet->udp != NULL) {
-    u_int32_t seq = (packet->payload[0] * 1000) + (packet->payload[1] * 100) + (packet->payload[2] * 10) + packet->payload[3];
-    
-    if(flow->l4.udp.eaq_pkt_id == 0)
-      flow->l4.udp.eaq_sequence = seq;
-    else {
-      if((flow->l4.udp.eaq_sequence == seq) || ((flow->l4.udp.eaq_sequence+1) == seq)) {
-	; /* Looks good */
-      } else
-	goto exclude_eaq;
-    }
+  NDPI_LOG_DBG(ndpi_struct, "search eaq\n");
+
+  do {
+    if( (packet->payload_packet_len != EAQ_DEFAULT_SIZE) ||
+        ((sport != EAQ_DEFAULT_PORT) && (dport != EAQ_DEFAULT_PORT)) )
+	    break;
+      
+    if(packet->udp != NULL) {
+      u_int32_t seq = (packet->payload[0] * 1000) + (packet->payload[1] * 100) + (packet->payload[2] * 10) + packet->payload[3];
+      
+      if(flow->l4.udp.eaq_pkt_id == 0)
+        flow->l4.udp.eaq_sequence = seq;
+      else {
+        if( (flow->l4.udp.eaq_sequence != seq) &&
+	    ((flow->l4.udp.eaq_sequence+1) != seq)) break;
+      }
 
-    if(++flow->l4.udp.eaq_pkt_id == 4) {
-      /* We have collected enough packets so we assume it's EAQ */
-      NDPI_LOG(NDPI_PROTOCOL_EAQ, ndpi_struct, NDPI_LOG_DEBUG, "found eaq.\n");
-      ndpi_int_eaq_add_connection(ndpi_struct, flow);
+      if(++flow->l4.udp.eaq_pkt_id == 4) {
+        /* We have collected enough packets so we assume it's EAQ */
+        NDPI_LOG_INFO(ndpi_struct, "found eaq\n");
+        ndpi_int_eaq_add_connection(ndpi_struct, flow);
+        return;
+      }
     }
-  } else
-    goto exclude_eaq;
+  } while(0);
+
+  NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
+
 }