STUN protocol dissector code cleanup

5 files changed, 43 insertions, 110 deletions

diff --git a/src/include/ndpi_typedefs.h b/src/include/ndpi_typedefs.h
index 0e60151cd..7e7c85995 100644
--- a/src/include/ndpi_typedefs.h
+++ b/src/include/ndpi_typedefs.h
@@ -1182,7 +1182,7 @@ struct ndpi_flow_struct {
       } ssl;
 
       struct {
-	u_int8_t num_udp_pkts, num_processed_pkts, num_binding_requests, is_skype;
+	u_int8_t num_udp_pkts, num_processed_pkts, num_binding_requests;
       } stun;
 
       /* We can have STUN over SSL/TLS thus they need to live together */
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index c3fece4a3..8bd7367f6 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -4131,13 +4131,9 @@ ndpi_protocol ndpi_detection_giveup(struct ndpi_detection_module_struct *ndpi_st
   check_stun_export:
     if(flow->protos.stun_ssl.stun.num_processed_pkts || flow->protos.stun_ssl.stun.num_udp_pkts) {
       // if(/* (flow->protos.stun_ssl.stun.num_processed_pkts >= NDPI_MIN_NUM_STUN_DETECTION) */
-      if(flow->protos.stun_ssl.stun.num_processed_pkts && flow->protos.stun_ssl.stun.is_skype) {
-	ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_SKYPE_CALL, NDPI_PROTOCOL_SKYPE);
-      } else {
-	ndpi_set_detected_protocol(ndpi_struct, flow,
-				   flow->guessed_host_protocol_id,
-				   NDPI_PROTOCOL_STUN);
-      }
+      ndpi_set_detected_protocol(ndpi_struct, flow,
+				 flow->guessed_host_protocol_id,
+				 NDPI_PROTOCOL_STUN);
     }
   }
 
diff --git a/src/lib/protocols/stun.c b/src/lib/protocols/stun.c
index 1717277e0..77ddf6ca0 100644
--- a/src/lib/protocols/stun.c
+++ b/src/lib/protocols/stun.c
@@ -44,7 +44,6 @@ struct stun_packet_header {
 static u_int8_t is_stun_based_proto(u_int16_t proto) {
 
   switch(proto) {
-  case NDPI_PROTOCOL_WHATSAPP:
   case NDPI_PROTOCOL_WHATSAPP_CALL:
   case NDPI_PROTOCOL_MESSENGER:
   case NDPI_PROTOCOL_HANGOUT_DUO:
@@ -53,7 +52,7 @@ static u_int8_t is_stun_based_proto(u_int16_t proto) {
   case NDPI_PROTOCOL_STUN:
     return(1);
   }
- 
+
   return(0);
 }
 
@@ -70,7 +69,7 @@ u_int32_t get_stun_lru_key(struct ndpi_flow_struct *flow, u_int8_t rev) {
 
 void ndpi_int_stun_add_connection(struct ndpi_detection_module_struct *ndpi_struct,
 				  struct ndpi_flow_struct *flow,
-				  u_int app_proto, u_int proto) {
+				  u_int proto, u_int app_proto) {
   if(ndpi_struct->stun_cache == NULL)
     ndpi_struct->stun_cache = ndpi_lru_cache_init(1024);
 
@@ -100,12 +99,12 @@ void ndpi_int_stun_add_connection(struct ndpi_detection_module_struct *ndpi_stru
       } else {
 	if(app_proto != NDPI_PROTOCOL_STUN) {
 	  /* No sense to ass STUN, but only subprotocols */
-	  
+
 #ifdef DEBUG_LRU
 	  printf("[LRU] ADDING %u / %u.%u [%u -> %u]\n", key, proto, app_proto,
 		 ntohs(flow->packet.udp->source), ntohs(flow->packet.udp->dest));
 #endif
-	  
+
 	  ndpi_lru_add_to_cache(ndpi_struct->stun_cache, key, app_proto);
 	  ndpi_lru_add_to_cache(ndpi_struct->stun_cache, key_rev, app_proto);
 	}
@@ -159,11 +158,7 @@ static int is_messenger_ip_address(u_int32_t host) {
 static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *ndpi_struct,
 					   struct ndpi_flow_struct *flow,
 					   const u_int8_t * payload,
-					   const u_int16_t payload_length,
-					   u_int8_t *is_whatsapp,
-					   u_int8_t *is_messenger,
-					   u_int8_t *is_duo
-					   ) {
+					   const u_int16_t payload_length) {
   u_int16_t msg_type, msg_len;
   struct stun_packet_header *h = (struct stun_packet_header*)payload;
   u_int8_t can_this_be_whatsapp_voice = 1;
@@ -171,15 +166,13 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *
   /* STUN over TCP does not look good */
   if(flow->packet.tcp) return(NDPI_IS_NOT_STUN);
 
-  *is_whatsapp = 0, *is_messenger = 0, *is_duo = 0;
-
   if(payload_length >= 512) {
     return(NDPI_IS_NOT_STUN);
   } else if(payload_length < sizeof(struct stun_packet_header)) {
     /* This looks like an invalid packet */
 
     if(flow->protos.stun_ssl.stun.num_udp_pkts > 0) {
-      *is_whatsapp = 1;
+      flow->guessed_host_protocol_id = NDPI_PROTOCOL_WHATSAPP_CALL;
       return(NDPI_IS_STUN); /* This is WhatsApp Voice */
     } else
       return(NDPI_IS_NOT_STUN);
@@ -198,7 +191,7 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *
 #ifdef DEBUG_STUN
     printf("[STUN] msg_type = %04X\n", msg_type);
 #endif
-    
+
     if(is_stun_based_proto(flow->guessed_host_protocol_id)) {
       /*
 	In this case we have the detected the typical STUN pattern
@@ -206,11 +199,11 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *
 	something else that has nothing to do with STUN anymore
       */
       ndpi_int_stun_add_connection(ndpi_struct, flow,
-				   flow->guessed_host_protocol_id,
-				   NDPI_PROTOCOL_STUN);
+				   flow->guessed_protocol_id,
+				   flow->guessed_host_protocol_id);
       return(NDPI_IS_STUN);
     }
-    
+
     return(NDPI_IS_NOT_STUN);
   }
 
@@ -246,21 +239,6 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *
 
       flow->guessed_host_protocol_id = proto, flow->guessed_protocol_id = NDPI_PROTOCOL_STUN;
 
-      switch(proto) {
-      case NDPI_PROTOCOL_WHATSAPP:
-	*is_whatsapp = 1;
-	break;
-      case NDPI_PROTOCOL_MESSENGER:
-	*is_messenger = 1;
-	break;
-      case NDPI_PROTOCOL_HANGOUT_DUO:
-	*is_duo = 1;
-	break;
-      case NDPI_PROTOCOL_SKYPE_CALL:
-	flow->protos.stun_ssl.stun.is_skype = 1;
-	break;
-      }
-
       return(NDPI_IS_STUN);
     } else {
 #ifdef DEBUG_LRU
@@ -279,7 +257,7 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *
     if((msg_len == 0) && (flow->guessed_host_protocol_id == NDPI_PROTOCOL_GOOGLE))
       flow->guessed_host_protocol_id = NDPI_PROTOCOL_HANGOUT_DUO;
     else
-      flow->guessed_host_protocol_id = NDPI_PROTOCOL_STUN;
+      flow->guessed_protocol_id = NDPI_PROTOCOL_STUN;
 
     if(msg_len == 0) {
       /* flow->protos.stun_ssl.stun.num_udp_pkts++; */
@@ -302,12 +280,12 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *
   if(((payload[0] == 0x80)
       && (payload_length < 512)
       && ((msg_len+20) <= payload_length)) /* WhatsApp Voice */) {
-    *is_whatsapp = 1;
+    flow->guessed_host_protocol_id = NDPI_PROTOCOL_WHATSAPP_CALL;
     return(NDPI_IS_STUN); /* This is WhatsApp Voice */
   } else if((payload[0] == 0x90)
 	    && (((msg_len+11) == payload_length) /* WhatsApp Video */
 		|| (flow->protos.stun_ssl.stun.num_binding_requests >= 4))) {
-    *is_whatsapp = 2;
+    flow->guessed_host_protocol_id = NDPI_PROTOCOL_WHATSAPP_CALL;
     return(NDPI_IS_STUN); /* This is WhatsApp Video */
   }
 
@@ -355,8 +333,8 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *
 #endif
 
 	switch(attribute) {
-	case 0x0008: /* Message Integrity */
-	case 0x0020: /* XOR-MAPPED-ADDRESSES */
+	  // case 0x0008: /* Message Integrity */
+	  // case 0x0020: /* XOR-MAPPED-ADDRESSES */
 	case 0x4000:
 	case 0x4001:
 	case 0x4002:
@@ -381,7 +359,6 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *
 #endif
 
 	    if(strstr((char*)flow->host_server_name, "google.com") != NULL) {
-	      *is_duo = 1;
 	      flow->guessed_host_protocol_id = NDPI_PROTOCOL_HANGOUT_DUO, flow->guessed_protocol_id = NDPI_PROTOCOL_STUN;
 	      return(NDPI_IS_STUN);
 	    } else if(strstr((char*)flow->host_server_name, "whispersystems.org") != NULL) {
@@ -395,12 +372,10 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *
 	case 0xC057: /* Messeger */
 	  if(msg_type == 0x0001) {
 	    if((msg_len == 100) || (msg_len == 104)) {
-	      *is_messenger = 1;
+	      flow->guessed_host_protocol_id = NDPI_PROTOCOL_MESSENGER, flow->guessed_protocol_id = NDPI_PROTOCOL_STUN;
 	      return(NDPI_IS_STUN);
 	    } else if(msg_len == 76) {
 #if 0
-	      *is_duo = 1;
-
 	      if(1) {
 		flow->guessed_host_protocol_id = NDPI_PROTOCOL_HANGOUT_DUO, flow->guessed_protocol_id = NDPI_PROTOCOL_STUN;
 		return(NDPI_IS_NOT_STUN); /* This case is found also with signal traffic */
@@ -422,7 +397,6 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *
 	    printf("==> Skype found\n");
 #endif
 	    flow->guessed_protocol_id = NDPI_PROTOCOL_SKYPE_CALL;
-	    flow->protos.stun_ssl.stun.is_skype = 1;
 	    return(NDPI_IS_STUN);
 	  }
 	  break;
@@ -443,7 +417,6 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *
 #endif
 
 	  flow->guessed_protocol_id = NDPI_PROTOCOL_SKYPE_CALL;
-	  flow->protos.stun_ssl.stun.is_skype = 1;
 	  return(NDPI_IS_STUN);
 	  break;
 
@@ -456,7 +429,6 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *
 	     && ((payload[offset+7] == 0x02) || (payload[offset+7] == 0x03))
 	     ) {
 	    flow->guessed_protocol_id = NDPI_PROTOCOL_SKYPE_CALL;
-	    flow->protos.stun_ssl.stun.is_skype = 1;
 #ifdef DEBUG_STUN
 	    printf("==> Skype (3) found\n");
 #endif
@@ -483,13 +455,13 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *
       }
       goto udp_stun_found;
     } else if(msg_type == 0x0800) {
-      *is_whatsapp = 1;
+      flow->guessed_host_protocol_id = NDPI_PROTOCOL_WHATSAPP_CALL;
       return(NDPI_IS_STUN); /* This is WhatsApp */
     }
   }
 
   if((flow->protos.stun_ssl.stun.num_udp_pkts > 0) && (msg_type <= 0x00FF)) {
-    *is_whatsapp = 1;
+    flow->guessed_host_protocol_id = NDPI_PROTOCOL_WHATSAPP_CALL;
     return(NDPI_IS_STUN); /* This is WhatsApp Voice */
   } else
     return(NDPI_IS_NOT_STUN);
@@ -498,7 +470,7 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *
   if(can_this_be_whatsapp_voice) {
     struct ndpi_packet_struct *packet = &flow->packet;
     int rc;
-    
+
     flow->protos.stun_ssl.stun.num_processed_pkts++;
 #ifdef DEBUG_STUN
     printf("==>> NDPI_PROTOCOL_WHATSAPP_CALL\n");
@@ -514,7 +486,9 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *
     rc = (flow->protos.stun_ssl.stun.num_udp_pkts < MAX_NUM_STUN_PKTS) ? NDPI_IS_NOT_STUN : NDPI_IS_STUN;
 
     if(rc == NDPI_IS_STUN)
-      ndpi_int_stun_add_connection(ndpi_struct, flow, flow->guessed_host_protocol_id, NDPI_IS_STUN);
+      ndpi_int_stun_add_connection(ndpi_struct, flow,
+				   NDPI_IS_STUN,
+				   flow->guessed_host_protocol_id);
 
     return(rc);
   } else {
@@ -530,7 +504,6 @@ static ndpi_int_stun_t ndpi_int_check_stun(struct ndpi_detection_module_struct *
 void ndpi_search_stun(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
 {
   struct ndpi_packet_struct *packet = &flow->packet;
-  u_int8_t is_whatsapp = 0, is_messenger = 0, is_duo = 0;
 
   NDPI_LOG_DBG(ndpi_struct, "search stun\n");
 
@@ -549,64 +522,27 @@ void ndpi_search_stun(struct ndpi_detection_module_struct *ndpi_struct, struct n
        * improved by checking only the STUN packet of given length */
 
       if(ndpi_int_check_stun(ndpi_struct, flow, packet->payload + 2,
-			     packet->payload_packet_len - 2,
-			     &is_whatsapp, &is_messenger, &is_duo) == NDPI_IS_STUN) {
-	if(flow->guessed_protocol_id == NDPI_PROTOCOL_UNKNOWN) flow->guessed_protocol_id = NDPI_PROTOCOL_STUN;
-
-	if(is_messenger) {
-	  ndpi_int_stun_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_MESSENGER, NDPI_PROTOCOL_STUN);
-	  return;
-	} else if(is_duo) {
-	  ndpi_int_stun_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HANGOUT_DUO, NDPI_PROTOCOL_STUN);
-	  return;
-	} else if(flow->guessed_host_protocol_id == NDPI_PROTOCOL_SIGNAL) {
-	  ndpi_int_stun_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_SIGNAL, NDPI_PROTOCOL_STUN);
-	  return;
-	} else if(flow->protos.stun_ssl.stun.is_skype || (flow->guessed_host_protocol_id = NDPI_PROTOCOL_SKYPE_CALL)) {
-	  NDPI_LOG_INFO(ndpi_struct, "found Skype\n");
-
-	  // if((flow->protos.stun_ssl.stun.num_processed_pkts >= 8) || (flow->protos.stun_ssl.stun.num_binding_requests >= 4))
-	  ndpi_int_stun_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_SKYPE_CALL, NDPI_PROTOCOL_SKYPE);
-	} else {
-	  NDPI_LOG_INFO(ndpi_struct, "found UDP stun\n"); /* Ummmmm we're in the TCP branch. This code looks bad */
-	  ndpi_int_stun_add_connection(ndpi_struct, flow,
-				       is_whatsapp ? NDPI_PROTOCOL_WHATSAPP_CALL : NDPI_PROTOCOL_STUN,
-				       NDPI_PROTOCOL_UNKNOWN);
-	}
-
-	return;
+			     packet->payload_packet_len - 2) == NDPI_IS_STUN) {
+	goto udp_stun_match;
       }
     }
   }
 
   /* UDP */
   if(ndpi_int_check_stun(ndpi_struct, flow, packet->payload,
-			 packet->payload_packet_len,
-			 &is_whatsapp, &is_messenger, &is_duo) == NDPI_IS_STUN) {
-    if(flow->guessed_protocol_id == NDPI_PROTOCOL_UNKNOWN) flow->guessed_protocol_id = NDPI_PROTOCOL_STUN;
-
-    if(is_messenger) {
-      ndpi_int_stun_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_MESSENGER, NDPI_PROTOCOL_STUN);
-      return;
-    } else if(is_duo) {
-      ndpi_int_stun_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_HANGOUT_DUO, NDPI_PROTOCOL_STUN);
-      return;
-    } else if(flow->guessed_host_protocol_id == NDPI_PROTOCOL_SIGNAL) {
-      ndpi_int_stun_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_SIGNAL, NDPI_PROTOCOL_STUN);
-      return;
-    } else if(flow->protos.stun_ssl.stun.is_skype) {
-      NDPI_LOG_INFO(ndpi_struct, "Found Skype\n");
-
-      /* flow->protos.stun_ssl.stun.num_binding_requests < 4) ? NDPI_PROTOCOL_SKYPE_CALL_IN : NDPI_PROTOCOL_SKYPE_CALL_OUT */
-      // if((flow->protos.stun_ssl.stun.num_udp_pkts >= 6) || (flow->protos.stun_ssl.stun.num_binding_requests >= 3))
-	ndpi_int_stun_add_connection(ndpi_struct, flow, NDPI_PROTOCOL_SKYPE_CALL, NDPI_PROTOCOL_SKYPE);
-    } else {
-      NDPI_LOG_INFO(ndpi_struct, "found UDP stun\n");
-      ndpi_int_stun_add_connection(ndpi_struct, flow,
-				   is_whatsapp ? NDPI_PROTOCOL_WHATSAPP_CALL : NDPI_PROTOCOL_STUN,
-				   NDPI_PROTOCOL_UNKNOWN);
-    }
+			 packet->payload_packet_len) == NDPI_IS_STUN) {
+  udp_stun_match:
+    if(flow->guessed_protocol_id == NDPI_PROTOCOL_UNKNOWN)
+      flow->guessed_protocol_id = NDPI_PROTOCOL_STUN;
 
+    if(flow->guessed_host_protocol_id == NDPI_PROTOCOL_UNKNOWN) {
+      flow->guessed_host_protocol_id = flow->guessed_protocol_id;
+      flow->guessed_protocol_id = NDPI_PROTOCOL_STUN;
+    }
+    
+    ndpi_int_stun_add_connection(ndpi_struct, flow,
+				 flow->guessed_protocol_id,
+				 flow->guessed_host_protocol_id);
     return;
   }
 
diff --git a/src/lib/protocols/tls.c b/src/lib/protocols/tls.c
index 5be39c714..f63da2067 100644
--- a/src/lib/protocols/tls.c
+++ b/src/lib/protocols/tls.c
@@ -628,7 +628,7 @@ int getTLScertificate(struct ndpi_detection_module_struct *ndpi_struct,
 		      u_int8_t version_len = packet->payload[offset+4];
 		      
 		      if(version_len == (extension_len-1)) {
-			/* Sanity check */
+#ifdef DEBUG_TLS
 			u_int8_t j;
 			
 			for(j=0; j<version_len; j += 2) {
@@ -636,6 +636,7 @@ int getTLScertificate(struct ndpi_detection_module_struct *ndpi_struct,
 			  
 			  printf("Client SSL [TLS version: 0x%04X]\n", tls_version);
 			}
+#endif
 		      }
 		    }
 
diff --git a/tests/result/skype-conference-call.pcap.out b/tests/result/skype-conference-call.pcap.out
index b22aa69c1..b34d958e2 100644
--- a/tests/result/skype-conference-call.pcap.out
+++ b/tests/result/skype-conference-call.pcap.out
@@ -1,3 +1,3 @@
 SkypeCall	200	39687	1
 
-	1	UDP 192.168.2.20:49282 <-> 104.46.40.49:60642 [proto: 125.38/Skype.SkypeCall][cat: VoIP/10][133 pkts/24845 bytes <-> 67 pkts/14842 bytes][bytes ratio: 0.252 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 10.8/22.4 159/203 24.8/47.7][Pkt Len c2s/s2c min/avg/max/stddev: 74/77 186.8/221.5 957/957 244.4/233.0][PLAIN TEXT (vRKSoR)]
+	1	UDP 192.168.2.20:49282 <-> 104.46.40.49:60642 [proto: 78.38/STUN.SkypeCall][cat: VoIP/10][133 pkts/24845 bytes <-> 67 pkts/14842 bytes][bytes ratio: 0.252 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 10.8/22.4 159/203 24.8/47.7][Pkt Len c2s/s2c min/avg/max/stddev: 74/77 186.8/221.5 957/957 244.4/233.0][PLAIN TEXT (vRKSoR)]