Skip to content

Commit 39dd8a8

Browse files
stowmyystowmyy
committed
blocklist: update gsg1 and gmec2
1 parent f6eb1ff commit 39dd8a8

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

‎dropship/dropship/src/core/DashboardRender.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,10 @@ void renderNotice() {
177177
{
178178
ImGui::SameLine(262);
179179
ImGui::SetCursorPosY(ImGui::GetCursorPosY() - 2);
180-
ImGui::TextUnformatted("10/03/2025");
180+
ImGui::TextUnformatted("12/01/2025");
181181

182-
ImGui::TextWrapped("GSG1 (Singapore) and GTK1 (Tokyo) have been updated, please let us know if you have issues.");
182+
// ImGui::TextWrapped("GSG1 (Singapore) and GTK1 (Tokyo) have been updated, please let us know if you have issues.");
183+
ImGui::TextWrapped("GSG1 and GMEC2 have been updated. \n\nPlease click the \"unblock\" button below - servers must be unblocked to apply the newest blocklist.\n\n:)");
183184
// ImGui::TextWrapped("The blocklist has been updated, please let us know if you have any connection issues.");
184185
// ImGui::TextWrapped("To report a connection issue: Please check which server you are connected to with CTRL");
185186

‎dropship/dropship/src/core/Settings.h‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,22 @@ namespace dropship::settings {
5353

5454
/* how to get gpc codes
5555
- https://www.gstatic.com/ipranges/cloud.json
56-
- ex. var find = (n) => data.prefixes.filter(x => x.scope == n).map(x => x.ipv4Prefix ?? x.ipv6Prefix).join(); find("asia-southeast1")
56+
- ex.
57+
var find = (n) => $json.data.prefixes.filter(x => x.scope == n).map(x => x.ipv4Prefix ?? x.ipv6Prefix).join(); find("asia-southeast1")
58+
var map = [ "asia-southeast1", "europe-north1", "southamerica-east1", "asia-northeast1", "me-central2" ].reduce((_a, x) => { _a.set(x, find(x)); return _a; }, new Map());
59+
Array.from(map, ([k, v]) => { const macro = k.replace(/-/g, '_').toUpperCase(); return `static const std::string GPC_${macro} { "${v}" };`; }).join('\n')
5760
*/
5861

5962
/* other ips
6063
- https://bgpview.io/asn/57976#prefixes-v4
6164
- kr is unique, dacom isp
6265
*/
6366

64-
static const std::string GPC_ASIA_SOUTHEAST1 { "34.1.128.0/20,34.1.192.0/20,34.2.16.0/20,34.2.128.0/17,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.128.44.0/23,34.128.60.0/23,34.142.128.0/17,34.143.128.0/17,34.152.104.0/23,34.153.40.0/23,34.153.232.0/23,34.157.82.0/23,34.157.88.0/23,34.157.210.0/23,34.158.32.0/19,34.177.72.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,136.110.0.0/18,2600:1900:4080::/44" };
65-
static const std::string GPC_EUROPE_NORTH1 { "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,2600:1900:4150::/44" };
66-
static const std::string GPC_SOUTHAMERICA_EAST1 { "34.39.128.0/17,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,2600:1900:40f0::/44" };
67-
static const std::string GPC_ASIA_NORTHEAST1 { "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.153.192.0/19,34.157.64.0/20,34.157.164.0/22,34.157.192.0/20,34.180.64.0/18,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,136.110.64.0/18,2600:1900:4050::/44" };
68-
static const std::string GPC_ME_CENTRAL2 { "34.1.48.0/20,34.152.84.0/23,34.152.102.0/24,34.166.0.0/16,34.177.48.0/23,34.177.70.0/24,2600:1900:5400::/44" };
67+
static const std::string GPC_ASIA_SOUTHEAST1 { "34.1.128.0/20,34.1.192.0/20,34.2.16.0/20,34.2.128.0/17,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.128.44.0/23,34.128.60.0/23,34.142.128.0/17,34.143.128.0/17,34.152.104.0/23,34.153.40.0/23,34.153.232.0/23,34.157.82.0/23,34.157.88.0/23,34.157.210.0/23,34.158.32.0/19,34.177.72.0/23,34.177.80.0/20,34.177.96.0/20,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,136.110.0.0/18,2600:1900:4080::/44,2600:1902:90::/44" };
68+
static const std::string GPC_EUROPE_NORTH1 { "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,2600:1900:4150::/44,2600:1902:e0::/44" };
69+
static const std::string GPC_SOUTHAMERICA_EAST1 { "34.39.128.0/17,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,2600:1900:40f0::/44,2600:1902:200::/44" };
70+
static const std::string GPC_ASIA_NORTHEAST1 { "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.153.192.0/19,34.157.64.0/20,34.157.164.0/22,34.157.192.0/20,34.180.64.0/18,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,136.110.64.0/18,2600:1900:4050::/44,2600:1902:40::/44" };
71+
static const std::string GPC_ME_CENTRAL2 { "34.1.48.0/20,34.152.84.0/23,34.152.102.0/24,34.157.122.128/25,34.157.218.128/25,34.166.0.0/16,34.177.48.0/23,34.177.70.0/24,35.252.32.0/19,2600:1900:5400::/44,2600:1902:1b0::/44" };
6972

7073
static const std::string BLIZZARD_DACOM_KR { "110.45.208.0/24,117.52.6.0/24,117.52.26.0/23,117.52.28.0/23,117.52.33.0/24,117.52.34.0/23,117.52.36.0/23,121.254.137.0/24,121.254.206.0/23,121.254.218.0/24,182.162.31.0/24" };
7174

0 commit comments

Comments
 (0)