还原白名单和添加smartdns格式支持

adblock-for-dnsmasq.conf

@@ -1,7 +1,7 @@
 #TITLE=anti-AD
-#VER=20200227214003
+#VER=20200228043309
 #URL=https://github.com/privacy-protection-tools/anti-AD
-#TOTAL_LINES=32642
+#TOTAL_LINES=32645
 address=/0024aaaa.com/
 address=/0026645142c89aeb1.com/
 address=/003store.com/
@@ -30197,6 +30197,9 @@ address=/dlimg.lovfp.com/
 address=/dlres.ind9ed.com/
 address=/dm.pstatp.com/
 address=/pb3.pstatp.com/
+address=/sf1-ttcdn-tos.pstatp.com/
+address=/sf3-ttcdn-tos.pstatp.com/
+address=/sf6-ttcdn-tos.pstatp.com/
 address=/dmtu.0m31a.cn/
 address=/dn-growing.qbox.me/
 address=/do-not-tracker.org/

anti-ad-domains.txt

@@ -1,7 +1,7 @@
 #TITLE=anti-AD
-#VER=20200227214004
+#VER=20200228043309
 #URL=https://github.com/privacy-protection-tools/anti-AD
-#TOTAL_LINES=37228
+#TOTAL_LINES=37231
 0024aaaa.com
 0026645142c89aeb1.com
 003store.com
@@ -34636,6 +34636,9 @@ dlimg.lovfp.com
 dlres.ind9ed.com
 dm.pstatp.com
 pb3.pstatp.com
+sf1-ttcdn-tos.pstatp.com
+sf3-ttcdn-tos.pstatp.com
+sf6-ttcdn-tos.pstatp.com
 dmtu.0m31a.cn
 dn-growing.qbox.me
 do-not-tracker.org

anti-ad-easylist.txt

@@ -1,7 +1,7 @@
 !TITLE=anti-AD
-!VER=20200227214003
+!VER=20200228043309
 !URL=https://github.com/privacy-protection-tools/anti-AD
-!TOTAL_LINES=31450
+!TOTAL_LINES=31451
 ||201*.myhard.com^
 ||8*.tianya.cn^
 ||a*.chajiaotong.com^
@@ -113,6 +113,7 @@
 ||*log.droid4x.cn^
 ||*tsdk.vivo.com.cn^
 ||*.mmstat.com^
+||sf*-ttcdn-tos.pstatp.com^
 ||0024aaaa.com^
 ||0026645142c89aeb1.com^
 ||003store.com^

anti-ad-surge.txt

@@ -1,7 +1,7 @@
 #TITLE=anti-AD
-#VER=20200227214003
+#VER=20200228043309
 #URL=https://github.com/privacy-protection-tools/anti-AD
-#TOTAL_LINES=32642
+#TOTAL_LINES=32645
 DOMAIN-SUFFIX,0024aaaa.com
 DOMAIN-SUFFIX,0026645142c89aeb1.com
 DOMAIN-SUFFIX,003store.com
@@ -30197,6 +30197,9 @@ DOMAIN-SUFFIX,dlimg.lovfp.com
 DOMAIN-SUFFIX,dlres.ind9ed.com
 DOMAIN-SUFFIX,dm.pstatp.com
 DOMAIN-SUFFIX,pb3.pstatp.com
+DOMAIN-SUFFIX,sf1-ttcdn-tos.pstatp.com
+DOMAIN-SUFFIX,sf3-ttcdn-tos.pstatp.com
+DOMAIN-SUFFIX,sf6-ttcdn-tos.pstatp.com
 DOMAIN-SUFFIX,dmtu.0m31a.cn
 DOMAIN-SUFFIX,dn-growing.qbox.me
 DOMAIN-SUFFIX,do-not-tracker.org

lib/white_domain_list.php

@@ -80,9 +80,9 @@ return array(
     'adm.10jqka.com.cn' => 0, //修复同花顺的tips异常
     'cps.kaola.com' => 0, //考拉的cps，放行
     'iteye.com' => 0, //某编程网站
-    'sf6-ttcdn-tos.pstatp.com' =>0, //字节跳动某CDN
-    'sf1-ttcdn-tos.pstatp.com' =>0, //字节跳动某CDN
-    'sf3-ttcdn-tos.pstatp.com' =>0, //字节跳动某CDN
+//    'sf6-ttcdn-tos.pstatp.com' =>0, //字节跳动某CDN
+//    'sf1-ttcdn-tos.pstatp.com' =>0, //字节跳动某CDN
+//    'sf3-ttcdn-tos.pstatp.com' =>0, //字节跳动某CDN
 
 
     'herokuapp.com' => -1,

lib/writerFormat.class.php

@@ -120,6 +120,34 @@ class writerFormat{
         ),
     );
 
+    /*smartdns支持格式的屏蔽广告列表*/
+    const SMARTDNS = array(
+        'format' => 'address /{DOMAIN}/#',
+        'header' => "#TITLE=anti-AD for SmartDNS\n#VER={DATE}\n#URL={URL}\n#TOTAL_LINES={COUNT}\n",
+        'full_domain' => 0,
+        'name' => 'dnsmasq',
+        'filename' => 'anti-ad-smartdns.conf',
+        'whitelist_attached' => array(
+            'base-dead-hosts.txt' =>array(
+                'merge_mode' => 2, //0=单条，1=单条+子域名，2=根域名相当于1，非根域名相当于0
+            ),
+        ),
+        'src' => array(
+            'base-src-easylist.txt' => array(
+                'type' => 'easylist',
+                'strict_mode' => false,
+            ),
+            'base-src-hosts.txt' => array(
+                'type' => 'hosts',
+                'strict_mode' => false,
+            ),
+            'base-src-strict-hosts.txt' => array(
+                'type' => 'hosts',
+                'strict_mode' => true,
+            ),
+        ),
+    );
+
     /*and etc...*/
 
 }

tools/easylist-extend.php

@@ -63,6 +63,7 @@ $ARR_MERGED_WILD_LIST = array(
     '*log.droid4x.cn' => null,
     '*tsdk.vivo.com.cn' => null,
     '*.mmstat.com' => null,
+    'sf*-ttcdn-tos.pstatp.com' => null,
 );
 
 $ARR_REGEX_LIST = array(