Remove Playstation VUE protocol (#1426)

PS VUE service has been discontinued on January 30, 2020
https://en.wikipedia.org/wiki/PlayStation_Vue

5 files changed, 3 insertions, 52 deletions

diff --git a/src/include/ndpi_protocol_ids.h b/src/include/ndpi_protocol_ids.h
index 186262f9f..5ad8083b6 100644
--- a/src/include/ndpi_protocol_ids.h
+++ b/src/include/ndpi_protocol_ids.h
@@ -92,7 +92,7 @@ typedef enum {
   NDPI_PROTOCOL_QQLIVE                = 61,
   NDPI_PROTOCOL_THUNDER               = 62,
   NDPI_PROTOCOL_OCSP                  = 63,
-  NDPI_PROTOCOL_PS_VUE                = 64,
+  NDPI_PROTOCOL_FREE_64               = 64, /* FREE */
   NDPI_PROTOCOL_IRC                   = 65,
   NDPI_PROTOCOL_AYIYA                 = 66,
   NDPI_PROTOCOL_JABBER                = 67,
diff --git a/src/lib/ndpi_content_match.c.inc b/src/lib/ndpi_content_match.c.inc
index 2ac3a4780..8e6eb86ba 100644
--- a/src/lib/ndpi_content_match.c.inc
+++ b/src/lib/ndpi_content_match.c.inc
@@ -9121,37 +9121,6 @@ static ndpi_network host_protocol_list[] = {
   { 0xDD7A5980 /* 221.122.89.128/25 */, 25, NDPI_PROTOCOL_ZOOM },
   /* 2620:123:2000::/44 IPV6 */
 
-  /* PS_VUE IP address */
-  { 0x08F8DA14 /* 8.248.218.20/32 */, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0x08FA6E14 /* 8.250.110.20/32 */, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0x08FC028B /* 8.252.2.139/32 */, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0x08FD6803 /* 8.253.104.3/32 */, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0x08FE6813 /* 8.253.104.19/32 */, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0x08FE8C0F /* 8.253.140.15/32 */, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0x08FE8C10 /* 8.253.140.16/32 */, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0x08FE8C77 /* 8.253.140.119/32 */, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0x08FC8CA8 /* 8.253.140.168/32 */, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0x08FC8CA9 /* 8.253.140.169/32 */, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0x4318881E /* 67.24.136.30/32   */, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0x431889FE /* 67.24.137.254/32  */, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0x43188DFE /* 67.24.141.254/32  */, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0x43188E1E /* 67.24.142.30/32   */, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0x4318901E /* 67.24.144.30/32   */, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0x4318921E /* 67.24.146.30/32   */, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0x43189630 /* 67.24.150.30/32   */, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0xA2D83A20 /* 162.216.58.32/32  */, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0xA2D83A2B /* 162.216.58.43/32  */, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0xA2D83A39 /* 162.216.58.57/32  */, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0xA2D83A40 /* 162.216.58.64/32  */, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0xA2D83A48 /* 162.216.58.72/32  */, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0xA2D83A51 /* 162.216.58.81/32  */, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0xA7CE74AA /* 167.206.116.170/32*/, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0xA7CEDA60 /* 167.206.218.96/32 */, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0xA7CEDA72 /* 167.206.218.114/32*/, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0xA7CEDA7B /* 167.206.218.123/32*/, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0xA7CEDA82 /* 167.206.218.130/32*/, 32, NDPI_PROTOCOL_PS_VUE },
-  { 0xA7CEDA8A /* 167.206.218.138/32*/, 32, NDPI_PROTOCOL_PS_VUE },
-
   /* Bloomberg */
   { 0xD086A100 /* 208.134.161.0/24 */, 24, NDPI_PROTOCOL_BLOOMBERG },
   { 0xCDB7F600 /* 205.183.246.0/24 */, 24, NDPI_PROTOCOL_BLOOMBERG },
diff --git a/src/lib/ndpi_main.c b/src/lib/ndpi_main.c
index 6c4b31499..200486bf0 100644
--- a/src/lib/ndpi_main.c
+++ b/src/lib/ndpi_main.c
@@ -1168,8 +1168,8 @@ static void ndpi_init_protocol_defaults(struct ndpi_detection_module_struct *ndp
 			  "OCSP", NDPI_PROTOCOL_CATEGORY_NETWORK,
 			  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 */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_PS_VUE,
-			  "PS_VUE", NDPI_PROTOCOL_CATEGORY_VIDEO,
+  ndpi_set_proto_defaults(ndpi_str, 1 /* cleartext */, NDPI_PROTOCOL_ACCEPTABLE, NDPI_PROTOCOL_FREE_64,
+			  "FREE_64", NDPI_PROTOCOL_CATEGORY_VIDEO,
 			  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 */, NDPI_PROTOCOL_UNSAFE, NDPI_PROTOCOL_IRC,
diff --git a/tests/pcap/ps_vue.pcap b/tests/pcap/ps_vue.pcap
deleted file mode 100644
index 242e63dd1..000000000
--- a/tests/pcap/ps_vue.pcap
+++ /dev/null
diff --git a/tests/result/ps_vue.pcap.out b/tests/result/ps_vue.pcap.out
deleted file mode 100644
index 84dcff2fd..000000000
--- a/tests/result/ps_vue.pcap.out
+++ /dev/null
@@ -1,18 +0,0 @@
-Guessed flow protos:	8
-
-DPI Packets (TCP):	97	(12.12 pkts/flow)
-Confidence Match by port    : 5 (flows)
-Confidence Match by IP      : 3 (flows)
-
-PS_VUE	1724	2198169	1
-TLS	11	1401	5
-AmazonAWS	5	1380	2
-
-	1	TCP 8.252.2.139:80 -> 192.168.1.132:59198 [proto: 7.64/HTTP.PS_VUE][ClearText][Confidence: Match by IP][cat: Video/26][1724 pkts/2198169 bytes -> 0 pkts/0 bytes][Goodput ratio: 96/0][16.15 sec][bytes ratio: 1.000 (Upload)][IAT c2s/s2c min/avg/max/stddev: 0/0 9/0 1184/0 56/0][Pkt Len c2s/s2c min/avg/max/stddev: 54/0 1275/0 1372/0 336/0][PLAIN TEXT (ovwuGc)][Plen Bins: 5,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,3,91,0,0,0,0,0,0]
-	2	TCP 13.33.255.96:443 -> 192.168.1.132:55076 [proto: 91.265/TLS.AmazonAWS][Encrypted][Confidence: Match by IP][cat: Cloud/13][4 pkts/1294 bytes -> 0 pkts/0 bytes][Goodput ratio: 83/0][10.18 sec][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
-	3	TCP 63.140.57.73:443 -> 192.168.1.132:61267 [proto: 91/TLS][Encrypted][Confidence: Match by port][cat: Web/5][2 pkts/791 bytes -> 0 pkts/0 bytes][Goodput ratio: 86/0][0.02 sec][Plen Bins: 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
-	4	TCP 209.102.209.13:443 -> 192.168.1.132:65112 [proto: 91/TLS][Encrypted][Confidence: Match by port][cat: Web/5][3 pkts/193 bytes -> 0 pkts/0 bytes][Goodput ratio: 16/0][8.00 sec][Plen Bins: 100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
-	5	TCP 23.57.89.123:443 -> 192.168.1.132:52217 [proto: 91/TLS][Encrypted][Confidence: Match by port][cat: Web/5][2 pkts/139 bytes -> 0 pkts/0 bytes][Goodput ratio: 22/0][< 1 sec][Plen Bins: 100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
-	6	TCP 23.57.89.123:443 -> 192.168.1.132:55648 [proto: 91/TLS][Encrypted][Confidence: Match by port][cat: Web/5][2 pkts/139 bytes -> 0 pkts/0 bytes][Goodput ratio: 22/0][< 1 sec][Plen Bins: 100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
-	7	TCP 23.57.89.123:443 -> 192.168.1.132:62694 [proto: 91/TLS][Encrypted][Confidence: Match by port][cat: Web/5][2 pkts/139 bytes -> 0 pkts/0 bytes][Goodput ratio: 22/0][< 1 sec][Plen Bins: 100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]
-	8	TCP 34.217.165.102:443 -> 192.168.1.132:63577 [proto: 91.265/TLS.AmazonAWS][Encrypted][Confidence: Match by IP][cat: Cloud/13][1 pkts/86 bytes -> 0 pkts/0 bytes][Goodput ratio: 37/0][< 1 sec][Plen Bins: 0,100,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]