Implemented GooglePlus support that replaced ancient Quake protocol now obsolete

4 files changed, 2 insertions, 115 deletions

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 7db19f818..410a50f21 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -104,7 +104,6 @@ libndpi_la_SOURCES = ndpi_content_match.c.inc \
 		     protocols/ppstream.c \
 		     protocols/pptp.c \
 		     protocols/qq.c \
-		     protocols/quake.c \
 		     protocols/quic.c \
 		     protocols/radius.c \
 		     protocols/rdp.c \
diff --git a/src/lib/ndpi_content_match.c.inc b/src/lib/ndpi_content_match.c.inc
index 7c3856068..e306efae9 100644
--- a/src/lib/ndpi_content_match.c.inc
+++ b/src/lib/ndpi_content_match.c.inc
@@ -8078,6 +8078,8 @@ ndpi_protocol_match host_match[] = {
   { "android.clients.google.com",   "PlayStore",    NDPI_PROTOCOL_PLAYSTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
   { "ggpht.com",                    "PlayStore",    NDPI_PROTOCOL_PLAYSTORE, NDPI_PROTOCOL_CATEGORY_SW_UPDATE, NDPI_PROTOCOL_SAFE },
 
+  { "plus.google.com",          "GooglePlus",       NDPI_PROTOCOL_GOOGLE_PLUS, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
+  { "plus.url.google.com",      "GooglePlus",       NDPI_PROTOCOL_GOOGLE_PLUS, NDPI_PROTOCOL_CATEGORY_SOCIAL_NETWORK, NDPI_PROTOCOL_FUN },
   { "google.",                  "Google",           NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
   { ".google.",                 "Google",           NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
   { ".gstatic.com",             "Google",           NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_SAFE },
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index 0288c3e9f..5d9061465 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -1132,11 +1132,6 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
 			    no_master, "BattleField", NDPI_PROTOCOL_CATEGORY_GAME,
 			    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_FUN, NDPI_PROTOCOL_QUAKE,
-			    no_master,
-			    no_master, "Quake", NDPI_PROTOCOL_CATEGORY_GAME,
-			    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_PROTOCOL_IP_VRRP,
 			    no_master,
 			    no_master, "VRRP", NDPI_PROTOCOL_CATEGORY_NETWORK,
@@ -2575,9 +2570,6 @@ void ndpi_set_protocol_detection_bitmask2(struct ndpi_detection_module_struct *n
   /* BGP */
   init_bgp_dissector(ndpi_struct, &a, detection_bitmask);
 
-  /* QUAKE */
-  init_quake_dissector(ndpi_struct, &a, detection_bitmask);
-
   /* BATTLEFIELD */
   init_battlefield_dissector(ndpi_struct, &a, detection_bitmask);
 
diff --git a/src/lib/protocols/quake.c b/src/lib/protocols/quake.c
deleted file mode 100644
index 6f00c4296..000000000
--- a/src/lib/protocols/quake.c
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * quake.c
- *
- * Copyright (C) 2009-2011 by ipoque GmbH
- * Copyright (C) 2011-15 - ntop.org
- *
- * This file is part of nDPI, an open source deep packet inspection
- * library based on the OpenDPI and PACE technology by ipoque GmbH
- *
- * nDPI 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.
- *
- * nDPI 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
- * along with nDPI.  If not, see <http://www.gnu.org/licenses/>.
- * 
- */
-
-#include "ndpi_protocol_ids.h"
-
-#ifdef NDPI_PROTOCOL_QUAKE
-
-#define NDPI_CURRENT_PROTO NDPI_PROTOCOL_QUAKE
-
-#include "ndpi_api.h"
-
-
-static void ndpi_int_quake_add_connection(struct ndpi_detection_module_struct
-											*ndpi_struct, struct ndpi_flow_struct *flow)
-{
-  ndpi_set_detected_protocol(ndpi_struct, flow, NDPI_PROTOCOL_QUAKE, NDPI_PROTOCOL_UNKNOWN);
-}
-
-void ndpi_search_quake(struct ndpi_detection_module_struct *ndpi_struct, struct ndpi_flow_struct *flow)
-{
-	struct ndpi_packet_struct *packet = &flow->packet;
-
-	NDPI_LOG_DBG(ndpi_struct, "search Quake\n");
-	
-	if ((packet->payload_packet_len == 14
-		 && get_u_int16_t(packet->payload, 0) == 0xffff && memcmp(&packet->payload[2], "getInfo", 7) == 0)
-		|| (packet->payload_packet_len == 17
-			&& get_u_int16_t(packet->payload, 0) == 0xffff && memcmp(&packet->payload[2], "challenge", 9) == 0)
-		|| (packet->payload_packet_len > 20
-			&& packet->payload_packet_len < 30
-			&& get_u_int16_t(packet->payload, 0) == 0xffff && memcmp(&packet->payload[2], "getServers", 10) == 0)) {
-		NDPI_LOG_INFO(ndpi_struct, "found Quake IV\n");
-		ndpi_int_quake_add_connection(ndpi_struct, flow);
-		return;
-	}
-
-	/* Quake III/Quake Live */
-	if (packet->payload_packet_len == 15 && get_u_int32_t(packet->payload, 0) == 0xffffffff
-		&& memcmp(&packet->payload[4], "getinfo", NDPI_STATICSTRING_LEN("getinfo")) == 0) {
-		NDPI_LOG_INFO(ndpi_struct, "found Quake III Arena/Quake Live\n");
-		ndpi_int_quake_add_connection(ndpi_struct, flow);
-		return;
-	}
-	if (packet->payload_packet_len == 16 && get_u_int32_t(packet->payload, 0) == 0xffffffff
-		&& memcmp(&packet->payload[4], "getchallenge", NDPI_STATICSTRING_LEN("getchallenge")) == 0) {
-		NDPI_LOG_INFO(ndpi_struct, "found Quake III Arena/Quake Live\n");
-		ndpi_int_quake_add_connection(ndpi_struct, flow);
-		return;
-	}
-	if (packet->payload_packet_len > 20 && packet->payload_packet_len < 30
-		&& get_u_int32_t(packet->payload, 0) == 0xffffffff
-		&& memcmp(&packet->payload[4], "getservers", NDPI_STATICSTRING_LEN("getservers")) == 0) {
-		NDPI_LOG_INFO(ndpi_struct, "found Quake III Arena/Quake Live\n");
-		ndpi_int_quake_add_connection(ndpi_struct, flow);
-		return;
-	}
-
-
-
-	/* ports for startup packet:
-	   Quake I        26000 (starts with 0x8000)
-	   Quake II       27910
-	   Quake III      27960 (increases with each player)
-	   Quake IV       27650
-	   Quake World    27500
-	   Quake Wars     ?????
-	 */
-
-	NDPI_EXCLUDE_PROTO(ndpi_struct, flow);
-}
-
-
-void init_quake_dissector(struct ndpi_detection_module_struct *ndpi_struct, u_int32_t *id, NDPI_PROTOCOL_BITMASK *detection_bitmask)
-{
-  ndpi_set_bitmask_protocol_detection("Quake", ndpi_struct, detection_bitmask, *id,
-				      NDPI_PROTOCOL_QUAKE,
-				      ndpi_search_quake,
-				      NDPI_SELECTION_BITMASK_PROTOCOL_V4_V6_UDP_WITH_PAYLOAD,
-				      SAVE_DETECTION_BITMASK_AS_UNKNOWN,
-				      ADD_TO_DETECTION_BITMASK);
-
-  *id += 1;
-}
-
-#endif