From 8097c5a52d2cf281a38659de3879a1a92c5b13fa Mon Sep 17 00:00:00 2001
From: "R. Daneel Olivaw"
 <19835896+Robot-DaneelOlivaw@users.noreply.github.com>
Date: Fri, 7 Aug 2020 02:14:08 +0800
Subject: [PATCH] Add domains of Apple and Google with APs in CN

---
 data/apple  | 130 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 data/google |  69 +++++++++++++++++++++++++---
 2 files changed, 192 insertions(+), 7 deletions(-)

diff --git a/data/apple b/data/apple
index dfda81fd..ac527823 100644
--- a/data/apple
+++ b/data/apple
@@ -631,6 +631,136 @@ xn--hxtr4rozx.xn--czr694b # 苹果店.商标
 xn--kput3imi374g.xn--hxt814e # 苹果手机.网店
 xn--ruq8a011kt6y.xn--hxt814e # 苹果保修.网店
 
+# Domains and services below are available in China mainland
+# Reference: https://github.com/felixonmars/dnsmasq-china-list/blob/master/apple.china.conf
+# Use in config file like this: "geosite:apple@cn"
+full:a1.mzstatic.com @cn
+full:a2.mzstatic.com @cn
+full:a3.mzstatic.com @cn
+full:a4.mzstatic.com @cn
+full:a5.mzstatic.com @cn
+full:adcdownload.apple.com.akadns.net @cn
+full:adcdownload.apple.com @cn
+full:appldnld.apple.com @cn
+full:appldnld.g.aaplimg.com @cn
+full:apps.apple.com @cn
+full:apps.mzstatic.com @cn
+full:cdn-cn1.apple-mapkit.com @cn
+full:cdn-cn2.apple-mapkit.com @cn
+full:cdn-cn3.apple-mapkit.com @cn
+full:cdn-cn4.apple-mapkit.com @cn
+full:cdn.apple-mapkit.com @cn
+full:cdn1.apple-mapkit.com @cn
+full:cdn2.apple-mapkit.com @cn
+full:cdn3.apple-mapkit.com @cn
+full:cdn4.apple-mapkit.com @cn
+full:cds-cdn.v.aaplimg.com @cn
+full:cds.apple.com.akadns.net @cn
+full:cds.apple.com @cn
+full:cl1-cdn.origin-apple.com.akadns.net @cn
+full:cl1.apple.com @cn
+full:cl2-cn.apple.com @cn
+full:cl2.apple.com.edgekey.net.globalredir.akadns.net @cn
+full:cl2.apple.com @cn
+full:cl3-cdn.origin-apple.com.akadns.net @cn
+full:cl3.apple.com @cn
+full:cl4-cdn.origin-apple.com.akadns.net @cn
+full:cl4-cn.apple.com @cn
+full:cl4.apple.com @cn
+full:cl5-cdn.origin-apple.com.akadns.net @cn
+full:cl5.apple.com @cn
+full:clientflow.apple.com.akadns.net @cn
+full:clientflow.apple.com @cn
+full:configuration.apple.com.akadns.net @cn
+full:configuration.apple.com @cn
+full:cstat.apple.com @cn
+full:dd-cdn.origin-apple.com.akadns.net @cn
+full:download.developer.apple.com @cn
+full:gs-loc-cn.apple.com @cn
+full:gs-loc.apple.com @cn
+full:gsp10-ssl-cn.ls.apple.com @cn
+full:gsp11-cn.ls.apple.com @cn
+full:gsp12-cn.ls.apple.com @cn
+full:gsp13-cn.ls.apple.com @cn
+full:gsp4-cn.ls.apple.com.edgekey.net.globalredir.akadns.net @cn
+full:gsp4-cn.ls.apple.com.edgekey.net @cn
+full:gsp4-cn.ls.apple.com @cn
+full:gsp5-cn.ls.apple.com @cn
+full:gspe19-cn-ssl.ls.apple.com @cn
+full:gspe19-cn.ls-apple.com.akadns.net @cn
+full:gspe19-cn.ls.apple.com @cn
+full:gspe21-ssl.ls.apple.com @cn
+full:gspe21.ls.apple.com @cn
+full:gspe35-ssl.ls.apple.com @cn
+full:iadsdk.apple.com @cn
+full:icloud-cdn.icloud.com.akadns.net @cn
+full:icloud.cdn-apple.com @cn
+full:images.apple.com.akadns.net @cn
+full:images.apple.com.edgekey.net.globalredir.akadns.net @cn
+full:images.apple.com @cn
+full:init-p01md-lb.push-apple.com.akadns.net @cn
+full:init-p01md.apple.com @cn
+full:init-p01st-lb.push-apple.com.akadns.net @cn
+full:init-p01st.push.apple.com @cn
+full:init-s01st-lb.push-apple.com.akadns.net @cn
+full:init-s01st.push.apple.com @cn
+full:iosapps.itunes.g.aaplimg.com @cn
+full:iphone-ld.apple.com @cn
+full:is1-ssl.mzstatic.com @cn
+full:is1.mzstatic.com @cn
+full:is2-ssl.mzstatic.com @cn
+full:is2.mzstatic.com @cn
+full:is3-ssl.mzstatic.com @cn
+full:is3.mzstatic.com @cn
+full:is4-ssl.mzstatic.com @cn
+full:is4.mzstatic.com @cn
+full:is5-ssl.mzstatic.com @cn
+full:is5.mzstatic.com @cn
+full:itunes-apple.com.akadns.net @cn
+full:itunes.apple.com @cn
+full:itunesconnect.apple.com @cn
+full:mesu-cdn.apple.com.akadns.net @cn
+full:mesu-china.apple.com.akadns.net @cn
+full:mesu.apple.com @cn
+full:music.apple.com @cn
+full:ocsp-lb.apple.com.akadns.net @cn
+full:ocsp.apple.com @cn
+full:oscdn.apple.com @cn
+full:oscdn.origin-apple.com.akadns.net @cn
+full:pancake.apple.com @cn
+full:pancake.cdn-apple.com.akadns.net @cn
+full:phobos.apple.com @cn
+full:prod-support.apple-support.akadns.net @cn
+full:s.mzstatic.com @cn
+full:s1.mzstatic.com @cn
+full:s2.mzstatic.com @cn
+full:s3.mzstatic.com @cn
+full:s4.mzstatic.com @cn
+full:s5.mzstatic.com @cn
+full:stocks-sparkline-lb.apple.com.akadns.net @cn
+full:store.apple.com.edgekey.net.globalredir.akadns.net @cn
+full:store.apple.com.edgekey.net @cn
+full:store.apple.com @cn
+full:store.storeimages.apple.com.akadns.net @cn
+full:store.storeimages.cdn-apple.com @cn
+full:support-china.apple-support.akadns.net @cn
+full:support.apple.com @cn
+full:swcatalog-cdn.apple.com.akadns.net @cn
+full:swcatalog.apple.com @cn
+full:swcdn.apple.com @cn
+full:swcdn.g.aaplimg.com @cn
+full:swdist.apple.com.akadns.net @cn
+full:swdist.apple.com @cn
+full:swscan-cdn.apple.com.akadns.net @cn
+full:swscan.apple.com @cn
+full:updates-http.cdn-apple.com.akadns.net @cn
+full:updates-http.cdn-apple.com @cn
+full:valid.apple.com @cn
+full:valid.origin-apple.com.akadns.net @cn
+full:www.apple.com.edgekey.net.globalredir.akadns.net @cn
+full:www.apple.com.edgekey.net @cn
+full:www.apple.com @cn
+
 full:apple.com.akadns.net
 full:courier-push-apple.com.akadns.net
 full:push-apple.com.akadns.net
diff --git a/data/google b/data/google
index 6dfb63c9..9d931669 100644
--- a/data/google
+++ b/data/google
@@ -1,5 +1,4 @@
 # List of all domains being operated by Google Inc.
-
 include:android
 include:blogspot
 include:dart
@@ -12,12 +11,6 @@ include:polymer
 include:v8
 include:youtube
 
-# Available on China mainland
-recaptcha.net @cn
-full:fonts.googleapis.com @cn
-full:fonts.gstatic.com @cn
-full:safebrowsing.googleapis.com @cn
-
 # All .and domains
 and
 
@@ -516,3 +509,65 @@ xn--9trs65b.com # 咕果.com
 xn--flw351e.com # 谷歌.com
 xplr.co
 zukunftswerkstatt.de
+
+# Domains and services below are available in China mainland
+# Reference: https://github.com/felixonmars/dnsmasq-china-list/blob/master/google.china.conf
+# Use in config file like this: "geosite:google@cn"
+full:265.com @cn
+full:2mdn.net @cn
+full:adservice.google.com @cn
+full:app-measurement.com @cn
+full:beacons.gcp.gvt2.com @cn
+full:beacons.gvt2.com @cn
+full:beacons3.gvt2.com @cn
+full:c.admob.com @cn
+full:c.android.clients.google.com @cn
+full:cache.pack.google.com @cn
+full:checkin.gstatic.com @cn
+full:clickserve.dartsearch.net @cn
+full:clientservices.googleapis.com @cn
+full:connectivitycheck.gstatic.com @cn
+full:corp.google.com @cn
+full:crl.pki.goog @cn
+full:csi.gstatic.com @cn
+full:dl.google.com @cn
+full:dl.l.google.com @cn
+full:doubleclick.net @cn
+full:fonts.googleapis.com @cn
+full:fonts.gstatic.com @cn
+full:google-analytics.com @cn
+full:googleadservices.com @cn
+full:googleanalytics.com @cn
+full:googlesyndication.com @cn
+full:googletagmanager.com @cn
+full:googletagservices.com @cn
+full:gtm.oasisfeng.com @cn
+full:imasdk.googleapis.com @cn
+full:kh.google.com @cn
+full:khm.google.com @cn
+full:khm.googleapis.com @cn
+full:khm0.google.com @cn
+full:khm0.googleapis.com @cn
+full:khm1.google.com @cn
+full:khm1.googleapis.com @cn
+full:khm2.google.com @cn
+full:khm2.googleapis.com @cn
+full:khm3.google.com @cn
+full:khm3.googleapis.com @cn
+full:khmdb.google.com @cn
+full:khmdb.googleapis.com @cn
+full:ocsp.pki.goog @cn
+full:pagead-googlehosted.l.google.com @cn
+full:recaptcha.net @cn
+full:redirector.gvt1.com @cn
+full:safebrowsing-cache.google.com @cn
+full:safebrowsing.googleapis.com @cn
+full:ssl-google-analytics.l.google.com @cn
+full:ssl.gstatic.com @cn
+full:toolbarqueries.google.com @cn
+full:tools.google.com @cn
+full:tools.l.google.com @cn
+full:translate.googleapis.com @cn
+full:update.googleapis.com @cn
+full:www-googletagmanager.l.google.com @cn
+full:www.gstatic.com @cn