Merge branch 'SukkaW:master' into master

FYLSen · Feb 25, 2024 · 9c6ef2e · 9c6ef2e
2 parents 756b684 + 7da10a5
commit 9c6ef2e
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/Build/build-sgmodule-always-realip.ts b/Build/build-sgmodule-always-realip.ts
@@ -9,20 +9,27 @@ const HOSTNAMES = [
   '*.localhost',
   '*.home.arpa',
   // Network Detection, Captive Portal
+  'msftncsi.com',
+  'msftconnecttest.com',
   '*.msftncsi.com',
   '*.msftconnecttest.com',
   'network-test.debian.org',
   'detectportal.firefox.com',
   'resolver1.opendns.com',
+  '*.ipv6.microsoft.com',
   // Handle SNAT conversation properly
   '*.srv.nintendo.net',
   '*.stun.playstation.net',
   'xbox.*.microsoft.com',
   '*.xboxlive.com',
+  'turn.twilio.com',
   '*.turn.twilio.com',
+  'stun.twilio.com',
   '*.stun.twilio.com',
+  'stun.syncthing.net',
   'stun.*.*',
   'stun.*.*.*',
+  'controlplane.tailscale.com',
   // NTP
   'time.*.com', 'time.*.gov, time.*.edu.cn, time.*.apple.com', 'time1.*.com', 'time2.*.com', 'time3.*.com', 'time4.*.com', 'time5.*.com', 'time6.*.com', 'time7.*.com', 'time8.*.com', 'time9.*.com, ntp.*.com, ntp1.*.com, ntp2.*.com, ntp3.*.com, ntp4.*.com, ntp5.*.com, ntp6.*.com, ntp7.*.com', 'time1.*.com', 'time2.*.com', 'time3.*.com', 'time4.*.com', 'time5.*.com', 'time6.*.com', 'time7.*.com', 'time8.*.com', 'ti me9.*.com', '*.time.edu.cn', '*.ntp.org.cn', '*.pool.ntp.org', 'time1.cloud.tencent.com',
   // AdGuard
@@ -35,7 +42,11 @@ const HOSTNAMES = [
   // Microsoft Auto Discovery
   'PDC._msDCS.*.*',
   'DC._msDCS.*.*',
-  'GC._msDCS.*.*'
+  'GC._msDCS.*.*',
+  // Misc,
+  '*.battlenet.com.cn',
+  '*.blzstatic.cn',
+  '*.battlenet.com'
 ] as const;
 
 export const buildAlwaysRealIPModule = task(import.meta.path, async (span) => {

diff --git a/Source/domainset/steam.conf b/Source/domainset/steam.conf
@@ -2,6 +2,7 @@
 
 # Steam
 .steamcontent.com
+.steamserver.net
 .content.steampowered.com
 content1.steampowered.com
 content2.steampowered.com
@@ -17,7 +18,6 @@ steam.eca.qtlglb.com
 steam.naeu.qtlglb.com
 steam.ru.qtlglb.com
 edge.steam-dns.top.comcast.net
-# DOMAIN-SUFFIX,steamserver.net
 steampipe.akamaized.net
 steampipe-kr.akamaized.net
 steampipe-partner.akamaized.net

diff --git a/Source/non_ip/domestic.conf b/Source/non_ip/domestic.conf
@@ -306,6 +306,9 @@ DOMAIN-SUFFIX,battlenet.com.cn
 
 DOMAIN-SUFFIX,dl.delivery.mp.microsoft.com
 
+# Microsoft 365 China
+DOMAIN-SUFFIX,sharepoint.cn
+
 # Steam China
 DOMAIN-SUFFIX,wmsj.cn
 DOMAIN-SUFFIX,wmsjsteam.com