Remove Google Hangouts/Duo stuff (#2233)
* Remove Google Hangouts/Duo support * Update protocols.rst
This commit is contained in:
@@ -229,7 +229,7 @@ typedef enum {
|
||||
NDPI_PROTOCOL_MPEGTS = 198,
|
||||
NDPI_PROTOCOL_SNAPCHAT = 199,
|
||||
NDPI_PROTOCOL_SINA = 200,
|
||||
NDPI_PROTOCOL_HANGOUT_DUO = 201, /* Google Hangout ad Duo (merged as they are very similar) */
|
||||
NDPI_PROTOCOL_GOOGLE_MEET = 201,
|
||||
NDPI_PROTOCOL_IFLIX = 202,
|
||||
NDPI_PROTOCOL_GITHUB = 203,
|
||||
NDPI_PROTOCOL_BJNP = 204,
|
||||
|
||||
@@ -608,8 +608,8 @@ static ndpi_protocol_match host_match[] =
|
||||
{ "app-measurement.com", "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
{ ".app-measurement.com", "Google", NDPI_PROTOCOL_GOOGLE, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
|
||||
/* Google Hangout */
|
||||
{ "images2-hangout-opensocial.googleusercontent.com", "GoogleHangout", NDPI_PROTOCOL_HANGOUT_DUO, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
/* Google Meet */
|
||||
{ "meet.google.com", "GoogleMeet", NDPI_PROTOCOL_GOOGLE_MEET, NDPI_PROTOCOL_CATEGORY_CHAT, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
|
||||
/* Google Services */
|
||||
{ "googleapis.com", "GoogleServices", NDPI_PROTOCOL_GOOGLE_SERVICES, NDPI_PROTOCOL_CATEGORY_WEB, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_DEFAULT_LEVEL },
|
||||
@@ -1573,7 +1573,6 @@ static ndpi_tls_cert_name_match tls_certificate_match [] = {
|
||||
{ "O=Riot Games Inc", NDPI_PROTOCOL_RIOTGAMES },
|
||||
{ "O=NoMachine", NDPI_PROTOCOL_NOMACHINE },
|
||||
|
||||
{ "CN=hangouts", NDPI_PROTOCOL_HANGOUT_DUO },
|
||||
{ "CN=Snapchat Inc.", NDPI_PROTOCOL_SNAPCHAT_CALL },
|
||||
{ "CN=NVIDIA GameStream", NDPI_PROTOCOL_GEFORCENOW },
|
||||
|
||||
|
||||
+2
-2
@@ -1770,8 +1770,8 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
|
||||
"DRDA", NDPI_PROTOCOL_CATEGORY_DATABASE,
|
||||
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_str, 0 /* encrypted */, 1 /* app proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_HANGOUT_DUO,
|
||||
"GoogleHangoutDuo", NDPI_PROTOCOL_CATEGORY_VOIP,
|
||||
ndpi_set_proto_defaults(ndpi_str, 0 /* encrypted */, 1 /* app proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_GOOGLE_MEET,
|
||||
"GoogleMeet", NDPI_PROTOCOL_CATEGORY_VOIP,
|
||||
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_str, 1 /* cleartext */, 0 /* nw proto */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_BJNP,
|
||||
|
||||
@@ -274,7 +274,7 @@ int is_stun(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
NDPI_LOG_DBG(ndpi_struct, "Realm [%s]\n", flow->host_server_name);
|
||||
|
||||
if(strstr(flow->host_server_name, "google.com") != NULL) {
|
||||
*app_proto = NDPI_PROTOCOL_HANGOUT_DUO;
|
||||
*app_proto = NDPI_PROTOCOL_GOOGLE_MEET;
|
||||
return 1;
|
||||
} else if(strstr(flow->host_server_name, "whispersystems.org") != NULL ||
|
||||
strstr(flow->host_server_name, "signal.org") != NULL) {
|
||||
@@ -307,7 +307,7 @@ int is_stun(struct ndpi_detection_module_struct *ndpi_struct,
|
||||
return 1;
|
||||
|
||||
case 0xFF03:
|
||||
*app_proto = NDPI_PROTOCOL_HANGOUT_DUO;
|
||||
*app_proto = NDPI_PROTOCOL_GOOGLE_MEET;
|
||||
return 1;
|
||||
|
||||
case 0x0013:
|
||||
@@ -582,7 +582,7 @@ static void ndpi_int_stun_add_connection(struct ndpi_detection_module_struct *nd
|
||||
memcmp(&flow->c_address.v6, &pref2, sizeof(pref2)) == 0 ||
|
||||
memcmp(&flow->s_address.v6, &pref1, sizeof(pref1)) == 0 ||
|
||||
memcmp(&flow->s_address.v6, &pref2, sizeof(pref2)) == 0) {
|
||||
app_proto = NDPI_PROTOCOL_HANGOUT_DUO;
|
||||
app_proto = NDPI_PROTOCOL_GOOGLE_MEET;
|
||||
}
|
||||
} else {
|
||||
u_int32_t c_address, s_address;
|
||||
@@ -593,7 +593,7 @@ static void ndpi_int_stun_add_connection(struct ndpi_detection_module_struct *nd
|
||||
(c_address & 0xFFFFFF00) == 0x8efa5200 || /* 142.250.82.0/24 */
|
||||
(s_address & 0xFFFFFF00) == 0x4a7dfa00 ||
|
||||
(s_address & 0xFFFFFF00) == 0x8efa5200) {
|
||||
app_proto = NDPI_PROTOCOL_HANGOUT_DUO;
|
||||
app_proto = NDPI_PROTOCOL_GOOGLE_MEET;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user