Merge branch 'vel21ripn-dev' into dev

1 files changed, 22 insertions, 18 deletions

diff --git a/src/lib/protocols/teamspeak.c b/src/lib/protocols/teamspeak.c
index fd8a296fb..df13c9756 100644
--- a/src/lib/protocols/teamspeak.c
+++ b/src/lib/protocols/teamspeak.c
@@ -17,49 +17,53 @@
  * If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ndpi_api.h"
-
+#include "ndpi_protocol_ids.h"
 
 #ifdef NDPI_PROTOCOL_TEAMSPEAK
 
+#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_TEAMSPEAK
+
+#include "ndpi_api.h"
+
 static void ndpi_int_teamspeak_add_connection(struct ndpi_detection_module_struct
                                              *ndpi_struct, struct ndpi_flow_struct *flow)
 {
   ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_TEAMSPEAK, NDPI_PROTOCOL_UNKNOWN);
 }
-  u_int16_t tdport = 0, tsport = 0;
-  u_int16_t udport = 0, usport = 0;
 
 
 void ndpi_search_teamspeak(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
 {
-    struct ndpi_packet_struct *packet = &flow->packet;
+  struct ndpi_packet_struct *packet = &flow->packet;
 
-if (packet->udp != NULL) {
-  usport = ntohs(packet->udp->source), udport = ntohs(packet->udp->dest);
-  /* http://www.imfirewall.com/en/protocols/teamSpeak.htm  */
-  if (((usport == 9987 || udport == 9987) || (usport == 8767 || udport == 8767)) && packet->payload_packet_len >= 20) {
-     NDPI_LOG(NDPI_PROTOCOL_TEAMSPEAK, ndpi_struct, NDPI_LOG_DEBUG, "found TEAMSPEAK udp.\n");
-     ndpi_int_teamspeak_add_connection(ndpi_struct, flow);
+  NDPI_LOG_DBG(ndpi_struct, "search teamspeak\n");
+  
+  if (packet->udp != NULL) {
+    u_int16_t udport, usport;
+    usport = ntohs(packet->udp->source), udport = ntohs(packet->udp->dest);
+    /* http://www.imfirewall.com/en/protocols/teamSpeak.htm  */
+    if (((usport == 9987 || udport == 9987) || (usport == 8767 || udport == 8767)) && packet->payload_packet_len >= 20) {
+       NDPI_LOG_INFO(ndpi_struct, "found TEAMSPEAK udp\n");
+       ndpi_int_teamspeak_add_connection(ndpi_struct, flow);
+    }
   }
-}
-else if (packet->tcp != NULL) {
-  tsport = ntohs(packet->tcp->source), tdport = ntohs(packet->tcp->dest);
+  else if (packet->tcp != NULL) {
+    u_int16_t tdport, tsport;
+    tsport = ntohs(packet->tcp->source), tdport = ntohs(packet->tcp->dest);
   /* https://github.com/Youx/soliloque-server/wiki/Connection-packet */
   if(packet->payload_packet_len >= 20) {
     if (((memcmp(packet->payload, "\xf4\xbe\x03\x00", 4) == 0)) ||
           ((memcmp(packet->payload, "\xf4\xbe\x02\x00", 4) == 0)) ||
             ((memcmp(packet->payload, "\xf4\xbe\x01\x00", 4) == 0))) {
-     NDPI_LOG(NDPI_PROTOCOL_TEAMSPEAK, ndpi_struct, NDPI_LOG_DEBUG, "found TEAMSPEAK tcp.\n");
+     NDPI_LOG_INFO(ndpi_struct, "found TEAMSPEAK tcp\n");
      ndpi_int_teamspeak_add_connection(ndpi_struct, flow);
     }  /* http://www.imfirewall.com/en/protocols/teamSpeak.htm  */
   } else if ((tsport == 14534 || tdport == 14534) || (tsport == 51234 || tdport == 51234)) {
-     NDPI_LOG(NDPI_PROTOCOL_TEAMSPEAK, ndpi_struct, NDPI_LOG_DEBUG, "found TEAMSPEAK.\n");
+     NDPI_LOG_INFO(ndpi_struct, "found TEAMSPEAK\n");
      ndpi_int_teamspeak_add_connection(ndpi_struct, flow);
    }
   }
-  NDPI_LOG(NDPI_PROTOCOL_TEAMSPEAK, ndpi_struct, NDPI_LOG_DEBUG, "TEAMSPEAK excluded.\n");
-  NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_PROTOCOL_TEAMSPEAK);
+  NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
   return;
 }