1 files changed, 39 insertions, 8 deletions

diff --git a/src/lib/protocols/ubntac2.c b/src/lib/protocols/ubntac2.c
index b465e0a30..012c8712e 100644
--- a/src/lib/protocols/ubntac2.c
+++ b/src/lib/protocols/ubntac2.c
@@ -19,10 +19,15 @@
  */
 
 
-#include "ndpi_protocols.h"
+#include "ndpi_protocol_ids.h"
 
 #ifdef NDPI_PROTOCOL_UBNTAC2
 
+#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_UBNTAC2
+
+#include "ndpi_api.h"
+
+
 static void ndpi_int_ubntac2_add_connection(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
 {
   ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_UBNTAC2, NDPI_PROTOCOL_UNKNOWN);
@@ -33,21 +38,47 @@ void ndpi_search_ubntac2(struct ndpi_detection_module_struct *ndpi_struct, struc
 {
   struct ndpi_packet_struct *packet = &flow->packet;
 
-  NDPI_LOG(NDPI_PROTOCOL_UBNTAC2, ndpi_struct, NDPI_LOG_TRACE, "UBNTAC2 detection... plen:%i %i:%i\n", packet->payload_packet_len, ntohs(packet->udp->source), ntohs(packet->udp->dest));
+  NDPI_LOG_DBG(ndpi_struct, "search ubntac2\n");
+  NDPI_LOG_DBG2(ndpi_struct, "UBNTAC2 detection... plen:%i %i:%i\n", packet->payload_packet_len, ntohs(packet->udp->source), ntohs(packet->udp->dest));
 
   if(packet->udp) {
     if(packet->payload_packet_len >= 135 &&
-       (packet->udp->source == htons(10001) || packet->udp->dest == htons(10001)) &&
-       memcmp(&(packet->payload[36]), "UBNT", 4) == 0) {
+       (packet->udp->source == htons(10001) || packet->udp->dest == htons(10001))) {
+      int found = 0;
       
-      NDPI_LOG(NDPI_PROTOCOL_UBNTAC2, ndpi_struct, NDPI_LOG_DEBUG, "UBNT AirControl 2 request\n");
-      
-      ndpi_int_ubntac2_add_connection(ndpi_struct, flow);
+      if(memcmp(&(packet->payload[36]), "UBNT", 4) == 0) {
+	found = 36+5;
+      } else if(memcmp(&(packet->payload[49]), "ubnt", 4) == 0) {
+	found = 49+5;
+      }
+
+      if(found) {
+	char version[256];
+	int i, j, len;
+	
+	found += packet->payload[found+1] + 4; /* Skip model name */
+	found++; /* Skip len*/
+	
+	if(found < packet->payload_packet_len) {
+	  for(i=found, j=0; (packet->payload[i] != 0) && (i < packet->payload_packet_len) && (i < (sizeof(version)-1)); i++)
+	    version[j++] = packet->payload[i];
+	  
+	  version[j] = '\0';
+	  
+	  len = ndpi_min(sizeof(flow->protos.ubntac2.version)-1, j);
+	  strncpy(flow->protos.ubntac2.version, (const char *)version, len);
+	  flow->protos.ubntac2.version[len] = '\0';
+	}
+	
+	NDPI_LOG_INFO(ndpi_struct, "UBNT AirControl 2 request\n");
+	
+	ndpi_int_ubntac2_add_connection(ndpi_struct, flow);
+      }
       return;
     }
   }
 
-  NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_UBNTAC2);
+  NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
 }