Implemented #228

5 files changed, 118 insertions, 1 deletions

diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h
index 13c2a007e..6b193531f 100644
--- a/src/include/ndpi_protocol_ids.h
+++ b/src/include/ndpi_protocol_ids.h
@@ -262,9 +262,10 @@
 #define NDPI_PROTOCOL_MQTT				208
 #define NDPI_PROTOCOL_RX 			        209
 #define NDPI_SERVICE_WEIBO                              210
+#define NDPI_SERVICE_HANGOUT                            215
 
 /* UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE UPDATE */
-#define NDPI_LAST_IMPLEMENTED_PROTOCOL			NDPI_PROTOCOL_UBNTAC2
+#define NDPI_LAST_IMPLEMENTED_PROTOCOL			NDPI_SERVICE_HANGOUT
 
 #define NDPI_MAX_SUPPORTED_PROTOCOLS                    (NDPI_LAST_IMPLEMENTED_PROTOCOL + 1)
 #define NDPI_MAX_NUM_CUSTOM_PROTOCOLS                   (NDPI_NUM_BITS-NDPI_LAST_IMPLEMENTED_PROTOCOL)
diff --git a/src/include/ndpi_protocols.h b/src/include/ndpi_protocols.h
index 82d5bdb69..12f3a0dbd 100644
--- a/src/include/ndpi_protocols.h
+++ b/src/include/ndpi_protocols.h
@@ -337,5 +337,6 @@ void init_coap_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int
 void init_mqtt_dissector (struct ndpi_detection_module_struct *ndpi_struct,u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
 void init_rx_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
 void init_git_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
+void init_hangout_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
 void init_drda_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask);
 #endif /* __NDPI_PROTOCOLS_H__ */
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 18c195dbe..3ba119d7d 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -51,6 +51,7 @@ libndpi_la_SOURCES = ndpi_content_match.c.inc \
 		     protocols/gnutella.c \
 		     protocols/gtp.c \
 		     protocols/guildwars.c \
+		     protocols/hangout.c \
 		     protocols/h323.c \
 		     protocols/halflife2_and_mods.c \
 		     protocols/hep.c \
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index f97a2fffc..203ce0c2c 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -1551,6 +1551,11 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
 			    no_master, "DRDA",
 			    ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0),       /* TCP */
 			    ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0));      /* UDP */
+    ndpi_set_proto_defaults(ndpi_mod, NDPI_PROTOCOL_ACCEPTABLE, NDPI_SERVICE_HANGOUT,
+			    no_master,
+			    no_master, "GoogleHangout",
+			    ndpi_build_default_ports(ports_a, 0, 0, 0, 0, 0) /* TCP */,
+			    ndpi_build_default_ports(ports_b, 0, 0, 0, 0, 0) /* UDP */);
     
 
     /* calling function for host and content matched protocols */
@@ -2567,6 +2572,9 @@ void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *n
   /* GIT */
   init_git_dissector(ndpi_struct, &a, detection_bitmask);
 
+  /* HANGOUT */
+  init_hangout_dissector(ndpi_struct, &a, detection_bitmask);
+
   /* DRDA */
   init_drda_dissector(ndpi_struct, &a, detection_bitmask);
   
diff --git a/src/lib/protocols/hangout.c b/src/lib/protocols/hangout.c
new file mode 100644
index 000000000..eb6566220
--- /dev/null
+++ b/src/lib/protocols/hangout.c
@@ -0,0 +1,106 @@
+/*
+ * git.c
+ *
+ * Copyright (C) 2012-16 - ntop.org
+ *
+ * This module is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This module is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License.
+ * If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+#include <stdlib.h>
+#include "ndpi_api.h"
+
+#ifdef NDPI_SERVICE_HANGOUT
+
+/* https://support.google.com/a/answer/1279090?hl=en */
+#define HANGOUT_UDP_LOW_PORT  19302
+#define HANGOUT_UDP_HIGH_PORT 19309
+#define HANGOUT_TCP_LOW_PORT  19305
+#define HANGOUT_TCP_HIGH_PORT 19309
+
+/* ***************************************************************** */
+
+static u_int8_t isHangoutUDPPort(u_int16_t port) {
+  if((port >= HANGOUT_UDP_LOW_PORT) && (port <= HANGOUT_UDP_HIGH_PORT))
+    return(1);
+  else
+    return(0);
+}
+
+/* ***************************************************************** */
+
+static u_int8_t isHangoutTCPPort(u_int16_t port) {
+  if((port >= HANGOUT_TCP_LOW_PORT) && (port <= HANGOUT_TCP_HIGH_PORT))
+    return(1);
+  else
+    return(0);
+}
+
+/* ******************************************* */
+
+static u_int8_t google_ptree_match(struct ndpi_detection_module_struct *ndpi_struct, struct in_addr *pin) {
+  return((ndpi_network_ptree_match(ndpi_struct, pin) == NDPI_SERVICE_GOOGLE) ? 1 : 0);
+}
+
+/* ******************************************* */
+
+static u_int8_t is_google_flow(struct ndpi_detection_module_struct *ndpi_struct,
+			       struct ndpi_flow_struct *flow) {
+  struct ndpi_packet_struct *packet = &flow->packet;
+  
+  if(packet->iph) {
+    if(google_ptree_match(ndpi_struct, (struct in_addr *)&packet->iph->saddr)
+       || google_ptree_match(ndpi_struct, (struct in_addr *)&packet->iph->daddr)) {
+      return(1);
+    }
+  }
+
+  return(0);
+}
+
+/* ***************************************************************** */
+
+void ndpi_search_hangout(struct ndpi_detection_module_struct *ndpi_struct,
+			 struct ndpi_flow_struct *flow) {
+  struct ndpi_packet_struct * packet = &flow->packet;
+
+  if((packet->payload_packet_len > 24) && is_google_flow(ndpi_struct, flow)) {
+    if(
+       ((packet->udp != NULL) && (isHangoutUDPPort(ntohs(packet->udp->source)) || isHangoutUDPPort(ntohs(packet->udp->dest))))
+       ||
+       ((packet->tcp != NULL) && (isHangoutTCPPort(ntohs(packet->tcp->source)) || isHangoutTCPPort(ntohs(packet->tcp->dest))))) {
+      NDPI_LOG(NDPI_SERVICE_HANGOUT, ndpi_struct, NDPI_LOG_DEBUG, "Found Hangout.\n");
+      ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_SERVICE_HANGOUT, NDPI_PROTOCOL_UNKNOWN);
+      return;
+    }
+  }
+  
+  NDPI_LOG(NDPI_SERVICE_HANGOUT, ndpi_struct, NDPI_LOG_DEBUG, "No Hangout.\n");
+  NDPI_ADD_PROTOCOL_TO_BITMASK(flow->excluded_protocol_bitmask, NDPI_SERVICE_HANGOUT);
+}
+
+/* ***************************************************************** */
+
+void init_hangout_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id,
+			    NDPI_PROTOCOL_BITMASK *detection_bitmask) {
+  ndpi_set_bitmask_protocol_detection("GoogleHangout", ndpi_struct, detection_bitmask, *id,
+				      NDPI_SERVICE_HANGOUT,
+				      ndpi_search_hangout,
+				      NDPI_SELECTION_BITMASK_PROTOCOL_TCP_OR_UDP,
+				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
+				      ADD_TO_DETECTION_BITMASK);
+
+  *id += 1;
+}
+
+#endif /* NDPI_SERVICE_HANGOUT */