From 5ae183874af434b70b0403bf9d72f2ac4e2f9fe1 Mon Sep 17 00:00:00 2001 From: stormy <120167078+stowmyy@users.noreply.github.com> Date: Wed, 28 Aug 2024 19:45:08 -0500 Subject: [PATCH] dropship: new ips --- dropship/src/DashboardManager.cpp | 277 +++++++++++++----------------- 1 file changed, 119 insertions(+), 158 deletions(-) diff --git a/dropship/src/DashboardManager.cpp b/dropship/src/DashboardManager.cpp index d66820d..57b83a0 100644 --- a/dropship/src/DashboardManager.cpp +++ b/dropship/src/DashboardManager.cpp @@ -84,65 +84,62 @@ DashboardManager::~DashboardManager() DashboardManager::DashboardManager() : ips({ - // USA - West - { "lax1", "24.105.8.0-24.105.15.255,34.124.0.0/21" }, - - // USA - Central - { "ord1", "24.105.40.0-24.105.47.255,64.224.0.0/21,8.34.210.0/24,8.34.212.0/22,8.34.216.0/22,8.35.192.0/21,23.236.48.0/20,23.251.144.0/20,34.16.0.0/17,34.27.0.0/16,34.28.0.0/14,34.66.0.0/15,34.68.0.0/14,34.72.0.0/16,34.118.200.0/21,34.121.0.0/16,34.122.0.0/15,34.132.0.0/14,34.136.0.0/16,34.157.84.0/23,34.157.96.0/20,34.157.212.0/23,34.157.224.0/20,34.170.0.0/15,34.172.0.0/15,35.184.0.0/16,35.188.0.0/17,35.188.128.0/18,35.188.192.0/19,35.192.0.0/15,35.194.0.0/18,35.202.0.0/16,35.206.64.0/18,35.208.0.0/15,35.220.64.0/19,35.222.0.0/15,35.224.0.0/15,35.226.0.0/16,35.232.0.0/16,35.238.0.0/15,35.242.96.0/19,104.154.16.0/20,104.154.32.0/19,104.154.64.0/19,104.154.96.0/20,104.154.113.0/24,104.154.114.0/23,104.154.116.0/22,104.154.120.0/23,104.154.128.0/17,104.155.128.0/18,104.197.0.0/16,104.198.16.0/20,104.198.32.0/19,104.198.64.0/20,104.198.128.0/17,107.178.208.0/20,108.59.80.0/21,130.211.112.0/20,130.211.128.0/18,130.211.192.0/19,130.211.224.0/20,146.148.32.0/19,146.148.64.0/19,146.148.96.0/20,162.222.176.0/21,173.255.112.0/21,199.192.115.0/24,199.223.232.0/22,199.223.236.0/24,34.22.0.0/19,35.186.0.0/17,35.186.128.0/20,35.206.32.0/19,35.220.46.0/24,35.242.46.0/24,107.167.160.0/20,108.59.88.0/21,173.255.120.0/21" }, - - // USA - West 2 - { "guw2", "35.247.0.0/17,35.236.0.0/17,35.235.64.0/18,34.102.0.0/17,34.94.0.0/16,34.19.0.0/17,34.82.0.0/15,34.105.0.0/17,34.118.192.0/21,34.127.0.0/17,34.145.0.0/17,34.157.112.0/21,34.157.240.0/21,34.168.0.0/15,35.185.192.0/18,35.197.0.0/17,35.199.144.0/20,35.199.160.0/19,35.203.128.0/18,35.212.128.0/17,35.220.48.0/21,35.227.128.0/18,35.230.0.0/17,35.233.128.0/17,35.242.48.0/21,35.243.32.0/21,35.247.0.0/17,104.196.224.0/19,104.198.0.0/20,104.198.96.0/20,104.199.112.0/20,34.20.128.0/17,34.94.0.0/16,34.102.0.0/17,34.104.64.0/21,34.108.0.0/16,34.118.248.0/23,35.215.64.0/18,35.220.47.0/24,35.235.64.0/18,35.236.0.0/17,35.242.47.0/24,35.243.0.0/21,34.22.32.0/19,34.104.52.0/24,34.106.0.0/16,34.127.180.0/24,35.217.64.0/18,35.220.31.0/24,35.242.31.0/24,34.16.128.0/17,34.104.72.0/22,34.118.240.0/22,34.124.8.0/22,34.125.0.0/16,35.219.128.0/18,34.124.0.0/21" }, - - // USA - Southwest (las vegas) - { "las1", "64.224.24.0/23" }, - - // USA - East 2 - { "gue4", "104.196.0.0/18,104.196.128.0/18,104.196.192.0/19,104.196.65.0/24,104.196.66.0/23,104.196.68.0/22,104.196.96.0/19,162.216.148.0/22,34.104.124.0/23,34.104.56.0/23,34.104.60.0/23,34.118.250.0/23,34.118.252.0/23,34.124.60.0/23,34.127.184.0/23,34.127.188.0/23,34.138.0.0/15,34.145.128.0-34.145.255.255,34.145.128.0/17,34.148.0.0/16,34.150.128.0-34.150.255.255,34.150.128.0/17,34.157.0.0/21,34.157.128.0/21,34.157.144.0/20,34.157.16.0/20,34.157.160.0/22,34.157.32.0/22,34.161.0.0/16,34.162.0.0/16,34.21.0.0/17,34.23.0.0/16,34.24.0.0/15,34.26.0.0/16,34.73.0.0/16,34.74.0.0/15,34.85.128.0-34.85.255.255,34.85.128.0/17,34.86.0.0-34.86.255.255,34.86.0.0/16,34.98.128.0/21,35.185.0.0/17,35.186.160.0-35.186.191.255,35.186.160.0/19,35.188.224.0/19,35.190.128.0/18,35.194.64.0/19,35.196.0.0/16,35.199.0.0-35.199.63.255,35.199.0.0/18,35.206.10.0/23,35.207.0.0/18,35.211.0.0/16,35.212.0.0/17,35.220.0.0/20,35.220.60.0/22,35.221.0.0/18,35.227.0.0/17,35.229.16.0/20,35.229.32.0/19,35.229.64.0/18,35.230.160.0/19,35.231.0.0/16,35.234.176.0/20,35.236.192.0-35.236.255.255,35.236.192.0/18,35.237.0.0/16,35.242.0.0/20,35.242.60.0/22,35.243.128.0/17,35.243.40.0/21,35.245.0.0-35.245.255.255,35.245.0.0/16,34.152.72.0/21,34.177.40.0/21" }, - - // Netherlands - { "ams1", "5.42.168.0-5.42.175.255,64.224.26.0/23" }, - - // France - { "cdg1", "5.42.184.0-5.42.191.255" }, - - // Finland - { "gen1", "34.88.0.0/16,34.104.96.0/21,34.124.32.0/21,35.203.232.0/21,35.217.0.0/18,35.220.26.0/24,35.228.0.0/16,35.242.26.0/24" }, - - // Brazil 2 - { "gbr1", "34.95.128.0/17,34.104.80.0/21,34.124.16.0/21,34.151.0.0/18,34.151.192.0/18,35.198.0.0/18,35.199.64.0/18,35.215.192.0/18,35.220.40.0/24,35.235.0.0/20,35.242.40.0/24,35.247.192.0/18,34.104.50.0/23,34.127.178.0/23,34.176.0.0/16" }, - - // Japan 2 - { "gtk1", "34.85.0.0-34.85.127.255,34.84.0.0-34.84.255.255,35.190.224.0-35.190.239.255,35.194.96.0-35.194.255.255,35.221.64.0-35.221.255.255,34.146.0.0-34.146.255.255,34.84.0.0/16,34.85.0.0/17,34.104.62.0/23,34.104.128.0/17,34.127.190.0/23,34.146.0.0/16,34.157.64.0/20,34.157.164.0/22,34.157.192.0/20,35.187.192.0/19,35.189.128.0/19,35.190.224.0/20,35.194.96.0/19,35.200.0.0/17,35.213.0.0/17,35.220.56.0/22,35.221.64.0/18,35.230.240.0/20,35.242.56.0/22,35.243.64.0/18,104.198.80.0/20,104.198.112.0/20,34.97.0.0/16,34.104.49.0/24,34.127.177.0/24,35.217.128.0/17,35.220.45.0/24,35.242.45.0/24,35.243.56.0/21" }, - - // Singapore 2 - { "gsg1", "34.124.0.0-34.124.255.255,34.124.42.0-34.124.43.255,34.142.128.0-34.142.255.255,35.185.176.0-35.185.191.255,35.186.144.0-35.186.159.255,35.247.128.0-35.247.191.255,34.87.0.0-34.87.191.255,34.143.128.0-34.143.255.255,34.124.128.0-34.124.255.255,34.126.64.0-34.126.191.255,35.240.128.0-35.240.255.255,35.198.192.0-35.198.255.255,34.21.128.0-34.21.255.255,34.104.58.0-34.104.59.255,34.124.41.0-34.124.42.255,34.157.82.0-34.157.83.255,34.157.88.0-34.157.89.255,34.157.210.0-34.157.211.255,35.187.224.0-35.187.255.255,35.197.128.0-35.197.159.255,35.213.128.0-35.213.191.255,35.220.24.0-35.220.25.255,35.234.192.0-35.234.207.255,35.242.24.0-35.242.25.255,34.126.128.0/18,34.87.128.0/18,34.21.128.0/17,34.87.0.0/17,34.87.128.0/18,34.104.58.0/23,34.104.106.0/23,34.124.42.0/23,34.124.128.0/17,34.126.64.0/18,34.126.128.0/18,34.142.128.0/17,34.143.128.0/17,34.157.82.0/23,34.157.88.0/23,34.157.210.0/23,35.185.176.0/20,35.186.144.0/20,35.187.224.0/19,35.197.128.0/19,35.198.192.0/18,35.213.128.0/18,35.220.24.0/23,35.234.192.0/20,35.240.128.0/17,35.242.24.0/23,35.247.128.0/18,34.101.18.0/24,34.101.20.0/22,34.101.24.0/22,34.101.32.0/19,34.101.64.0/18,34.101.128.0/17,34.128.64.0/18,35.219.0.0/17" }, - - // South Korea - { "icn1", "121.254.0.0-121.254.255.255,117.52.0.0-117.52.255.255,202.9.66.0/23" }, - - // South Korea 3 - { "gan3", "34.64.0.0-34.64.255.255,121.254.0.0-121.254.255.255,34.0.96.0/19,34.64.32.0/19,34.64.64.0/22,34.64.68.0/22,34.64.72.0/21,34.64.80.0/20,34.64.96.0/19,34.64.128.0/22,34.64.132.0/22,34.64.136.0/21,34.64.144.0/20,34.64.160.0/19,34.64.192.0/18,35.216.0.0/17,34.22.64.0/19,34.22.96.0/20" }, - - // Taiwan - { "tpe1", "5.42.160.0-5.42.160.255,35.221.128.0/17" }, - - // Dubai - { "gmec1", "34.1.32.0/20,34.18.0.0/16,34.157.126.0/23,34.157.252.0/23" }, - - // Australia 3 - { "syd2", "158.115.196.0/23,37.244.42.0-37.244.42.255,34.87.192.0/18,34.104.104.0/23,34.116.64.0/18,34.124.40.0/23,34.151.64.0/18,34.151.128.0/18,35.189.0.0/18,35.197.160.0/19,35.201.0.0/19,35.213.192.0/18,35.220.41.0/24,35.234.224.0/20,35.242.41.0/24,35.244.64.0/18,34.104.122.0/23,34.124.58.0/23,34.126.192.0/20,34.129.0.0/16,34.0.16.0/20" }, - - - // not tested - - - // Bahrain - { "mes1", "157.175.0.0-157.175.255.255,15.185.0.0-15.185.255.255,15.184.0.0-15.184.255.255,16.24.0.0/16" }, - - // Germany - { "gew3", "104.155.0.0/17,104.199.0.0/18,104.199.66.0/23,104.199.68.0/22,104.199.72.0/21,104.199.80.0/20,104.199.96.0/20,130.211.48.0/20,130.211.64.0/19,130.211.96.0/20,146.148.112.0/20,146.148.16.0/20,146.148.2.0/23,146.148.4.0/22,146.148.8.0/21,192.158.28.0/22,23.251.128.0/20,34.104.110.0/23,34.104.112.0/23,34.104.126.0/23,34.105.128.0/17,34.107.0.0/17,34.118.244.0/22,34.118.254.0/23,34.124.46.0/23,34.124.48.0/23,34.124.62.0/23,34.127.186.0/23,34.140.0.0/16,34.141.0.0/17,34.141.128.0/17,34.142.0.0/17,34.147.0.0/17,34.147.128.0/17,34.154.0.0/16,34.155.0.0/16,34.157.12.0/22,34.157.136.0/23,34.157.140.0/22,34.157.168.0/22,34.157.176.0/20,34.157.208.0/23,34.157.220.0/22,34.157.36.0/22,34.157.40.0/22,34.157.48.0/20,34.157.8.0/23,34.157.80.0/23,34.157.92.0/22,34.159.0.0/16,34.163.0.0/16,34.65.0.0/16,34.76.0.0/14,34.89.0.0/17,34.89.128.0/17,34.90.0.0/15,35.187.0.0/17,35.187.160.0/19,35.189.192.0/18,35.189.64.0/18,35.190.192.0/19,35.195.0.0/16,35.197.192.0/18,35.198.128.0/18,35.198.64.0/18,35.203.210.0/23,35.203.212.0/22,35.203.216.0/22,35.204.0.0/16,35.205.0.0/16,35.206.128.0/18,35.207.128.0/18,35.207.64.0/18,35.210.0.0/16,35.214.0.0/17,35.214.128.0/17,35.216.128.0/17,35.219.224.0/19,35.220.16.0/23,35.220.18.0/23,35.220.20.0/22,35.220.44.0/24,35.220.96.0/19,35.230.128.0/19,35.233.0.0/17,35.234.128.0/19,35.234.160.0/20,35.234.64.0/18,35.235.216.0/21,35.235.32.0/20,35.235.48.0/20,35.240.0.0/17,35.241.128.0/17,35.242.128.0/18,35.242.16.0/23,35.242.18.0/23,35.242.192.0/18,35.242.20.0/22,35.242.44.0/24,35.242.64.0/19,35.246.0.0/17,35.246.128.0/17,5.42.168.0-5.42.175.255,5.42.184.0-5.42.191.255,8.34.208.0/23,8.34.211.0/24,8.34.220.0/22,34.22.128.0/17,34.104.116.0/22,34.116.128.0/17,34.118.0.0/17,34.124.52.0/22,34.157.44.0/23,34.157.172.0/23,34.164.0.0/16,34.175.0.0/16,34.22.112.0/20,34.17.0.0/16,34.157.124.0/23,34.157.250.0/23,34.0.160.0/19,34.157.121.0/24,34.157.249.0/24" }, - - { "gue4", "104.196.0.0/18,104.196.128.0/18,104.196.192.0/19,104.196.65.0/24,104.196.66.0/23,104.196.68.0/22,104.196.96.0/19,162.216.148.0/22,34.104.124.0/23,34.104.56.0/23,34.104.60.0/23,34.118.250.0/23,34.118.252.0/23,34.124.60.0/23,34.127.184.0/23,34.127.188.0/23,34.138.0.0/15,34.145.128.0-34.145.255.255,34.145.128.0/17,34.148.0.0/16,34.150.128.0-34.150.255.255,34.150.128.0/17,34.157.0.0/21,34.157.128.0/21,34.157.144.0/20,34.157.16.0/20,34.157.160.0/22,34.157.32.0/22,34.161.0.0/16,34.162.0.0/16,34.21.0.0/17,34.23.0.0/16,34.24.0.0/15,34.26.0.0/16,34.73.0.0/16,34.74.0.0/15,34.85.128.0-34.85.255.255,34.85.128.0/17,34.86.0.0-34.86.255.255,34.86.0.0/16,34.98.128.0/21,35.185.0.0/17,35.186.160.0-35.186.191.255,35.186.160.0/19,35.188.224.0/19,35.190.128.0/18,35.194.64.0/19,35.196.0.0/16,35.199.0.0-35.199.63.255,35.199.0.0/18,35.206.10.0/23,35.207.0.0/18,35.211.0.0/16,35.212.0.0/17,35.220.0.0/20,35.220.60.0/22,35.221.0.0/18,35.227.0.0/17,35.229.16.0/20,35.229.32.0/19,35.229.64.0/18,35.230.160.0/19,35.231.0.0/16,35.234.176.0/20,35.236.192.0-35.236.255.255,35.236.192.0/18,35.237.0.0/16,35.242.0.0/20,35.242.60.0/22,35.243.128.0/17,35.243.40.0/21,35.245.0.0-35.245.255.255,35.245.0.0/16,34.152.72.0/21,34.177.40.0/21" }, + + + // https://github.com/foryVERX/Overwatch-Server-Selector/blob/main/ip_lists/Ip_ranges_NA_central.txt + { "na/central", "24.105.40.0-24.105.47.255,64.224.0.0/21,8.34.210.0/24,8.34.212.0/22,8.34.216.0/22,8.35.192.0/21,23.236.48.0/20,23.251.144.0/20,34.0.225.0/24,34.16.0.0/17,34.27.0.0/16,34.28.0.0/14,34.33.0.0/16,34.41.0.0/16,34.42.0.0/16,34.44.0.0/15,34.46.0.0/16,34.66.0.0/15,34.68.0.0/14,34.72.0.0/16,34.118.200.0/21,34.121.0.0/16,34.122.0.0/15,34.128.32.0/22,34.132.0.0/14,34.136.0.0/16,34.153.48.0/21,34.153.240.0/21,34.157.84.0/23,34.157.96.0/20,34.157.212.0/23,34.157.224.0/20,34.170.0.0/15,34.172.0.0/15,34.177.52.0/22,35.184.0.0/16,35.188.0.0/17,35.188.128.0/18,35.188.192.0/19,35.192.0.0/15,35.194.0.0/18,35.202.0.0/16,35.206.64.0/18,35.208.0.0/15,35.220.64.0/19,35.222.0.0/15,35.224.0.0/15,35.226.0.0/16,35.232.0.0/16,35.238.0.0/15,35.242.96.0/19,104.154.16.0/20,104.154.32.0/19,104.154.64.0/19,104.154.96.0/20,104.154.113.0/24,104.154.114.0/23,104.154.116.0/22,104.154.120.0/23,104.154.128.0/17,104.155.128.0/18,104.197.0.0/16,104.198.16.0/20,104.198.32.0/19,104.198.64.0/20,104.198.128.0/17,107.178.208.0/20,108.59.80.0/21,130.211.112.0/20,130.211.128.0/18,130.211.192.0/19,130.211.224.0/20,146.148.32.0/19,146.148.64.0/19,146.148.96.0/20,162.222.176.0/21,173.255.112.0/21,199.192.115.0/24,199.223.232.0/22,199.223.236.0/24,34.22.0.0/19,35.186.0.0/17,35.186.128.0/20,35.206.32.0/19,35.220.46.0/24,35.242.46.0/24,107.167.160.0/20,108.59.88.0/21,173.255.120.0/21" }, + + // https://github.com/foryVERX/Overwatch-Server-Selector/blob/main/ip_lists/Ip_ranges_NA_West.txt + { "na/west", "64.224.24.0/23,24.105.8.0-24.105.15.255,35.247.0.0/17,35.236.0.0/17,35.235.64.0/18,34.102.0.0/17,34.94.0.0/16,34.19.0.0/17,34.82.0.0/15,34.105.0.0/17,34.118.192.0/21,34.127.0.0/17,34.145.0.0/17,34.157.112.0/21,34.157.240.0/21,34.168.0.0/15,35.185.192.0/18,35.197.0.0/17,35.199.144.0/20,35.199.160.0/19,35.203.128.0/18,35.212.128.0/17,35.220.48.0/21,35.227.128.0/18,35.230.0.0/17,35.233.128.0/17,35.242.48.0/21,35.243.32.0/21,35.247.0.0/17,104.196.224.0/19,104.198.0.0/20,104.198.96.0/20,104.199.112.0/20,34.20.128.0/17,34.94.0.0/16,34.102.0.0/17,34.104.64.0/21,34.108.0.0/16,34.118.248.0/23,35.215.64.0/18,35.220.47.0/24,35.235.64.0/18,35.236.0.0/17,35.242.47.0/24,35.243.0.0/21,34.22.32.0/19,34.104.52.0/24,34.106.0.0/16,34.127.180.0/24,35.217.64.0/18,35.220.31.0/24,35.242.31.0/24,34.16.128.0/17,34.104.72.0/22,34.118.240.0/22,34.124.8.0/22,34.125.0.0/16,35.219.128.0/18,34.124.0.0/21,34.37.0.0/16,34.128.46.0/23,34.128.62.0/23,34.53.0.0/17" }, + + // https://github.com/foryVERX/Overwatch-Server-Selector/blob/main/ip_lists/Ip_ranges_NA_East.txt + { "na/east", "34.124.0.0/21,35.236.192.0-35.236.255.255,35.199.0.0-35.199.63.255,34.86.0.0-34.86.255.255,35.245.0.0-35.245.255.255,35.186.160.0-35.186.191.255,34.145.128.0-34.145.255.255,34.150.128.0-34.150.255.255,34.85.128.0-34.85.255.255,34.23.0.0/16,34.24.0.0/15,34.26.0.0/16,34.73.0.0/16,34.74.0.0/15,34.98.128.0/21,34.118.250.0/23,34.138.0.0/15,34.148.0.0/16,35.185.0.0/17,35.190.128.0/18,35.196.0.0/16,35.207.0.0/18,35.211.0.0/16,35.220.0.0/20,35.227.0.0/17,35.229.16.0/20,35.229.32.0/19,35.229.64.0/18,35.231.0.0/16,35.237.0.0/16,35.242.0.0/20,35.243.128.0/17,104.196.0.0/18,104.196.65.0/24,104.196.66.0/23,104.196.68.0/22,104.196.96.0/19,104.196.128.0/18,104.196.192.0/19,162.216.148.0/22,34.21.0.0/17,34.85.128.0/17,34.86.0.0/16,34.104.60.0/23,34.104.124.0/23,34.118.252.0/23,34.124.60.0/23,34.127.188.0/23,34.145.128.0/17,34.150.128.0/17,34.157.0.0/21,34.157.16.0/20,34.157.128.0/21,34.157.144.0/20,35.186.160.0/19,35.188.224.0/19,35.194.64.0/19,35.199.0.0/18,35.212.0.0/17,35.220.60.0/22,35.221.0.0/18,35.230.160.0/19,35.234.176.0/20,35.236.192.0/18,35.242.60.0/22,35.243.40.0/21,35.245.0.0/16,34.157.32.0/22,34.157.160.0/22,34.162.0.0/16,34.104.56.0/23,34.127.184.0/23,34.161.0.0/16,35.206.10.0/23,34.152.72.0/21,34.177.40.0/21,34.48.0.0/16,34.1.16.0/20" }, + + // https://github.com/foryVERX/Overwatch-Server-Selector/blob/main/ip_lists/Ip_ranges_EU.txt + { "eu", "64.224.26.0/23,104.155.0.0/17,104.199.0.0/18,104.199.66.0/23,104.199.68.0/22,104.199.72.0/21,104.199.80.0/20,104.199.96.0/20,130.211.48.0/20,130.211.64.0/19,130.211.96.0/20,146.148.112.0/20,146.148.16.0/20,146.148.2.0/23,146.148.4.0/22,146.148.8.0/21,192.158.28.0/22,23.251.128.0/20,34.104.110.0/23,34.104.112.0/23,34.104.126.0/23,34.104.96.0/21,34.105.128.0/17,34.107.0.0/17,34.118.244.0/22,34.118.254.0/23,34.124.32.0/21,34.124.46.0/23,34.124.48.0/23,34.124.62.0/23,34.127.186.0/23,34.140.0.0/16,34.141.0.0/17,34.141.128.0/17,34.142.0.0/17,34.147.0.0/17,34.147.128.0/17,34.154.0.0/16,34.155.0.0/16,34.157.12.0/22,34.157.136.0/23,34.157.140.0/22,34.157.168.0/22,34.157.176.0/20,34.157.208.0/23,34.157.220.0/22,34.157.36.0/22,34.157.40.0/22,34.157.48.0/20,34.157.8.0/23,34.157.80.0/23,34.157.92.0/22,34.159.0.0/16,34.163.0.0/16,34.65.0.0/16,34.76.0.0/14,34.88.0.0/16,34.89.0.0/17,34.89.128.0/17,34.90.0.0/15,35.187.0.0/17,35.187.160.0/19,35.189.192.0/18,35.189.64.0/18,35.190.192.0/19,35.195.0.0/16,35.197.192.0/18,35.198.128.0/18,35.198.64.0/18,35.203.210.0/23,35.203.212.0/22,35.203.216.0/22,35.203.232.0/21,35.204.0.0/16,35.205.0.0/16,35.206.128.0/18,35.207.128.0/18,35.207.64.0/18,35.210.0.0/16,35.214.0.0/17,35.214.128.0/17,35.216.128.0/17,35.217.0.0/18,35.219.224.0/19,35.220.16.0/23,35.220.18.0/23,35.220.20.0/22,35.220.26.0/24,35.220.44.0/24,35.220.96.0/19,35.228.0.0/16,35.230.128.0/19,35.233.0.0/17,35.234.128.0/19,35.234.160.0/20,35.234.64.0/18,35.235.216.0/21,35.235.32.0/20,35.235.48.0/20,35.240.0.0/17,35.241.128.0/17,35.242.128.0/18,35.242.16.0/23,35.242.18.0/23,35.242.192.0/18,35.242.20.0/22,35.242.26.0/24,35.242.44.0/24,35.242.64.0/19,35.246.0.0/17,35.246.128.0/17,5.42.168.0-5.42.175.255,5.42.184.0-5.42.191.255,8.34.208.0/23,8.34.211.0/24,8.34.220.0/22,34.22.128.0/17,34.104.116.0/22,34.116.128.0/17,34.118.0.0/17,34.124.52.0/22,34.157.44.0/23,34.157.172.0/23,34.164.0.0/16,34.175.0.0/16,34.22.112.0/20,34.17.0.0/16,34.157.124.0/23,34.157.250.0/23,34.0.160.0/19,34.157.121.0/24,34.157.249.0/24,34.0.192.0/19,34.0.240.0/20,34.34.128.0/18,34.38.0.0/16,34.32.0.0/17,34.152.80.0/23,34.177.36.0/23,34.39.0.0/17,34.128.52.0/22,34.0.224.0/24,34.0.226.0/24,34.40.0.0/17,34.32.128.0/17,34.34.0.0/17,34.1.0.0/20,34.1.160.0/20,34.1.224.0/19,34.153.38.0/24,34.153.230.0/24" }, + + // https://github.com/foryVERX/Overwatch-Server-Selector/blob/main/ip_lists/Ip_ranges_AS_Japan.txt + { "japan", "34.85.0.0-34.85.127.255,34.84.0.0-34.84.255.255,35.190.224.0-35.190.239.255,35.194.96.0-35.194.255.255,35.221.64.0-35.221.255.255,34.146.0.0-34.146.255.255,34.84.0.0/16,34.85.0.0/17,34.104.62.0/23,34.104.128.0/17,34.127.190.0/23,34.146.0.0/16,34.157.64.0/20,34.157.164.0/22,34.157.192.0/20,35.187.192.0/19,35.189.128.0/19,35.190.224.0/20,35.194.96.0/19,35.200.0.0/17,35.213.0.0/17,35.220.56.0/22,35.221.64.0/18,35.230.240.0/20,35.242.56.0/22,35.243.64.0/18,104.198.80.0/20,104.198.112.0/20,34.97.0.0/16,34.104.49.0/24,34.127.177.0/24,35.217.128.0/17,35.220.45.0/24,35.242.45.0/24,35.243.56.0/21" }, + + // https://github.com/foryVERX/Overwatch-Server-Selector/blob/main/ip_lists/Ip_ranges_Australia.txt + { "australia", "158.115.196.0/23,37.244.42.0-37.244.42.255,34.87.192.0/18,34.104.104.0/23,34.116.64.0/18,34.124.40.0/23,34.151.64.0/18,34.151.128.0/18,35.189.0.0/18,35.197.160.0/19,35.201.0.0/19,35.213.192.0/18,35.220.41.0/24,35.234.224.0/20,35.242.41.0/24,35.244.64.0/18,34.104.122.0/23,34.124.58.0/23,34.126.192.0/20,34.129.0.0/16,34.0.16.0/20,34.40.128.0/17,34.128.36.0/24,34.128.48.0/24,34.1.176.0/20" }, + + // https://github.com/foryVERX/Overwatch-Server-Selector/blob/main/ip_lists/Ip_ranges_AS_Korea.txt + { "south_korea", "202.9.66.0/23,34.64.0.0-34.64.255.255,117.52.0.0-117.52.255.255,121.254.0.0-121.254.255.255,34.0.96.0/19,34.64.32.0/19,34.64.64.0/22,34.64.68.0/22,34.64.72.0/21,34.64.80.0/20,34.64.96.0/19,34.64.128.0/22,34.64.132.0/22,34.64.136.0/21,34.64.144.0/20,34.64.160.0/19,34.64.192.0/18,35.216.0.0/17,34.22.64.0/19,34.22.96.0/20,34.47.64.0/18,34.50.0.0/18" }, + + // https://github.com/foryVERX/Overwatch-Server-Selector/blob/main/ip_lists/Ip_ranges_AS_Singapore.txt + { "singapore", "34.124.0.0-34.124.255.255,34.124.42.0-34.124.43.255,34.142.128.0-34.142.255.255,35.185.176.0-35.185.191.255,35.186.144.0-35.186.159.255,35.247.128.0-35.247.191.255,34.87.0.0-34.87.191.255,34.143.128.0-34.143.255.255,34.124.128.0-34.124.255.255,34.126.64.0-34.126.191.255,35.240.128.0-35.240.255.255,35.198.192.0-35.198.255.255,34.21.128.0-34.21.255.255,34.104.58.0-34.104.59.255,34.124.41.0-34.124.42.255,34.157.82.0-34.157.83.255,34.157.88.0-34.157.89.255,34.157.210.0-34.157.211.255,35.187.224.0-35.187.255.255,35.197.128.0-35.197.159.255,35.213.128.0-35.213.191.255,35.220.24.0-35.220.25.255,35.234.192.0-35.234.207.255,35.242.24.0-35.242.25.255,34.126.128.0/18,34.87.128.0/18,34.21.128.0/17,34.87.0.0/17,34.87.128.0/18,34.104.58.0/23,34.104.106.0/23,34.124.42.0/23,34.124.128.0/17,34.126.64.0/18,34.126.128.0/18,34.142.128.0/17,34.143.128.0/17,34.157.82.0/23,34.157.88.0/23,34.157.210.0/23,35.185.176.0/20,35.186.144.0/20,35.187.224.0/19,35.197.128.0/19,35.198.192.0/18,35.213.128.0/18,35.220.24.0/23,35.234.192.0/20,35.240.128.0/17,35.242.24.0/23,35.247.128.0/18,34.101.18.0/24,34.101.20.0/22,34.101.24.0/22,34.101.32.0/19,34.101.64.0/18,34.101.128.0/17,34.128.64.0/18,35.219.0.0/17,34.128.44.0/23,34.128.60.0/23,34.1.128.0/20,34.1.192.0/20,34.153.40.0/23,34.153.232.0/23" }, + + // https://github.com/foryVERX/Overwatch-Server-Selector/blob/main/ip_lists/Ip_ranges_AS_Taiwan.txt + { "taiwan", "5.42.160.0-5.42.160.255,35.221.128.0/17,34.80.0.0/15,34.137.0.0/16,35.185.128.0/19,35.185.160.0/20,35.187.144.0/20,35.189.160.0/19,35.194.128.0/17,35.201.128.0/17,35.206.192.0/18,35.220.32.0/21,35.229.128.0/17,35.234.0.0/18,35.235.16.0/20,35.236.128.0/18,35.242.32.0/21,104.155.192.0/19,104.155.224.0/20,104.199.128.0/18,104.199.192.0/19,104.199.224.0/20,104.199.242.0/23,104.199.244.0/22,104.199.248.0/21,107.167.176.0/20,130.211.240.0/20" }, + + // https://github.com/foryVERX/Overwatch-Server-Selector/blob/main/ip_lists/Ip_ranges_Brazil.txt + { "brazil", "34.95.128.0/17,34.104.80.0/21,34.124.16.0/21,34.151.0.0/18,34.151.192.0/18,35.198.0.0/18,35.199.64.0/18,35.215.192.0/18,35.220.40.0/24,35.235.0.0/20,35.242.40.0/24,35.247.192.0/18,34.104.50.0/23,34.127.178.0/23,34.176.0.0/16,34.95.208.0/20,34.39.128.0/17,35.199.96.0/20" }, + + // https://github.com/foryVERX/Overwatch-Server-Selector/blob/main/ip_lists/Ip_ranges_ME.txt + { "middle_east", "157.175.0.0-157.175.255.255,15.185.0.0-15.185.255.255,15.184.0.0-15.184.255.255,16.24.0.0/16,34.1.48.0/20,34.152.84.0/23,34.166.0.0/16,34.177.48.0/23,34.1.32.0/20,34.18.0.0/16,34.157.126.0/23,34.157.252.0/23,34.0.64.0/19,34.157.90.0/23,34.157.216.0/23,34.165.0.0/16,34.1.48.0/20,34.177.48.0/23,34.0.64.0/19,34.157.90.0/23,34.157.216.0/23,34.165.0.0/16" }, + + // + // { "", }, + + + //TODO: custom combos. not as reliable apparently + //{ "ord1", "24.105.40.0-24.105.47.255,64.224.0.0/21,8.34.210.0/24,8.34.212.0/22,8.34.216.0/22,8.35.192.0/21,23.236.48.0/20,23.251.144.0/20,34.0.225.0/24,34.16.0.0/17,34.27.0.0/16,34.28.0.0/14,34.33.0.0/16,34.41.0.0/16,34.42.0.0/16,34.44.0.0/15,34.46.0.0/16,34.66.0.0/15,34.68.0.0/14,34.72.0.0/16,34.118.200.0/21,34.121.0.0/16,34.122.0.0/15,34.128.32.0/22,34.132.0.0/14,34.136.0.0/16,34.153.48.0/21,34.153.240.0/21,34.157.84.0/23,34.157.96.0/20,34.157.212.0/23,34.157.224.0/20,34.170.0.0/15,34.172.0.0/15,34.177.52.0/22,35.184.0.0/16,35.188.0.0/17,35.188.128.0/18,35.188.192.0/19,35.192.0.0/15,35.194.0.0/18,35.202.0.0/16,35.206.64.0/18,35.208.0.0/15,35.220.64.0/19,35.222.0.0/15,35.224.0.0/15,35.226.0.0/16,35.232.0.0/16,35.238.0.0/15,35.242.96.0/19,104.154.16.0/20,104.154.32.0/19,104.154.64.0/19,104.154.96.0/20,104.154.113.0/24,104.154.114.0/23,104.154.116.0/22,104.154.120.0/23,104.154.128.0/17,104.155.128.0/18,104.197.0.0/16,104.198.16.0/20,104.198.32.0/19,104.198.64.0/20,104.198.128.0/17,107.178.208.0/20,108.59.80.0/21,130.211.112.0/20,130.211.128.0/18,130.211.192.0/19,130.211.224.0/20,146.148.32.0/19,146.148.64.0/19,146.148.96.0/20,162.222.176.0/21,173.255.112.0/21,199.192.115.0/24,199.223.232.0/22,199.223.236.0/24,34.22.0.0/19,35.186.0.0/17,35.186.128.0/20,35.206.32.0/19,35.220.46.0/24,35.242.46.0/24,107.167.160.0/20,108.59.88.0/21,173.255.120.0/21" }, + //{ "guw2", "35.247.0.0/17,35.236.0.0/17,35.235.64.0/18,34.102.0.0/17,34.94.0.0/16,34.19.0.0/17,34.82.0.0/15,34.105.0.0/17,34.118.192.0/21,34.127.0.0/17,34.145.0.0/17,34.157.112.0/21,34.157.240.0/21,34.168.0.0/15,35.185.192.0/18,35.197.0.0/17,35.199.144.0/20,35.199.160.0/19,35.203.128.0/18,35.212.128.0/17,35.220.48.0/21,35.227.128.0/18,35.230.0.0/17,35.233.128.0/17,35.242.48.0/21,35.243.32.0/21,35.247.0.0/17,104.196.224.0/19,104.198.0.0/20,104.198.96.0/20,104.199.112.0/20,34.20.128.0/17,34.94.0.0/16,34.102.0.0/17,34.104.64.0/21,34.108.0.0/16,34.118.248.0/23,35.215.64.0/18,35.220.47.0/24,35.235.64.0/18,35.236.0.0/17,35.242.47.0/24,35.243.0.0/21,34.22.32.0/19,34.104.52.0/24,34.106.0.0/16,34.127.180.0/24,35.217.64.0/18,35.220.31.0/24,35.242.31.0/24,34.16.128.0/17,34.104.72.0/22,34.118.240.0/22,34.124.8.0/22,34.125.0.0/16,35.219.128.0/18,34.124.0.0/21" }, + //{ "lax1", "24.105.8.0-24.105.15.255,34.124.0.0/21" }, + //{ "las1", "64.224.24.0/23" }, + //{ "ams1", "5.42.168.0-5.42.175.255,64.224.26.0/23" }, + //{ "cdg1", "5.42.184.0-5.42.191.255" }, + //{ "gen1", "34.88.0.0/16,34.104.96.0/21,34.124.32.0/21,35.203.232.0/21,35.217.0.0/18,35.220.26.0/24,35.228.0.0/16,35.242.26.0/24" }, + //{ "gbr1", "34.95.128.0/17,34.104.80.0/21,34.124.16.0/21,34.151.0.0/18,34.151.192.0/18,35.198.0.0/18,35.199.64.0/18,35.215.192.0/18,35.220.40.0/24,35.235.0.0/20,35.242.40.0/24,35.247.192.0/18,34.104.50.0/23,34.127.178.0/23,34.176.0.0/16" }, + //{ "gtk1", "34.85.0.0-34.85.127.255,34.84.0.0-34.84.255.255,35.190.224.0-35.190.239.255,35.194.96.0-35.194.255.255,35.221.64.0-35.221.255.255,34.146.0.0-34.146.255.255,34.84.0.0/16,34.85.0.0/17,34.104.62.0/23,34.104.128.0/17,34.127.190.0/23,34.146.0.0/16,34.157.64.0/20,34.157.164.0/22,34.157.192.0/20,35.187.192.0/19,35.189.128.0/19,35.190.224.0/20,35.194.96.0/19,35.200.0.0/17,35.213.0.0/17,35.220.56.0/22,35.221.64.0/18,35.230.240.0/20,35.242.56.0/22,35.243.64.0/18,104.198.80.0/20,104.198.112.0/20,34.97.0.0/16,34.104.49.0/24,34.127.177.0/24,35.217.128.0/17,35.220.45.0/24,35.242.45.0/24,35.243.56.0/21" }, + //{ "gsg1", "34.124.0.0-34.124.255.255,34.124.42.0-34.124.43.255,34.142.128.0-34.142.255.255,35.185.176.0-35.185.191.255,35.186.144.0-35.186.159.255,35.247.128.0-35.247.191.255,34.87.0.0-34.87.191.255,34.143.128.0-34.143.255.255,34.124.128.0-34.124.255.255,34.126.64.0-34.126.191.255,35.240.128.0-35.240.255.255,35.198.192.0-35.198.255.255,34.21.128.0-34.21.255.255,34.104.58.0-34.104.59.255,34.124.41.0-34.124.42.255,34.157.82.0-34.157.83.255,34.157.88.0-34.157.89.255,34.157.210.0-34.157.211.255,35.187.224.0-35.187.255.255,35.197.128.0-35.197.159.255,35.213.128.0-35.213.191.255,35.220.24.0-35.220.25.255,35.234.192.0-35.234.207.255,35.242.24.0-35.242.25.255,34.126.128.0/18,34.87.128.0/18,34.21.128.0/17,34.87.0.0/17,34.87.128.0/18,34.104.58.0/23,34.104.106.0/23,34.124.42.0/23,34.124.128.0/17,34.126.64.0/18,34.126.128.0/18,34.142.128.0/17,34.143.128.0/17,34.157.82.0/23,34.157.88.0/23,34.157.210.0/23,35.185.176.0/20,35.186.144.0/20,35.187.224.0/19,35.197.128.0/19,35.198.192.0/18,35.213.128.0/18,35.220.24.0/23,35.234.192.0/20,35.240.128.0/17,35.242.24.0/23,35.247.128.0/18,34.101.18.0/24,34.101.20.0/22,34.101.24.0/22,34.101.32.0/19,34.101.64.0/18,34.101.128.0/17,34.128.64.0/18,35.219.0.0/17" }, + //{ "icn1", "121.254.0.0-121.254.255.255,117.52.0.0-117.52.255.255,202.9.66.0/23" }, + //{ "gan3", "34.64.0.0-34.64.255.255,121.254.0.0-121.254.255.255,34.0.96.0/19,34.64.32.0/19,34.64.64.0/22,34.64.68.0/22,34.64.72.0/21,34.64.80.0/20,34.64.96.0/19,34.64.128.0/22,34.64.132.0/22,34.64.136.0/21,34.64.144.0/20,34.64.160.0/19,34.64.192.0/18,35.216.0.0/17,34.22.64.0/19,34.22.96.0/20" }, + //{ "tpe1", "5.42.160.0-5.42.160.255,35.221.128.0/17" }, + //{ "gmec1", "34.1.32.0/20,34.18.0.0/16,34.157.126.0/23,34.157.252.0/23" }, + //{ "gmec2", "34.1.48.0/20,34.152.84.0/23,34.166.0.0/16,34.177.48.0/23" }, + //{ "syd2", "158.115.196.0/23,37.244.42.0-37.244.42.255,34.87.192.0/18,34.104.104.0/23,34.116.64.0/18,34.124.40.0/23,34.151.64.0/18,34.151.128.0/18,35.189.0.0/18,35.197.160.0/19,35.201.0.0/19,35.213.192.0/18,35.220.41.0/24,35.234.224.0/20,35.242.41.0/24,35.244.64.0/18,34.104.122.0/23,34.124.58.0/23,34.126.192.0/20,34.129.0.0/16,34.0.16.0/20" }, }), @@ -153,140 +150,104 @@ DashboardManager::DashboardManager() : */ // https://ipinfo.io/AS57976/137.221.68.0/24 - { - .title= "USA - West", - ._ping_ip= "137.221.68.83", - .heading= "LAX1, LAS1 and GUW2", - ._firewall_rule_address= ips.at("lax1") + "," + ips.at("las1") + "," + ips.at("guw2"), - ._firewall_rule_description = "Blocks LAX1, LAS1 and GUW2", - .favorite= true, - }, + // code ips.at("lax1") + "," + ips.at("las1") + "," + ips.at("guw2") - // https://ipinfo.io/AS57976/137.221.69.0/24 - { - .title= "USA - Central", - ._ping_ip= "137.221.69.29", - .heading= "ORD1", - ._firewall_rule_address= ips.at("ord1"), - ._firewall_rule_description = "Blocks ORD1", - .favorite = true, - }, - // https://ipinfo.io/AS57976/137.221.78.0/24 - { - .title = "Netherlands", - ._ping_ip = "137.221.78.69", - .heading = "AMS1", - ._firewall_rule_address = ips.at("ams1"), - ._firewall_rule_description = "Blocks AMS1", - }, - // https://ipinfo.io/AS57976/137.221.77.0/24 - { - .title = "France", - ._ping_ip = "137.221.77.51", - .heading = "CDG1", - ._firewall_rule_address = ips.at("cdg1"), - ._firewall_rule_description = "Blocks CDG1", - }, + // TODO fix prop spacing + + // web https://www.reddit.com/r/Overwatch/comments/6blbkj/comment/dhnpq7k/ - // blizz hidden { - .title = "Finland", - ._ping_ip = "188.126.89.1", - .heading = "GEN1", - ._firewall_rule_address = ips.at("gen1"), - ._firewall_rule_description = "Blocks GEN1", + .title= "NA - CENTRAL", + ._ping_ip= "137.221.69.29", + .heading= "ORD1", + ._firewall_rule_address= ips.at("na/central"), + ._firewall_rule_description = "Blocks USA - CENTRAL", + .favorite= true, }, - // blizz hidden { - .title = "Brazil", - ._ping_ip = "52.94.7.202", - .heading = "GBR1", - ._firewall_rule_address = ips.at("gbr1"), - ._firewall_rule_description = "Blocks GBR1", + .title = "NA - WEST", + ._ping_ip = "137.221.68.83", + .heading = "LAX1 and LAS1", // guw2 ?? + ._firewall_rule_address = ips.at("na/west"), + ._firewall_rule_description = "Blocks USA - SOUTHWEST", + .favorite = true, }, - // blizz hidden { - .title = "Japan", - ._ping_ip = "52.94.8.94", - .heading = "GTK1", - ._firewall_rule_address = ips.at("gtk1"), - ._firewall_rule_description = "Blocks GTK1", + .title = "EUROPE", + ._ping_ip = "137.221.78.69", + .heading = "AMS1, CDG1", // Amsterdam, Paris + ._firewall_rule_address = ips.at("eu"), + ._firewall_rule_description = "Blocks EU", + .favorite = true, }, - // blizz hidden { - .title = "Singapore", - ._ping_ip = "52.94.11.146", - .heading = "GSG1", - ._firewall_rule_address = ips.at("gsg1"), - ._firewall_rule_description = "Blocks GSG1", + .title = "JAPAN", + ._ping_ip = "52.94.8.94", + .heading = "GTK1", // Tokyo + ._firewall_rule_address = ips.at("japan"), + ._firewall_rule_description = "Blocks JAPAN", + .favorite = true, }, - // https://ipinfo.io/AS57976/137.221.64.0/19-137.221.65.0/25 { - .title = "South Korea", + .title = "SOUTH KOREA", ._ping_ip = "137.221.65.65", - .heading = "ICN1 and GAN3", - ._firewall_rule_address = ips.at("icn1") + "," + ips.at("gan3"), - ._firewall_rule_description = "Blocks ICN1 and GAN3", + .heading = "ICN1", // Seoul + ._firewall_rule_address = ips.at("south_korea"), + ._firewall_rule_description = "Blocks SOUTH KOREA", + .favorite = true, }, - // https://ipinfo.io/AS57976/137.221.64.0/19-137.221.67.0/25 { - .title = "Taiwan", - ._ping_ip = "137.221.112.69", - .heading = "TPE1", - ._firewall_rule_address = ips.at("tpe1"), - ._firewall_rule_description = "Blocks TPE1", + .title = "AUSTRALIA", + ._ping_ip = "137.221.85.67", + .heading = "SYD2", // Sydney + ._firewall_rule_address = ips.at("australia"), + ._firewall_rule_description = "Blocks AUSTRALIA", + .favorite = true, }, - // blizz hidden { - .title = "Dubai", - ._ping_ip = "13.248.66.130", - .heading = "GMEC1", - ._firewall_rule_address = ips.at("gmec1"), - ._firewall_rule_description = "Blocks GMEC1", + .title = "SINGAPORE", + ._ping_ip = "35.71.118.14", // dynamo db + .heading = "GSG1", + ._firewall_rule_address = ips.at("singapore"), + ._firewall_rule_description = "Blocks SINGAPORE", + .favorite = true, }, - // https://ipinfo.io/AS57976/137.221.85.0/24 { - .title = "Australia", - ._ping_ip = "137.221.85.67", - .heading = "SYD2", - ._firewall_rule_address = ips.at("syd2"), - ._firewall_rule_description = "Blocks SYD2", + .title = "TAIWAN", + ._ping_ip = "137.221.112.69", + .heading = "TPE1", // Taipei + ._firewall_rule_address = ips.at("taiwan"), + ._firewall_rule_description = "Blocks TAIWAN", + .favorite = true, }, - // TODO: germany, bahrain, korea3, na east. offline currently. - { - .title = "Bahrain", - ._ping_ip = "", - .heading = "MES1", - ._firewall_rule_address = ips.at("mes1"), - ._firewall_rule_description = "Blocks MES1", + .title = "BRAZIL", + ._ping_ip = "52.94.7.202", + .heading = "GBR1", + ._firewall_rule_address = ips.at("brazil"), + ._firewall_rule_description = "Blocks BRAZIL", + .favorite = true, }, { - .title = "Germany", - ._ping_ip = "", - .heading = "GEW3", - ._firewall_rule_address = ips.at("gew3"), - ._firewall_rule_description = "Blocks GEW3", + .title = "MIDDLE EAST", + ._ping_ip = "13.248.66.130", + .heading = "GMEC2", + ._firewall_rule_address = ips.at("middle_east"), + ._firewall_rule_description = "Blocks MIDDLE EAST", + .favorite = true, }, - { - .title = "USA - East", - ._ping_ip = "", - .heading = "GUE4", - ._firewall_rule_address = ips.at("gue4"), - ._firewall_rule_description = "Blocks GUE4", - }, }), pinging(true)