v1.5.0-正式版

~同步最新1.9.0版本内核 ~meta核切换至dev分支版本并移除了geosite的自动下载功能 ~同步最新Geoip及CNIP数据库文件 ~同步最新Dashboard面板文件 ~DNS解析默认不再提供IPV6结果，需手动开启 ~现在将从配置文件中获取运行模式而不是固定的Rule模式 ~在线生成配置文件功能添加对vless协议的支持 ~增加了对vless协议的检测机制，优化使用体验 ~修复使用环境变量设置本机代理不生效的bug ~修复meta内核版本号显示不正常的bug ~修复部分情况下下载出错后不会正常重试的bug
v1.5.0-预览版
2022-01-31 15:01:08 +08:00 · 2022-01-31 14:39:32 +08:00 · 2022-01-30 22:19:44 +08:00 · 2022-01-30 22:07:52 +08:00 · 2022-01-30 20:54:34 +08:00 · 2022-01-30 14:41:48 +02:00
56 changed files with 38450 additions and 423 deletions
--- a/README.md
+++ b/README.md
@@ -37,10 +37,12 @@ opkg update && opkg install curl
 ##### ~Use curl:<br>

 ```Shell
-#By github
+#by github-CDN
 export url='https://raw.githubusercontent.com/juewuy/ShellClash/master' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null
-#By jsdelivrCDN
+#by jsdelivrCDN
 export url='https://cdn.jsdelivr.net/gh/juewuy/ShellClash@master' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null
+#by myserver
+export url='http://shellclash.ga/' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null
 ```

 ##### ~Use wget：<br>
--- a/README_CN.md
+++ b/README_CN.md
@@ -47,24 +47,26 @@ opkg update && opkg install curl #如已安装请忽略
 ~**使用curl安装**：<br>

 ```Shell
-#github直连
+#github-CDN源
 export url='https://raw.githubusercontent.com/juewuy/ShellClash/master' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null
 #jsdelivrCDN源
 export url='https://cdn.jsdelivr.net/gh/juewuy/ShellClash@master' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null
+#作者私人http源
+export url='http://shellclash.ga/' && sh -c "$(curl -kfsSl $url/install.sh)" && source /etc/profile &> /dev/null
 ```

 ~**使用wget安装**：<br>

 ```sh
-#Release版本-jsdelivrCDN源
+#jsdelivrCDN源
 export url='https://cdn.jsdelivr.net/gh/juewuy/ShellClash@master' && wget -q --no-check-certificate -O /tmp/install.sh $url/install.sh  && sh /tmp/install.sh && source /etc/profile &> /dev/null
 ```

 ~**使用低版本wget（提示不支持https）安装**：<br>

 ```sh
-#Test版本-酱紫表私人http源
-export url='http://sc.qust.me/' && wget -q -O /tmp/install.sh $url/install_n.sh  && sh /tmp/install.sh && source /etc/profile &> /dev/null
+#作者私人http源
+export url='http://shellclash.ga/' && wget -q -O /tmp/install.sh $url/install.sh  && sh /tmp/install.sh && source /etc/profile &> /dev/null
 ```

 ~**非root用户安装后**请额外执行以下命令以读取环境变量：<br>
--- a/bin/Country.mmdb
+++ b/bin/Country.mmdb
--- a/bin/Disney_Plus_Domains.list
+++ b/bin/Disney_Plus_Domains.list
@@ -0,0 +1,48 @@
+vod-akc-eu-south-1.media.dssott.com
+vod-vzc-eu-south-1.media.dssott.com
+vod-l3c-na-central-1.media.dssott.com
+vod-akc-na-central-1.media.dssott.com
+vod-ftc-na-central-1.media.dssott.com
+vod-vzc-na-central-1.media.dssott.com
+vod-l3c-na-east-1.media.dssott.com
+vod-bgc-na-east-1.media.dssott.com
+vod-akc-na-east-1.media.dssott.com
+vod-ftc-na-east-1.media.dssott.com
+vod-vzc-na-east-1.media.dssott.com
+vod-bgc-oc-east-1.media.dssott.com
+vod-l3c-na-west-1.media.dssott.com
+vod-akc-na-west-1.media.dssott.com
+vod-ftc-na-west-1.media.dssott.com
+vod-vzc-na-west-1.media.dssott.com
+vod-l3c-eu-south-2.media.dssott.com
+vod-ftc-eu-south-2.media.dssott.com
+vod-l3c-na-east-2.media.dssott.com
+vod-akc-na-east-2.media.dssott.com
+vod-ftc-na-east-2.media.dssott.com
+vod-vzc-na-east-2.media.dssott.com
+vod-l3c-oc-east-2.media.dssott.com
+vod-akc-oc-east-2.media.dssott.com
+vod-ftc-oc-east-2.media.dssott.com
+vod-vzc-oc-east-2.media.dssott.com
+vod-l3c-na-west-2.media.dssott.com
+vod-akc-na-west-2.media.dssott.com
+vod-llc-na-west-2.media.dssott.com
+vod-cmc-na-west-2.media.dssott.com
+vod-ftc-na-west-2.media.dssott.com
+vod-vzc-na-west-2.media.dssott.com
+cdn.registerdisney.go.com
+qa.cdn.registerdisney.go.com
+stg.cdn.registerdisney.go.com
+val.cdn.registerdisney.go.com
+prod-ripcut-delivery.disney-plus.net
+appconfigs.disney-plus.net
+prod-static.disney-plus.net
+global.edge.bamgrid.com
+bam-sdk-configs.bamgrid.com
+playback-certs.bamgrid.com
+search-api-disney.bamgrid.com
+content.global.edge.bamgrid.com
+disney.playback.edge.bamgrid.com
+disney.api.edge.bamgrid.com
+disney.content.edge.bamgrid.com
+disney.connections.edge.bamgrid.com
--- a/bin/Netflix_Domains.list
+++ b/bin/Netflix_Domains.list
@@ -0,0 +1,555 @@
+ipv4-c001-hkg001-hgc-isp.1.oca.nflxvideo.net
+ipv4-c003-hkg001-hgc-isp.1.oca.nflxvideo.net
+ipv4-c004-hkg001-hgc-isp.1.oca.nflxvideo.net
+ipv4-c001-hkg002-hgc-isp.1.oca.nflxvideo.net
+ipv4-c002-hkg002-hgc-isp.1.oca.nflxvideo.net
+ipv4-c001-hkg001-cmhk-isp.1.oca.nflxvideo.net
+ipv4-c002-hkg001-cmhk-isp.1.oca.nflxvideo.net
+ipv4-c002-hkg001-hkbn-isp.1.oca.nflxvideo.net
+ipv4-c003-hkg001-hkbn-isp.1.oca.nflxvideo.net
+ipv4-c004-hkg001-hkbn-isp.1.oca.nflxvideo.net
+ipv4-c005-hkg001-hkbn-isp.1.oca.nflxvideo.net
+ipv4-c001-hkg002-hkbn-isp.1.oca.nflxvideo.net
+ipv4-c002-hkg002-hkbn-isp.1.oca.nflxvideo.net
+ipv4-c003-hkg002-hkbn-isp.1.oca.nflxvideo.net
+ipv4-c004-hkg002-hkbn-isp.1.oca.nflxvideo.net
+ipv4-c001-hkg001-pccw-isp.1.oca.nflxvideo.net
+ipv4-c003-hkg001-pccw-isp.1.oca.nflxvideo.net
+ipv4-c004-hkg001-pccw-isp.1.oca.nflxvideo.net
+ipv4-c002-hkg002-pccw-isp.1.oca.nflxvideo.net
+ipv4-c003-hkg002-pccw-isp.1.oca.nflxvideo.net
+ipv4-c004-hkg002-pccw-isp.1.oca.nflxvideo.net
+ipv4-c005-hkg002-pccw-isp.1.oca.nflxvideo.net
+ipv4-c001-hkg003-pccw-isp.1.oca.nflxvideo.net
+ipv4-c002-hkg003-pccw-isp.1.oca.nflxvideo.net
+ipv4-c003-hkg003-pccw-isp.1.oca.nflxvideo.net
+ipv4-c004-hkg003-pccw-isp.1.oca.nflxvideo.net
+ipv4-c010-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c010-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c020-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c020-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c030-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c030-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c040-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c040-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c050-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c060-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c001-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c011-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c011-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c021-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c021-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c031-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c031-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c041-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c041-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c051-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c061-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c002-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c002-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c012-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c022-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c022-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c032-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c032-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c042-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c042-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c052-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c062-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c003-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c003-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c013-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c013-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c023-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c023-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c033-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c033-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c043-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c043-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c053-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c004-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c004-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c014-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c014-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c024-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c024-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c034-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c034-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c044-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c044-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c054-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c005-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c005-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c015-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c015-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c025-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c025-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c035-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c035-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c045-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c055-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c006-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c006-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c016-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c016-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c026-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c026-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c036-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c036-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c046-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c056-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c007-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c007-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c017-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c017-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c027-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c027-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c037-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c037-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c047-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c057-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c008-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c008-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c018-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c018-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c028-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c028-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c038-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c038-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c048-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c058-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c009-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c009-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c019-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c029-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c029-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c039-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c039-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c049-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c059-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c001-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c019-hkg001-ix.1.oca.nflxvideo.net
+ipv4-c001-sin001-starhub-isp.1.oca.nflxvideo.net
+ipv6-c001-sin001-starhub-isp.1.oca.nflxvideo.net
+ipv4-c002-sin001-starhub-isp.1.oca.nflxvideo.net
+ipv6-c002-sin001-starhub-isp.1.oca.nflxvideo.net
+ipv4-c003-sin001-starhub-isp.1.oca.nflxvideo.net
+ipv6-c003-sin001-starhub-isp.1.oca.nflxvideo.net
+ipv4-c004-sin001-starhub-isp.1.oca.nflxvideo.net
+ipv6-c004-sin001-starhub-isp.1.oca.nflxvideo.net
+ipv4-c005-sin001-starhub-isp.1.oca.nflxvideo.net
+ipv6-c005-sin001-starhub-isp.1.oca.nflxvideo.net
+ipv4-c006-sin001-starhub-isp.1.oca.nflxvideo.net
+ipv4-c010-sin001-ix.1.oca.nflxvideo.net
+ipv6-c010-sin001-ix.1.oca.nflxvideo.net
+ipv4-c020-sin001-ix.1.oca.nflxvideo.net
+ipv4-c030-sin001-ix.1.oca.nflxvideo.net
+ipv6-c030-sin001-ix.1.oca.nflxvideo.net
+ipv4-c040-sin001-ix.1.oca.nflxvideo.net
+ipv6-c040-sin001-ix.1.oca.nflxvideo.net
+ipv4-c050-sin001-ix.1.oca.nflxvideo.net
+ipv4-c060-sin001-ix.1.oca.nflxvideo.net
+ipv4-c001-sin001-ix.1.oca.nflxvideo.net
+ipv4-c011-sin001-ix.1.oca.nflxvideo.net
+ipv6-c011-sin001-ix.1.oca.nflxvideo.net
+ipv4-c021-sin001-ix.1.oca.nflxvideo.net
+ipv4-c031-sin001-ix.1.oca.nflxvideo.net
+ipv6-c031-sin001-ix.1.oca.nflxvideo.net
+ipv4-c041-sin001-ix.1.oca.nflxvideo.net
+ipv6-c041-sin001-ix.1.oca.nflxvideo.net
+ipv4-c051-sin001-ix.1.oca.nflxvideo.net
+ipv4-c061-sin001-ix.1.oca.nflxvideo.net
+ipv4-c002-sin001-ix.1.oca.nflxvideo.net
+ipv6-c002-sin001-ix.1.oca.nflxvideo.net
+ipv4-c012-sin001-ix.1.oca.nflxvideo.net
+ipv6-c012-sin001-ix.1.oca.nflxvideo.net
+ipv4-c032-sin001-ix.1.oca.nflxvideo.net
+ipv6-c032-sin001-ix.1.oca.nflxvideo.net
+ipv4-c042-sin001-ix.1.oca.nflxvideo.net
+ipv6-c042-sin001-ix.1.oca.nflxvideo.net
+ipv4-c052-sin001-ix.1.oca.nflxvideo.net
+ipv4-c062-sin001-ix.1.oca.nflxvideo.net
+ipv4-c003-sin001-ix.1.oca.nflxvideo.net
+ipv4-c013-sin001-ix.1.oca.nflxvideo.net
+ipv6-c013-sin001-ix.1.oca.nflxvideo.net
+ipv4-c033-sin001-ix.1.oca.nflxvideo.net
+ipv4-c043-sin001-ix.1.oca.nflxvideo.net
+ipv6-c043-sin001-ix.1.oca.nflxvideo.net
+ipv4-c053-sin001-ix.1.oca.nflxvideo.net
+ipv6-c053-sin001-ix.1.oca.nflxvideo.net
+ipv4-c063-sin001-ix.1.oca.nflxvideo.net
+ipv4-c004-sin001-ix.1.oca.nflxvideo.net
+ipv6-c004-sin001-ix.1.oca.nflxvideo.net
+ipv4-c014-sin001-ix.1.oca.nflxvideo.net
+ipv6-c014-sin001-ix.1.oca.nflxvideo.net
+ipv4-c034-sin001-ix.1.oca.nflxvideo.net
+ipv6-c034-sin001-ix.1.oca.nflxvideo.net
+ipv4-c044-sin001-ix.1.oca.nflxvideo.net
+ipv6-c044-sin001-ix.1.oca.nflxvideo.net
+ipv4-c054-sin001-ix.1.oca.nflxvideo.net
+ipv4-c005-sin001-ix.1.oca.nflxvideo.net
+ipv6-c005-sin001-ix.1.oca.nflxvideo.net
+ipv4-c015-sin001-ix.1.oca.nflxvideo.net
+ipv6-c015-sin001-ix.1.oca.nflxvideo.net
+ipv4-c025-sin001-ix.1.oca.nflxvideo.net
+ipv6-c025-sin001-ix.1.oca.nflxvideo.net
+ipv4-c035-sin001-ix.1.oca.nflxvideo.net
+ipv6-c035-sin001-ix.1.oca.nflxvideo.net
+ipv4-c045-sin001-ix.1.oca.nflxvideo.net
+ipv6-c045-sin001-ix.1.oca.nflxvideo.net
+ipv4-c055-sin001-ix.1.oca.nflxvideo.net
+ipv4-c006-sin001-ix.1.oca.nflxvideo.net
+ipv4-c016-sin001-ix.1.oca.nflxvideo.net
+ipv4-c026-sin001-ix.1.oca.nflxvideo.net
+ipv4-c036-sin001-ix.1.oca.nflxvideo.net
+ipv6-c036-sin001-ix.1.oca.nflxvideo.net
+ipv4-c046-sin001-ix.1.oca.nflxvideo.net
+ipv6-c046-sin001-ix.1.oca.nflxvideo.net
+ipv4-c056-sin001-ix.1.oca.nflxvideo.net
+ipv4-c007-sin001-ix.1.oca.nflxvideo.net
+ipv6-c007-sin001-ix.1.oca.nflxvideo.net
+ipv4-c017-sin001-ix.1.oca.nflxvideo.net
+ipv6-c017-sin001-ix.1.oca.nflxvideo.net
+ipv4-c027-sin001-ix.1.oca.nflxvideo.net
+ipv6-c027-sin001-ix.1.oca.nflxvideo.net
+ipv4-c037-sin001-ix.1.oca.nflxvideo.net
+ipv6-c037-sin001-ix.1.oca.nflxvideo.net
+ipv4-c047-sin001-ix.1.oca.nflxvideo.net
+ipv6-c047-sin001-ix.1.oca.nflxvideo.net
+ipv4-c057-sin001-ix.1.oca.nflxvideo.net
+ipv4-c008-sin001-ix.1.oca.nflxvideo.net
+ipv6-c008-sin001-ix.1.oca.nflxvideo.net
+ipv4-c018-sin001-ix.1.oca.nflxvideo.net
+ipv4-c028-sin001-ix.1.oca.nflxvideo.net
+ipv6-c028-sin001-ix.1.oca.nflxvideo.net
+ipv4-c038-sin001-ix.1.oca.nflxvideo.net
+ipv6-c038-sin001-ix.1.oca.nflxvideo.net
+ipv4-c048-sin001-ix.1.oca.nflxvideo.net
+ipv6-c048-sin001-ix.1.oca.nflxvideo.net
+ipv4-c058-sin001-ix.1.oca.nflxvideo.net
+ipv4-c009-sin001-ix.1.oca.nflxvideo.net
+ipv6-c009-sin001-ix.1.oca.nflxvideo.net
+ipv4-c019-sin001-ix.1.oca.nflxvideo.net
+ipv6-c019-sin001-ix.1.oca.nflxvideo.net
+ipv6-c029-sin001-ix.1.oca.nflxvideo.net
+ipv4-c039-sin001-ix.1.oca.nflxvideo.net
+ipv6-c039-sin001-ix.1.oca.nflxvideo.net
+ipv4-c049-sin001-ix.1.oca.nflxvideo.net
+ipv6-c049-sin001-ix.1.oca.nflxvideo.net
+ipv4-c059-sin001-ix.1.oca.nflxvideo.net
+ipv6-c050-sin001-ix.1.oca.nflxvideo.net
+ipv4-c029-sin001-ix.1.oca.nflxvideo.net
+ipv4-c001-xsp001-m1-isp.1.oca.nflxvideo.net
+ipv4-c002-xsp001-m1-isp.1.oca.nflxvideo.net
+ipv4-c003-xsp001-m1-isp.1.oca.nflxvideo.net
+ipv4-c001-xsp002-m1-isp.1.oca.nflxvideo.net
+ipv4-c002-xsp002-m1-isp.1.oca.nflxvideo.net
+ipv4-c003-xsp002-m1-isp.1.oca.nflxvideo.net
+ipv4-c001-xsp002-starhub-isp.1.oca.nflxvideo.net
+ipv6-c001-xsp002-starhub-isp.1.oca.nflxvideo.net
+ipv4-c003-xsp002-starhub-isp.1.oca.nflxvideo.net
+ipv6-c003-xsp002-starhub-isp.1.oca.nflxvideo.net
+ipv4-c004-xsp002-starhub-isp.1.oca.nflxvideo.net
+ipv6-c004-xsp002-starhub-isp.1.oca.nflxvideo.net
+ipv4-c005-xsp002-starhub-isp.1.oca.nflxvideo.net
+ipv6-c005-xsp002-starhub-isp.1.oca.nflxvideo.net
+ipv4-c006-xsp002-starhub-isp.1.oca.nflxvideo.net
+ipv6-c006-xsp002-starhub-isp.1.oca.nflxvideo.net
+ipv4-c007-xsp002-starhub-isp.1.oca.nflxvideo.net
+ipv4-c002-xsp003-starhub-isp.1.oca.nflxvideo.net
+ipv6-c002-xsp003-starhub-isp.1.oca.nflxvideo.net
+ipv4-c004-xsp003-starhub-isp.1.oca.nflxvideo.net
+ipv6-c004-xsp003-starhub-isp.1.oca.nflxvideo.net
+ipv4-c005-xsp003-starhub-isp.1.oca.nflxvideo.net
+ipv4-c006-xsp003-starhub-isp.1.oca.nflxvideo.net
+ipv6-c006-xsp003-starhub-isp.1.oca.nflxvideo.net
+ipv4-c007-xsp003-starhub-isp.1.oca.nflxvideo.net
+ipv4-c008-xsp003-starhub-isp.1.oca.nflxvideo.net
+ipv6-c008-xsp003-starhub-isp.1.oca.nflxvideo.net
+ipv4-c100-fra002-ix.1.oca.nflxvideo.net
+ipv4-c010-fra002-ix.1.oca.nflxvideo.net
+ipv4-c110-fra002-ix.1.oca.nflxvideo.net
+ipv4-c020-fra002-ix.1.oca.nflxvideo.net
+ipv4-c120-fra002-ix.1.oca.nflxvideo.net
+ipv4-c030-fra002-ix.1.oca.nflxvideo.net
+ipv4-c130-fra002-ix.1.oca.nflxvideo.net
+ipv4-c040-fra002-ix.1.oca.nflxvideo.net
+ipv4-c140-fra002-ix.1.oca.nflxvideo.net
+ipv4-c050-fra002-ix.1.oca.nflxvideo.net
+ipv4-c150-fra002-ix.1.oca.nflxvideo.net
+ipv4-c060-fra002-ix.1.oca.nflxvideo.net
+ipv4-c070-fra002-ix.1.oca.nflxvideo.net
+ipv4-c080-fra002-ix.1.oca.nflxvideo.net
+ipv4-c090-fra002-ix.1.oca.nflxvideo.net
+ipv4-c001-fra002-ix.1.oca.nflxvideo.net
+ipv4-c101-fra002-ix.1.oca.nflxvideo.net
+ipv4-c011-fra002-ix.1.oca.nflxvideo.net
+ipv4-c111-fra002-ix.1.oca.nflxvideo.net
+ipv4-c021-fra002-ix.1.oca.nflxvideo.net
+ipv4-c121-fra002-ix.1.oca.nflxvideo.net
+ipv4-c031-fra002-ix.1.oca.nflxvideo.net
+ipv4-c131-fra002-ix.1.oca.nflxvideo.net
+ipv4-c041-fra002-ix.1.oca.nflxvideo.net
+ipv4-c141-fra002-ix.1.oca.nflxvideo.net
+ipv4-c051-fra002-ix.1.oca.nflxvideo.net
+ipv4-c061-fra002-ix.1.oca.nflxvideo.net
+ipv4-c071-fra002-ix.1.oca.nflxvideo.net
+ipv4-c081-fra002-ix.1.oca.nflxvideo.net
+ipv4-c091-fra002-ix.1.oca.nflxvideo.net
+ipv4-c002-fra002-ix.1.oca.nflxvideo.net
+ipv4-c102-fra002-ix.1.oca.nflxvideo.net
+ipv4-c012-fra002-ix.1.oca.nflxvideo.net
+ipv4-c112-fra002-ix.1.oca.nflxvideo.net
+ipv4-c022-fra002-ix.1.oca.nflxvideo.net
+ipv4-c122-fra002-ix.1.oca.nflxvideo.net
+ipv4-c132-fra002-ix.1.oca.nflxvideo.net
+ipv4-c042-fra002-ix.1.oca.nflxvideo.net
+ipv4-c062-fra002-ix.1.oca.nflxvideo.net
+ipv4-c072-fra002-ix.1.oca.nflxvideo.net
+ipv4-c082-fra002-ix.1.oca.nflxvideo.net
+ipv4-c092-fra002-ix.1.oca.nflxvideo.net
+ipv4-c003-fra002-ix.1.oca.nflxvideo.net
+ipv4-c103-fra002-ix.1.oca.nflxvideo.net
+ipv4-c013-fra002-ix.1.oca.nflxvideo.net
+ipv4-c113-fra002-ix.1.oca.nflxvideo.net
+ipv4-c023-fra002-ix.1.oca.nflxvideo.net
+ipv4-c123-fra002-ix.1.oca.nflxvideo.net
+ipv4-c033-fra002-ix.1.oca.nflxvideo.net
+ipv4-c133-fra002-ix.1.oca.nflxvideo.net
+ipv4-c043-fra002-ix.1.oca.nflxvideo.net
+ipv4-c153-fra002-ix.1.oca.nflxvideo.net
+ipv4-c063-fra002-ix.1.oca.nflxvideo.net
+ipv4-c073-fra002-ix.1.oca.nflxvideo.net
+ipv4-c083-fra002-ix.1.oca.nflxvideo.net
+ipv4-c093-fra002-ix.1.oca.nflxvideo.net
+ipv4-c004-fra002-ix.1.oca.nflxvideo.net
+ipv4-c104-fra002-ix.1.oca.nflxvideo.net
+ipv4-c014-fra002-ix.1.oca.nflxvideo.net
+ipv4-c114-fra002-ix.1.oca.nflxvideo.net
+ipv4-c024-fra002-ix.1.oca.nflxvideo.net
+ipv4-c124-fra002-ix.1.oca.nflxvideo.net
+ipv4-c034-fra002-ix.1.oca.nflxvideo.net
+ipv4-c134-fra002-ix.1.oca.nflxvideo.net
+ipv4-c044-fra002-ix.1.oca.nflxvideo.net
+ipv4-c154-fra002-ix.1.oca.nflxvideo.net
+ipv4-c064-fra002-ix.1.oca.nflxvideo.net
+ipv4-c074-fra002-ix.1.oca.nflxvideo.net
+ipv4-c084-fra002-ix.1.oca.nflxvideo.net
+ipv4-c094-fra002-ix.1.oca.nflxvideo.net
+ipv4-c005-fra002-ix.1.oca.nflxvideo.net
+ipv4-c105-fra002-ix.1.oca.nflxvideo.net
+ipv4-c015-fra002-ix.1.oca.nflxvideo.net
+ipv4-c115-fra002-ix.1.oca.nflxvideo.net
+ipv4-c025-fra002-ix.1.oca.nflxvideo.net
+ipv4-c125-fra002-ix.1.oca.nflxvideo.net
+ipv4-c035-fra002-ix.1.oca.nflxvideo.net
+ipv4-c135-fra002-ix.1.oca.nflxvideo.net
+ipv4-c045-fra002-ix.1.oca.nflxvideo.net
+ipv4-c145-fra002-ix.1.oca.nflxvideo.net
+ipv4-c065-fra002-ix.1.oca.nflxvideo.net
+ipv4-c075-fra002-ix.1.oca.nflxvideo.net
+ipv4-c085-fra002-ix.1.oca.nflxvideo.net
+ipv4-c095-fra002-ix.1.oca.nflxvideo.net
+ipv4-c006-fra002-ix.1.oca.nflxvideo.net
+ipv4-c106-fra002-ix.1.oca.nflxvideo.net
+ipv4-c016-fra002-ix.1.oca.nflxvideo.net
+ipv4-c116-fra002-ix.1.oca.nflxvideo.net
+ipv4-c026-fra002-ix.1.oca.nflxvideo.net
+ipv4-c126-fra002-ix.1.oca.nflxvideo.net
+ipv4-c036-fra002-ix.1.oca.nflxvideo.net
+ipv4-c136-fra002-ix.1.oca.nflxvideo.net
+ipv4-c046-fra002-ix.1.oca.nflxvideo.net
+ipv4-c146-fra002-ix.1.oca.nflxvideo.net
+ipv4-c056-fra002-ix.1.oca.nflxvideo.net
+ipv4-c156-fra002-ix.1.oca.nflxvideo.net
+ipv4-c066-fra002-ix.1.oca.nflxvideo.net
+ipv4-c076-fra002-ix.1.oca.nflxvideo.net
+ipv4-c086-fra002-ix.1.oca.nflxvideo.net
+ipv4-c096-fra002-ix.1.oca.nflxvideo.net
+ipv4-c007-fra002-ix.1.oca.nflxvideo.net
+ipv4-c107-fra002-ix.1.oca.nflxvideo.net
+ipv4-c017-fra002-ix.1.oca.nflxvideo.net
+ipv4-c117-fra002-ix.1.oca.nflxvideo.net
+ipv4-c027-fra002-ix.1.oca.nflxvideo.net
+ipv4-c127-fra002-ix.1.oca.nflxvideo.net
+ipv4-c037-fra002-ix.1.oca.nflxvideo.net
+ipv4-c137-fra002-ix.1.oca.nflxvideo.net
+ipv4-c047-fra002-ix.1.oca.nflxvideo.net
+ipv4-c057-fra002-ix.1.oca.nflxvideo.net
+ipv4-c067-fra002-ix.1.oca.nflxvideo.net
+ipv4-c077-fra002-ix.1.oca.nflxvideo.net
+ipv4-c087-fra002-ix.1.oca.nflxvideo.net
+ipv4-c097-fra002-ix.1.oca.nflxvideo.net
+ipv4-c008-fra002-ix.1.oca.nflxvideo.net
+ipv4-c108-fra002-ix.1.oca.nflxvideo.net
+ipv4-c018-fra002-ix.1.oca.nflxvideo.net
+ipv4-c028-fra002-ix.1.oca.nflxvideo.net
+ipv4-c128-fra002-ix.1.oca.nflxvideo.net
+ipv4-c038-fra002-ix.1.oca.nflxvideo.net
+ipv4-c138-fra002-ix.1.oca.nflxvideo.net
+ipv4-c048-fra002-ix.1.oca.nflxvideo.net
+ipv4-c148-fra002-ix.1.oca.nflxvideo.net
+ipv4-c058-fra002-ix.1.oca.nflxvideo.net
+ipv4-c158-fra002-ix.1.oca.nflxvideo.net
+ipv4-c068-fra002-ix.1.oca.nflxvideo.net
+ipv4-c078-fra002-ix.1.oca.nflxvideo.net
+ipv4-c088-fra002-ix.1.oca.nflxvideo.net
+ipv4-c098-fra002-ix.1.oca.nflxvideo.net
+ipv4-c009-fra002-ix.1.oca.nflxvideo.net
+ipv4-c109-fra002-ix.1.oca.nflxvideo.net
+ipv4-c019-fra002-ix.1.oca.nflxvideo.net
+ipv4-c119-fra002-ix.1.oca.nflxvideo.net
+ipv4-c029-fra002-ix.1.oca.nflxvideo.net
+ipv4-c129-fra002-ix.1.oca.nflxvideo.net
+ipv4-c039-fra002-ix.1.oca.nflxvideo.net
+ipv4-c139-fra002-ix.1.oca.nflxvideo.net
+ipv4-c049-fra002-ix.1.oca.nflxvideo.net
+ipv4-c149-fra002-ix.1.oca.nflxvideo.net
+ipv4-c059-fra002-ix.1.oca.nflxvideo.net
+ipv4-c069-fra002-ix.1.oca.nflxvideo.net
+ipv4-c079-fra002-ix.1.oca.nflxvideo.net
+ipv4-c089-fra002-ix.1.oca.nflxvideo.net
+ipv4-c099-fra002-ix.1.oca.nflxvideo.net
+ipv4-c010-fra002-dev-ix.1.oca.nflxvideo.net
+ipv4-c001-fra002-dev-ix.1.oca.nflxvideo.net
+ipv4-c011-fra002-dev-ix.1.oca.nflxvideo.net
+ipv4-c002-fra002-dev-ix.1.oca.nflxvideo.net
+ipv6-c002-fra002-dev-ix.1.oca.nflxvideo.net
+ipv4-c012-fra002-dev-ix.1.oca.nflxvideo.net
+ipv4-c003-fra002-dev-ix.1.oca.nflxvideo.net
+ipv6-c003-fra002-dev-ix.1.oca.nflxvideo.net
+ipv4-c004-fra002-dev-ix.1.oca.nflxvideo.net
+ipv6-c004-fra002-dev-ix.1.oca.nflxvideo.net
+ipv4-c005-fra002-dev-ix.1.oca.nflxvideo.net
+ipv4-c006-fra002-dev-ix.1.oca.nflxvideo.net
+ipv4-c007-fra002-dev-ix.1.oca.nflxvideo.net
+ipv4-c008-fra002-dev-ix.1.oca.nflxvideo.net
+ipv4-c009-fra002-dev-ix.1.oca.nflxvideo.net
+ipv4-c151-fra002-ix.1.oca.nflxvideo.net
+ipv4-c032-fra002-ix.1.oca.nflxvideo.net
+ipv4-c142-fra002-ix.1.oca.nflxvideo.net
+ipv4-c152-fra002-ix.1.oca.nflxvideo.net
+ipv4-c143-fra002-ix.1.oca.nflxvideo.net
+ipv4-c144-fra002-ix.1.oca.nflxvideo.net
+ipv4-c155-fra002-ix.1.oca.nflxvideo.net
+ipv4-c147-fra002-ix.1.oca.nflxvideo.net
+ipv4-c157-fra002-ix.1.oca.nflxvideo.net
+ipv4-c118-fra002-ix.1.oca.nflxvideo.net
+ipv4-c003-mfm001-ctm-isp.1.oca.nflxvideo.net
+ipv4-c001-tsa001-chieftelecom-isp.1.oca.nflxvideo.net
+ipv4-c001-tsa001-cht-isp.1.oca.nflxvideo.net
+ipv4-c002-tsa001-cht-isp.1.oca.nflxvideo.net
+ipv4-c003-tsa001-cht-isp.1.oca.nflxvideo.net
+ipv4-c004-tsa001-cht-isp.1.oca.nflxvideo.net
+ipv4-c005-tsa001-cht-isp.1.oca.nflxvideo.net
+ipv4-c006-tsa001-cht-isp.1.oca.nflxvideo.net
+ipv4-c007-tsa001-cht-isp.1.oca.nflxvideo.net
+ipv4-c008-tsa001-cht-isp.1.oca.nflxvideo.net
+ipv4-c002-cjj001-lguplus-isp.1.oca.nflxvideo.net
+ipv4-c006-cjj001-lguplus-isp.1.oca.nflxvideo.net
+ipv4-c001-hlp001-im2-isp.1.oca.nflxvideo.net
+ipv4-c001-hlp001-myrepublicid-isp.1.oca.nflxvideo.net
+ipv4-c002-hlp001-myrepublicid-isp.1.oca.nflxvideo.net
+ipv4-c001-hlp001-cbn-isp.1.oca.nflxvideo.net
+ipv4-c002-hlp001-cbn-isp.1.oca.nflxvideo.net
+ipv4-c001-hlp002-linknet-isp.1.oca.nflxvideo.net
+ipv4-c002-hlp002-linknet-isp.1.oca.nflxvideo.net
+ipv4-c001-hlp003-linknet-isp.1.oca.nflxvideo.net
+ipv4-c002-hlp003-linknet-isp.1.oca.nflxvideo.net
+ipv4-c001-hlp001-mncplay-isp.1.oca.nflxvideo.net
+ipv4-c002-hlp001-mncplay-isp.1.oca.nflxvideo.net
+ipv4-c001-bdo001-starnetid-isp.1.oca.nflxvideo.net
+ipv4-c002-bdo001-starnetid-isp.1.oca.nflxvideo.net
+ipv4-c002-cgk001-moratel-isp.1.oca.nflxvideo.net
+ipv4-c001-cgk001-linknet-isp.1.oca.nflxvideo.net
+ipv4-c002-cgk001-linknet-isp.1.oca.nflxvideo.net
+ipv4-c003-cgk001-linknet-isp.1.oca.nflxvideo.net
+ipv4-c001-cgk002-linknet-isp.1.oca.nflxvideo.net
+ipv4-c002-cgk002-linknet-isp.1.oca.nflxvideo.net
+ipv4-c003-cgk002-linknet-isp.1.oca.nflxvideo.net
+ipv4-c003-cgk002-biznet-isp.1.oca.nflxvideo.net
+ipv4-c004-cgk002-biznet-isp.1.oca.nflxvideo.net
+ipv4-c001-cxp001-biznet-isp.1.oca.nflxvideo.net
+ipv4-c001-sub001-biznet-isp.1.oca.nflxvideo.net
+ipv4-c016-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c010-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c025-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c027-jnb001-ix.1.oca.nflxvideo.net
+ipv6-c001-sin001-ix.1.oca.nflxvideo.net
+ipv4-c002-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c008-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c004-jnb001-ix.1.oca.nflxvideo.net
+ipv6-c063-sin001-ix.1.oca.nflxvideo.net
+ipv6-c117-fra002-ix.1.oca.nflxvideo.net
+ipv4-c037-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c026-jnb001-ix.1.oca.nflxvideo.net
+ipv6-c124-fra002-ix.1.oca.nflxvideo.net
+ipv6-c062-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c058-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c057-sin001-ix.1.oca.nflxvideo.net
+ipv6-c051-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c108-fra002-ix.1.oca.nflxvideo.net
+ipv4-c024-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c030-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c010-osa001-ix.1.oca.nflxvideo.net
+ipv4-c020-osa001-ix.1.oca.nflxvideo.net
+ipv4-c001-osa001-ix.1.oca.nflxvideo.net
+ipv4-c011-osa001-ix.1.oca.nflxvideo.net
+ipv4-c021-osa001-ix.1.oca.nflxvideo.net
+ipv4-c002-osa001-ix.1.oca.nflxvideo.net
+ipv4-c012-osa001-ix.1.oca.nflxvideo.net
+ipv4-c022-osa001-ix.1.oca.nflxvideo.net
+ipv4-c003-osa001-ix.1.oca.nflxvideo.net
+ipv4-c013-osa001-ix.1.oca.nflxvideo.net
+ipv4-c004-osa001-ix.1.oca.nflxvideo.net
+ipv4-c014-osa001-ix.1.oca.nflxvideo.net
+ipv4-c005-osa001-ix.1.oca.nflxvideo.net
+ipv4-c015-osa001-ix.1.oca.nflxvideo.net
+ipv4-c006-osa001-ix.1.oca.nflxvideo.net
+ipv4-c016-osa001-ix.1.oca.nflxvideo.net
+ipv4-c007-osa001-ix.1.oca.nflxvideo.net
+ipv4-c017-osa001-ix.1.oca.nflxvideo.net
+ipv4-c008-osa001-ix.1.oca.nflxvideo.net
+ipv4-c018-osa001-ix.1.oca.nflxvideo.net
+ipv4-c009-osa001-ix.1.oca.nflxvideo.net
+ipv4-c019-osa001-ix.1.oca.nflxvideo.net
+ipv4-c020-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c001-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c011-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c021-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c031-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c012-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c022-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c032-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c003-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c023-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c033-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c014-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c034-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c005-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c015-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c006-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c036-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c007-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c017-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c018-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c028-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c038-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c009-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c019-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c029-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c013-jnb001-ix.1.oca.nflxvideo.net
+ipv4-c035-jnb001-ix.1.oca.nflxvideo.net
+dualstack.apiproxy-nrdp-prod-nlb-4-9fae3883a092e5c6.elb.us-west-2.amazonaws.com
+dualstack.apiproxy-nrdp-prod-nlb-2-42101415231301e4.elb.us-west-2.amazonaws.com
+dualstack.apiproxy-nrdp-prod-nlb-1-4659b24f746a127b.elb.us-west-2.amazonaws.com
+dualstack.apiproxy-nrdp-prod-nlb-3-80d1f4b305f7c0e4.elb.us-west-2.amazonaws.com
+ipv4-c002-hkg001-pccw-isp.1.oca.nflxvideo.net
+ipv6-c012-hkg001-ix.1.oca.nflxvideo.net
+ipv6-c006-sin001-starhub-isp.1.oca.nflxvideo.net
+ipv6-c026-sin001-ix.1.oca.nflxvideo.net
+ipv4-c001-cgk001-moratel-isp.1.oca.nflxvideo.net
+ipv4-c221-sjc002-ix.1.oca.nflxvideo.net
+ipv4-c204-sjc002-dev-ix.1.oca.nflxvideo.net
+ipv4-c070-lax009-ix.1.oca.nflxvideo.net
+ipv4-c024-lax009-ix.1.oca.nflxvideo.net
--- a/bin/ca-certificates.crt
+++ b/bin/ca-certificates.crt
@@ -1,7 +1,7 @@
 ##
 ## Bundle of CA Root Certificates
 ##
-## Certificate data from Mozilla as of: Sat Jun 12 22:07:57 2021 GMT
+## Certificate data from Mozilla as of: Thu Dec  9 22:21:11 2021 GMT
 ##
 ## This is a bundle of X.509 certificates of public Certificate Authorities
 ## (CA). These were automatically extracted from Mozilla's root certificates
@@ -14,7 +14,7 @@
 ## Just configure this file as the SSLCACertificateFile.
 ##
 ## Conversion done with mk-ca-bundle.pl version 1.28.
-## SHA256: e292bd4e2d500c86df45b830d89417be5c42ee670408f1d2c454c63d8a782865
+## SHA256: bb36818a81feaa4cca61101e6d6276cd09e972efcb08112dfed846918ca41d7f
 ##


@@ -156,38 +156,6 @@ Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z
 12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg==
 -----END CERTIFICATE-----

-QuoVadis Root CA
-================
-----BEGIN CERTIFICATE-----
-MIIF0DCCBLigAwIBAgIEOrZQizANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJCTTEZMBcGA1UE
-ChMQUXVvVmFkaXMgTGltaXRlZDElMCMGA1UECxMcUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0
-eTEuMCwGA1UEAxMlUXVvVmFkaXMgUm9vdCBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTAeFw0wMTAz
-MTkxODMzMzNaFw0yMTAzMTcxODMzMzNaMH8xCzAJBgNVBAYTAkJNMRkwFwYDVQQKExBRdW9WYWRp
-cyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MS4wLAYDVQQD
-EyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5MIIBIjANBgkqhkiG9w0BAQEF
-AAOCAQ8AMIIBCgKCAQEAv2G1lVO6V/z68mcLOhrfEYBklbTRvM16z/Ypli4kVEAkOPcahdxYTMuk
-J0KX0J+DisPkBgNbAKVRHnAEdOLB1Dqr1607BxgFjv2DrOpm2RgbaIr1VxqYuvXtdj182d6UajtL
-F8HVj71lODqV0D1VNk7feVcxKh7YWWVJWCCYfqtffp/p1k3sg3Spx2zY7ilKhSoGFPlU5tPaZQeL
-YzcS19Dsw3sgQUSj7cugF+FxZc4dZjH3dgEZyH0DWLaVSR2mEiboxgx24ONmy+pdpibu5cxfvWen
-AScOospUxbF6lR1xHkopigPcakXBpBlebzbNw6Kwt/5cOOJSvPhEQ+aQuwIDAQABo4ICUjCCAk4w
-PQYIKwYBBQUHAQEEMTAvMC0GCCsGAQUFBzABhiFodHRwczovL29jc3AucXVvdmFkaXNvZmZzaG9y
-ZS5jb20wDwYDVR0TAQH/BAUwAwEB/zCCARoGA1UdIASCAREwggENMIIBCQYJKwYBBAG+WAABMIH7
-MIHUBggrBgEFBQcCAjCBxxqBxFJlbGlhbmNlIG9uIHRoZSBRdW9WYWRpcyBSb290IENlcnRpZmlj
-YXRlIGJ5IGFueSBwYXJ0eSBhc3N1bWVzIGFjY2VwdGFuY2Ugb2YgdGhlIHRoZW4gYXBwbGljYWJs
-ZSBzdGFuZGFyZCB0ZXJtcyBhbmQgY29uZGl0aW9ucyBvZiB1c2UsIGNlcnRpZmljYXRpb24gcHJh
-Y3RpY2VzLCBhbmQgdGhlIFF1b1ZhZGlzIENlcnRpZmljYXRlIFBvbGljeS4wIgYIKwYBBQUHAgEW
-Fmh0dHA6Ly93d3cucXVvdmFkaXMuYm0wHQYDVR0OBBYEFItLbe3TKbkGGew5Oanwl4Rqy+/fMIGu
-BgNVHSMEgaYwgaOAFItLbe3TKbkGGew5Oanwl4Rqy+/foYGEpIGBMH8xCzAJBgNVBAYTAkJNMRkw
-FwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMSUwIwYDVQQLExxSb290IENlcnRpZmljYXRpb24gQXV0
-aG9yaXR5MS4wLAYDVQQDEyVRdW9WYWRpcyBSb290IENlcnRpZmljYXRpb24gQXV0aG9yaXR5ggQ6
-tlCLMA4GA1UdDwEB/wQEAwIBBjANBgkqhkiG9w0BAQUFAAOCAQEAitQUtf70mpKnGdSkfnIYj9lo
-fFIk3WdvOXrEql494liwTXCYhGHoG+NpGA7O+0dQoE7/8CQfvbLO9Sf87C9TqnN7Az10buYWnuul
-LsS/VidQK2K6vkscPFVcQR0kvoIgR13VRH56FmjffU1RcHhXHTMe/QKZnAzNCgVPx7uOpHX6Sm2x
-gI4JVrmcGmD+XcHXetwReNDWXcG31a0ymQM6isxUJTkxgXsTIlG6Rmyhu576BGxJJnSP0nPrzDCi
-5upZIof4l/UO/erMkqQWxFIY6iHOsfHmhIHluqmGKPJDWl0Snawe2ajlCmqnf6CHKc/yiU3U7MXi
-5nrQNiOKSnQ2+Q==
-----END CERTIFICATE-----
-
 QuoVadis Root CA 2
 ==================
 -----BEGIN CERTIFICATE-----
@@ -275,26 +243,6 @@ s58+OmJYxUmtYg5xpTKqL8aJdkNAExNnPaJUJRDL8Try2frbSVa7pv6nQTXD4IhhyYjH3zYQIphZ
 FL39vmwLAw==
 -----END CERTIFICATE-----

-Sonera Class 2 Root CA
-======================
-----BEGIN CERTIFICATE-----
-MIIDIDCCAgigAwIBAgIBHTANBgkqhkiG9w0BAQUFADA5MQswCQYDVQQGEwJGSTEPMA0GA1UEChMG
-U29uZXJhMRkwFwYDVQQDExBTb25lcmEgQ2xhc3MyIENBMB4XDTAxMDQwNjA3Mjk0MFoXDTIxMDQw
-NjA3Mjk0MFowOTELMAkGA1UEBhMCRkkxDzANBgNVBAoTBlNvbmVyYTEZMBcGA1UEAxMQU29uZXJh
-IENsYXNzMiBDQTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAJAXSjWdyvANlsdE+hY3
-/Ei9vX+ALTU74W+oZ6m/AxxNjG8yR9VBaKQTBME1DJqEQ/xcHf+Js+gXGM2RX/uJ4+q/Tl18GybT
-dXnt5oTjV+WtKcT0OijnpXuENmmz/V52vaMtmdOQTiMofRhj8VQ7Jp12W5dCsv+u8E7s3TmVToMG
-f+dJQMjFAbJUWmYdPfz56TwKnoG4cPABi+QjVHzIrviQHgCWctRUz2EjvOr7nQKV0ba5cTppCD8P
-tOFCx4j1P5iop7oc4HFx71hXgVB6XGt0Rg6DA5jDjqhu8nYybieDwnPz3BjotJPqdURrBGAgcVeH
-nfO+oJAjPYok4doh28MCAwEAAaMzMDEwDwYDVR0TAQH/BAUwAwEB/zARBgNVHQ4ECgQISqCqWITT
-XjwwCwYDVR0PBAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQBazof5FnIVV0sd2ZvnoiYw7JNn39Yt
-0jSv9zilzqsWuasvfDXLrNAPtEwr/IDva4yRXzZ299uzGxnq9LIR/WFxRL8oszodv7ND6J+/3DEI
-cbCdjdY0RzKQxmUk96BKfARzjzlvF4xytb1LyHr4e4PDKE6cCepnP7JnBBvDFNr450kkkdAdavph
-Oe9r5yF1BgfYErQhIHBCcYHaPJo2vqZbDWpsmh+Re/n570K6Tk6ezAyNlNzZRZxe7EJQY670XcSx
-EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH
-llpwrN9M
-----END CERTIFICATE-----
-
 XRamp Global CA Root
 ====================
 -----BEGIN CERTIFICATE-----
@@ -433,26 +381,6 @@ mNEVX58Svnw2Yzi9RKR/5CYrCsSXaQ3pjOLAEFe4yHYSkVXySGnYvCoCWw9E1CAx2/S6cCZdkGCe
 vEsXCS+0yx5DaMkHJ8HSXPfqIbloEpw8nL+e/IBcm2PN7EeqJSdnoDfzAIJ9VNep+OkuE6N36B9K
 -----END CERTIFICATE-----

-DST Root CA X3
-==============
-----BEGIN CERTIFICATE-----
-MIIDSjCCAjKgAwIBAgIQRK+wgNajJ7qJMDmGLvhAazANBgkqhkiG9w0BAQUFADA/MSQwIgYDVQQK
-ExtEaWdpdGFsIFNpZ25hdHVyZSBUcnVzdCBDby4xFzAVBgNVBAMTDkRTVCBSb290IENBIFgzMB4X
-DTAwMDkzMDIxMTIxOVoXDTIxMDkzMDE0MDExNVowPzEkMCIGA1UEChMbRGlnaXRhbCBTaWduYXR1
-cmUgVHJ1c3QgQ28uMRcwFQYDVQQDEw5EU1QgUm9vdCBDQSBYMzCCASIwDQYJKoZIhvcNAQEBBQAD
-ggEPADCCAQoCggEBAN+v6ZdQCINXtMxiZfaQguzH0yxrMMpb7NnDfcdAwRgUi+DoM3ZJKuM/IUmT
-rE4Orz5Iy2Xu/NMhD2XSKtkyj4zl93ewEnu1lcCJo6m67XMuegwGMoOifooUMM0RoOEqOLl5CjH9
-UL2AZd+3UWODyOKIYepLYYHsUmu5ouJLGiifSKOeDNoJjj4XLh7dIN9bxiqKqy69cK3FCxolkHRy
-xXtqqzTWMIn/5WgTe1QLyNau7Fqckh49ZLOMxt+/yUFw7BZy1SbsOFU5Q9D8/RhcQPGX69Wam40d
-utolucbY38EVAjqr2m7xPi71XAicPNaDaeQQmxkqtilX4+U9m5/wAl0CAwEAAaNCMEAwDwYDVR0T
-AQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFMSnsaR7LHH62+FLkHX/xBVghYkQ
-MA0GCSqGSIb3DQEBBQUAA4IBAQCjGiybFwBcqR7uKGY3Or+Dxz9LwwmglSBd49lZRNI+DT69ikug
-dB/OEIKcdBodfpga3csTS7MgROSR6cz8faXbauX+5v3gTt23ADq1cEmv8uXrAvHRAosZy5Q6XkjE
-GB5YGV8eAlrwDPGxrancWYaLbumR9YbK+rlmM6pZW87ipxZzR8srzJmwN0jP41ZL9c8PDHIyh8bw
-RLtTcm1D9SZImlJnt1ir/md2cXjbDaJWFBM5JDGFoqgCWjBH4d1QB7wCCZAA62RjYJsWvIjJEubS
-fZGL+T0yjWW06XyxV3bqxbYoOb8VZRzI9neWagqNdwvYkQsEjgfbKbYK7p2CNTUQ
-----END CERTIFICATE-----
-
 SwissSign Gold CA - G2
 ======================
 -----BEGIN CERTIFICATE-----
@@ -1194,27 +1122,6 @@ OR/qnuOf0GZvBeyqdn6/axag67XH/JJULysRJyU3eExRarDzzFhdFPFqSBX/wge2sY0PjlxQRrM9
 vwGYT7JZVEc+NHt4bVaTLnPqZih4zR0Uv6CPLy64Lo7yFIrM6bV8+2ydDKXhlg==
 -----END CERTIFICATE-----

-Trustis FPS Root CA
-===================
-----BEGIN CERTIFICATE-----
-MIIDZzCCAk+gAwIBAgIQGx+ttiD5JNM2a/fH8YygWTANBgkqhkiG9w0BAQUFADBFMQswCQYDVQQG
-EwJHQjEYMBYGA1UEChMPVHJ1c3RpcyBMaW1pdGVkMRwwGgYDVQQLExNUcnVzdGlzIEZQUyBSb290
-IENBMB4XDTAzMTIyMzEyMTQwNloXDTI0MDEyMTExMzY1NFowRTELMAkGA1UEBhMCR0IxGDAWBgNV
-BAoTD1RydXN0aXMgTGltaXRlZDEcMBoGA1UECxMTVHJ1c3RpcyBGUFMgUm9vdCBDQTCCASIwDQYJ
-KoZIhvcNAQEBBQADggEPADCCAQoCggEBAMVQe547NdDfxIzNjpvto8A2mfRC6qc+gIMPpqdZh8mQ
-RUN+AOqGeSoDvT03mYlmt+WKVoaTnGhLaASMk5MCPjDSNzoiYYkchU59j9WvezX2fihHiTHcDnlk
-H5nSW7r+f2C/revnPDgpai/lkQtV/+xvWNUtyd5MZnGPDNcE2gfmHhjjvSkCqPoc4Vu5g6hBSLwa
-cY3nYuUtsuvffM/bq1rKMfFMIvMFE/eC+XN5DL7XSxzA0RU8k0Fk0ea+IxciAIleH2ulrG6nS4zt
-o3Lmr2NNL4XSFDWaLk6M6jKYKIahkQlBOrTh4/L68MkKokHdqeMDx4gVOxzUGpTXn2RZEm0CAwEA
-AaNTMFEwDwYDVR0TAQH/BAUwAwEB/zAfBgNVHSMEGDAWgBS6+nEleYtXQSUhhgtx67JkDoshZzAd
-BgNVHQ4EFgQUuvpxJXmLV0ElIYYLceuyZA6LIWcwDQYJKoZIhvcNAQEFBQADggEBAH5Y//01GX2c
-GE+esCu8jowU/yyg2kdbw++BLa8F6nRIW/M+TgfHbcWzk88iNVy2P3UnXwmWzaD+vkAMXBJV+JOC
-yinpXj9WV4s4NvdFGkwozZ5BuO1WTISkQMi4sKUraXAEasP41BIy+Q7DsdwyhEQsb8tGD+pmQQ9P
-8Vilpg0ND2HepZ5dfWWhPBfnqFVO76DH7cZEf1T1o+CP8HxVIo8ptoGj4W1OLBuAZ+ytIJ8MYmHV
-l/9D7S3B2l0pKoU/rGXuhg8FjZBf3+6f9L/uHfuY5H+QK4R4EA5sSVPvFVtlRkpdr7r7OnIdzfYl
-iB6XzCGcKQENZetX2fNXlrtIzYE=
-----END CERTIFICATE-----
-
 Buypass Class 2 Root CA
 =======================
 -----BEGIN CERTIFICATE-----
@@ -3136,3 +3043,190 @@ gLWi5h+xEk8blTAKBggqhkjOPQQDAwNoADBlAjEA31SQ7Zvvi5QCkxeCmb6zniz2C5GMn0oUsfZk
 vLtoURMMA/cVi4RguYv/Uo7njLwcAjA8+RHUjE7AwWHCFUyqqx0LMV87HOIAl0Qx5v5zli/altP+
 CAezNIm8BZ/3Hobui3A=
 -----END CERTIFICATE-----
+
+GLOBALTRUST 2020
+================
+-----BEGIN CERTIFICATE-----
+MIIFgjCCA2qgAwIBAgILWku9WvtPilv6ZeUwDQYJKoZIhvcNAQELBQAwTTELMAkGA1UEBhMCQVQx
+IzAhBgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVT
+VCAyMDIwMB4XDTIwMDIxMDAwMDAwMFoXDTQwMDYxMDAwMDAwMFowTTELMAkGA1UEBhMCQVQxIzAh
+BgNVBAoTGmUtY29tbWVyY2UgbW9uaXRvcmluZyBHbWJIMRkwFwYDVQQDExBHTE9CQUxUUlVTVCAy
+MDIwMIICIjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAri5WrRsc7/aVj6B3GyvTY4+ETUWi
+D59bRatZe1E0+eyLinjF3WuvvcTfk0Uev5E4C64OFudBc/jbu9G4UeDLgztzOG53ig9ZYybNpyrO
+VPu44sB8R85gfD+yc/LAGbaKkoc1DZAoouQVBGM+uq/ufF7MpotQsjj3QWPKzv9pj2gOlTblzLmM
+CcpL3TGQlsjMH/1WljTbjhzqLL6FLmPdqqmV0/0plRPwyJiT2S0WR5ARg6I6IqIoV6Lr/sCMKKCm
+fecqQjuCgGOlYx8ZzHyyZqjC0203b+J+BlHZRYQfEs4kUmSFC0iAToexIiIwquuuvuAC4EDosEKA
+A1GqtH6qRNdDYfOiaxaJSaSjpCuKAsR49GiKweR6NrFvG5Ybd0mN1MkGco/PU+PcF4UgStyYJ9OR
+JitHHmkHr96i5OTUawuzXnzUJIBHKWk7buis/UDr2O1xcSvy6Fgd60GXIsUf1DnQJ4+H4xj04KlG
+DfV0OoIu0G4skaMxXDtG6nsEEFZegB31pWXogvziB4xiRfUg3kZwhqG8k9MedKZssCz3AwyIDMvU
+clOGvGBG85hqwvG/Q/lwIHfKN0F5VVJjjVsSn8VoxIidrPIwq7ejMZdnrY8XD2zHc+0klGvIg5rQ
+mjdJBKuxFshsSUktq6HQjJLyQUp5ISXbY9e2nKd+Qmn7OmMCAwEAAaNjMGEwDwYDVR0TAQH/BAUw
+AwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYEFNwuH9FhN3nkq9XVsxJxaD1qaJwiMB8GA1Ud
+IwQYMBaAFNwuH9FhN3nkq9XVsxJxaD1qaJwiMA0GCSqGSIb3DQEBCwUAA4ICAQCR8EICaEDuw2jA
+VC/f7GLDw56KoDEoqoOOpFaWEhCGVrqXctJUMHytGdUdaG/7FELYjQ7ztdGl4wJCXtzoRlgHNQIw
+4Lx0SsFDKv/bGtCwr2zD/cuz9X9tAy5ZVp0tLTWMstZDFyySCstd6IwPS3BD0IL/qMy/pJTAvoe9
+iuOTe8aPmxadJ2W8esVCgmxcB9CpwYhgROmYhRZf+I/KARDOJcP5YBugxZfD0yyIMaK9MOzQ0MAS
+8cE54+X1+NZK3TTN+2/BT+MAi1bikvcoskJ3ciNnxz8RFbLEAwW+uxF7Cr+obuf/WEPPm2eggAe2
+HcqtbepBEX4tdJP7wry+UUTF72glJ4DjyKDUEuzZpTcdN3y0kcra1LGWge9oXHYQSa9+pTeAsRxS
+vTOBTI/53WXZFM2KJVj04sWDpQmQ1GwUY7VA3+vA/MRYfg0UFodUJ25W5HCEuGwyEn6CMUO+1918
+oa2u1qsgEu8KwxCMSZY13At1XrFP1U80DhEgB3VDRemjEdqso5nCtnkn4rnvyOL2NSl6dPrFf4IF
+YqYK6miyeUcGbvJXqBUzxvd4Sj1Ce2t+/vdG6tHrju+IaFvowdlxfv1k7/9nR4hYJS8+hge9+6jl
+gqispdNpQ80xiEmEU5LAsTkbOYMBMMTyqfrQA71yN2BWHzZ8vTmR9W0Nv3vXkg==
+-----END CERTIFICATE-----
+
+ANF Secure Server Root CA
+=========================
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+Certum EC-384 CA
+================
+-----BEGIN CERTIFICATE-----
+MIICZTCCAeugAwIBAgIQeI8nXIESUiClBNAt3bpz9DAKBggqhkjOPQQDAzB0MQswCQYDVQQGEwJQ
+TDEhMB8GA1UEChMYQXNzZWNvIERhdGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2Vy
+dGlmaWNhdGlvbiBBdXRob3JpdHkxGTAXBgNVBAMTEENlcnR1bSBFQy0zODQgQ0EwHhcNMTgwMzI2
+MDcyNDU0WhcNNDMwMzI2MDcyNDU0WjB0MQswCQYDVQQGEwJQTDEhMB8GA1UEChMYQXNzZWNvIERh
+dGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBBdXRob3JpdHkx
+GTAXBgNVBAMTEENlcnR1bSBFQy0zODQgQ0EwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAATEKI6rGFtq
+vm5kN2PkzeyrOvfMobgOgknXhimfoZTy42B4mIF4Bk3y7JoOV2CDn7TmFy8as10CW4kjPMIRBSqn
+iBMY81CE1700LCeJVf/OTOffph8oxPBUw7l8t1Ot68KjQjBAMA8GA1UdEwEB/wQFMAMBAf8wHQYD
+VR0OBBYEFI0GZnQkdjrzife81r1HfS+8EF9LMA4GA1UdDwEB/wQEAwIBBjAKBggqhkjOPQQDAwNo
+ADBlAjADVS2m5hjEfO/JUG7BJw+ch69u1RsIGL2SKcHvlJF40jocVYli5RsJHrpka/F2tNQCMQC0
+QoSZ/6vnnvuRlydd3LBbMHHOXjgaatkl5+r3YZJW+OraNsKHZZYuciUvf9/DE8k=
+-----END CERTIFICATE-----
+
+Certum Trusted Root CA
+======================
+-----BEGIN CERTIFICATE-----
+MIIFwDCCA6igAwIBAgIQHr9ZULjJgDdMBvfrVU+17TANBgkqhkiG9w0BAQ0FADB6MQswCQYDVQQG
+EwJQTDEhMB8GA1UEChMYQXNzZWNvIERhdGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0g
+Q2VydGlmaWNhdGlvbiBBdXRob3JpdHkxHzAdBgNVBAMTFkNlcnR1bSBUcnVzdGVkIFJvb3QgQ0Ew
+HhcNMTgwMzE2MTIxMDEzWhcNNDMwMzE2MTIxMDEzWjB6MQswCQYDVQQGEwJQTDEhMB8GA1UEChMY
+QXNzZWNvIERhdGEgU3lzdGVtcyBTLkEuMScwJQYDVQQLEx5DZXJ0dW0gQ2VydGlmaWNhdGlvbiBB
+dXRob3JpdHkxHzAdBgNVBAMTFkNlcnR1bSBUcnVzdGVkIFJvb3QgQ0EwggIiMA0GCSqGSIb3DQEB
+AQUAA4ICDwAwggIKAoICAQDRLY67tzbqbTeRn06TpwXkKQMlzhyC93yZn0EGze2jusDbCSzBfN8p
+fktlL5On1AFrAygYo9idBcEq2EXxkd7fO9CAAozPOA/qp1x4EaTByIVcJdPTsuclzxFUl6s1wB52
+HO8AU5853BSlLCIls3Jy/I2z5T4IHhQqNwuIPMqw9MjCoa68wb4pZ1Xi/K1ZXP69VyywkI3C7Te2
+fJmItdUDmj0VDT06qKhF8JVOJVkdzZhpu9PMMsmN74H+rX2Ju7pgE8pllWeg8xn2A1bUatMn4qGt
+g/BKEiJ3HAVz4hlxQsDsdUaakFjgao4rpUYwBI4Zshfjvqm6f1bxJAPXsiEodg42MEx51UGamqi4
+NboMOvJEGyCI98Ul1z3G4z5D3Yf+xOr1Uz5MZf87Sst4WmsXXw3Hw09Omiqi7VdNIuJGmj8PkTQk
+fVXjjJU30xrwCSss0smNtA0Aq2cpKNgB9RkEth2+dv5yXMSFytKAQd8FqKPVhJBPC/PgP5sZ0jeJ
+P/J7UhyM9uH3PAeXjA6iWYEMspA90+NZRu0PqafegGtaqge2Gcu8V/OXIXoMsSt0Puvap2ctTMSY
+njYJdmZm/Bo/6khUHL4wvYBQv3y1zgD2DGHZ5yQD4OMBgQ692IU0iL2yNqh7XAjlRICMb/gv1SHK
+HRzQ+8S1h9E6Tsd2tTVItQIDAQABo0IwQDAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBSM+xx1
+vALTn04uSNn5YFSqxLNP+jAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZIhvcNAQENBQADggIBAEii1QAL
+LtA/vBzVtVRJHlpr9OTy4EA34MwUe7nJ+jW1dReTagVphZzNTxl4WxmB82M+w85bj/UvXgF2Ez8s
+ALnNllI5SW0ETsXpD4YN4fqzX4IS8TrOZgYkNCvozMrnadyHncI013nR03e4qllY/p0m+jiGPp2K
+h2RX5Rc64vmNueMzeMGQ2Ljdt4NR5MTMI9UGfOZR0800McD2RrsLrfw9EAUqO0qRJe6M1ISHgCq8
+CYyqOhNf6DR5UMEQGfnTKB7U0VEwKbOukGfWHwpjscWpxkIxYxeU72nLL/qMFH3EQxiJ2fAyQOaA
+4kZf5ePBAFmo+eggvIksDkc0C+pXwlM2/KfUrzHN/gLldfq5Jwn58/U7yn2fqSLLiMmq0Uc9Nneo
+WWRrJ8/vJ8HjJLWG965+Mk2weWjROeiQWMODvA8s1pfrzgzhIMfatz7DP78v3DSk+yshzWePS/Tj
+6tQ/50+6uaWTRRxmHyH6ZF5v4HaUMst19W7l9o/HuKTMqJZ9ZPskWkoDbGs4xugDQ5r3V7mzKWmT
+OPQD8rv7gmsHINFSH5pkAnuYZttcTVoP0ISVoDwUQwbKytu4QTbaakRnh6+v40URFWkIsr4WOZck
+bxJF0WddCajJFdr60qZfE2Efv4WstK2tBZQIgx51F9NxO5NQI1mg7TyRVJ12AMXDuDjb
+-----END CERTIFICATE-----
+
+TunTrust Root CA
+================
+-----BEGIN CERTIFICATE-----
+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
+-----END CERTIFICATE-----
+
+HARICA TLS RSA Root CA 2021
+===========================
+-----BEGIN CERTIFICATE-----
+MIIFpDCCA4ygAwIBAgIQOcqTHO9D88aOk8f0ZIk4fjANBgkqhkiG9w0BAQsFADBsMQswCQYDVQQG
+EwJHUjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9u
+cyBDQTEkMCIGA1UEAwwbSEFSSUNBIFRMUyBSU0EgUm9vdCBDQSAyMDIxMB4XDTIxMDIxOTEwNTUz
+OFoXDTQ1MDIxMzEwNTUzN1owbDELMAkGA1UEBhMCR1IxNzA1BgNVBAoMLkhlbGxlbmljIEFjYWRl
+bWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ0ExJDAiBgNVBAMMG0hBUklDQSBUTFMgUlNB
+IFJvb3QgQ0EgMjAyMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAIvC569lmwVnlskN
+JLnQDmT8zuIkGCyEf3dRywQRNrhe7Wlxp57kJQmXZ8FHws+RFjZiPTgE4VGC/6zStGndLuwRo0Xu
+a2s7TL+MjaQenRG56Tj5eg4MmOIjHdFOY9TnuEFE+2uva9of08WRiFukiZLRgeaMOVig1mlDqa2Y
+Ulhu2wr7a89o+uOkXjpFc5gH6l8Cct4MpbOfrqkdtx2z/IpZ525yZa31MJQjB/OCFks1mJxTuy/K
+5FrZx40d/JiZ+yykgmvwKh+OC19xXFyuQnspiYHLA6OZyoieC0AJQTPb5lh6/a6ZcMBaD9YThnEv
+dmn8kN3bLW7R8pv1GmuebxWMevBLKKAiOIAkbDakO/IwkfN4E8/BPzWr8R0RI7VDIp4BkrcYAuUR
+0YLbFQDMYTfBKnya4dC6s1BG7oKsnTH4+yPiAwBIcKMJJnkVU2DzOFytOOqBAGMUuTNe3QvboEUH
+GjMJ+E20pwKmafTCWQWIZYVWrkvL4N48fS0ayOn7H6NhStYqE613TBoYm5EPWNgGVMWX+Ko/IIqm
+haZ39qb8HOLubpQzKoNQhArlT4b4UEV4AIHrW2jjJo3Me1xR9BQsQL4aYB16cmEdH2MtiKrOokWQ
+CPxrvrNQKlr9qEgYRtaQQJKQCoReaDH46+0N0x3GfZkYVVYnZS6NRcUk7M7jAgMBAAGjQjBAMA8G
+A1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFApII6ZgpJIKM+qTW8VX6iVNvRLuMA4GA1UdDwEB/wQE
+AwIBhjANBgkqhkiG9w0BAQsFAAOCAgEAPpBIqm5iFSVmewzVjIuJndftTgfvnNAUX15QvWiWkKQU
+EapobQk1OUAJ2vQJLDSle1mESSmXdMgHHkdt8s4cUCbjnj1AUz/3f5Z2EMVGpdAgS1D0NTsY9FVq
+QRtHBmg8uwkIYtlfVUKqrFOFrJVWNlar5AWMxajaH6NpvVMPxP/cyuN+8kyIhkdGGvMA9YCRotxD
+QpSbIPDRzbLrLFPCU3hKTwSUQZqPJzLB5UkZv/HywouoCjkxKLR9YjYsTewfM7Z+d21+UPCfDtcR
+j88YxeMn/ibvBZ3PzzfF0HvaO7AWhAw6k9a+F9sPPg4ZeAnHqQJyIkv3N3a6dcSFA1pj1bF1BcK5
+vZStjBWZp5N99sXzqnTPBIWUmAD04vnKJGW/4GKvyMX6ssmeVkjaef2WdhW+o45WxLM0/L5H9MG0
+qPzVMIho7suuyWPEdr6sOBjhXlzPrjoiUevRi7PzKzMHVIf6tLITe7pTBGIBnfHAT+7hOtSLIBD6
+Alfm78ELt5BGnBkpjNxvoEppaZS3JGWg/6w/zgH7IS79aPib8qXPMThcFarmlwDB31qlpzmq6YR/
+PFGoOtmUW4y/Twhx5duoXNTSpv4Ao8YWxw/ogM4cKGR0GQjTQuPOAF1/sdwTsOEFy9EgqoZ0njnn
+kf3/W9b3raYvAwtt41dU63ZTGI0RmLo=
+-----END CERTIFICATE-----
+
+HARICA TLS ECC Root CA 2021
+===========================
+-----BEGIN CERTIFICATE-----
+MIICVDCCAdugAwIBAgIQZ3SdjXfYO2rbIvT/WeK/zjAKBggqhkjOPQQDAzBsMQswCQYDVQQGEwJH
+UjE3MDUGA1UECgwuSGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBD
+QTEkMCIGA1UEAwwbSEFSSUNBIFRMUyBFQ0MgUm9vdCBDQSAyMDIxMB4XDTIxMDIxOTExMDExMFoX
+DTQ1MDIxMzExMDEwOVowbDELMAkGA1UEBhMCR1IxNzA1BgNVBAoMLkhlbGxlbmljIEFjYWRlbWlj
+IGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ0ExJDAiBgNVBAMMG0hBUklDQSBUTFMgRUNDIFJv
+b3QgQ0EgMjAyMTB2MBAGByqGSM49AgEGBSuBBAAiA2IABDgI/rGgltJ6rK9JOtDA4MM7KKrxcm1l
+AEeIhPyaJmuqS7psBAqIXhfyVYf8MLA04jRYVxqEU+kw2anylnTDUR9YSTHMmE5gEYd103KUkE+b
+ECUqqHgtvpBBWJAVcqeht6NCMEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUyRtTgRL+BNUW
+0aq8mm+3oJUZbsowDgYDVR0PAQH/BAQDAgGGMAoGCCqGSM49BAMDA2cAMGQCMBHervjcToiwqfAi
+rcJRQO9gcS3ujwLEXQNwSaSS6sUUiHCm0w2wqsosQJz76YJumgIwK0eaB8bRwoF8yguWGEEbo/Qw
+CZ61IygNnxS2PFOiTAZpffpskcYqSUXm7LcT4Tps
+-----END CERTIFICATE-----
--- a/bin/china_ip_list.txt
+++ b/bin/china_ip_list.txt
@@ -69,6 +69,7 @@
 1.204.0.0/14
 3.5.214.0/23
 8.128.0.0/10
+13.104.184.80/28
 14.0.0.0/21
 14.0.12.0/22
 14.1.0.0/22
@@ -83,7 +84,8 @@
 14.130.0.0/15
 14.134.0.0/15
 14.144.0.0/12
-14.192.60.0/22
+14.192.61.0/24
+14.192.62.0/23
 14.192.76.0/22
 14.196.0.0/15
 14.204.0.0/15
@@ -91,9 +93,13 @@
 15.230.41.0/24
 15.230.49.0/24
 15.230.141.0/24
+17.127.128.0/23
 20.139.160.0/20
 20.249.255.0/24
 20.251.0.0/22
+20.253.4.0/24
+20.253.89.0/24
+20.255.255.0/24
 27.0.128.0/22
 27.0.132.0/24
 27.0.134.0/23
@@ -157,7 +163,6 @@
 36.51.192.0/19
 36.51.224.0/20
 36.51.240.0/21
-36.51.248.0/24
 36.51.250.0/23
 36.51.252.0/23
 36.56.0.0/13
@@ -169,7 +174,8 @@
 36.255.116.0/22
 36.255.128.0/22
 36.255.164.0/22
-36.255.172.0/22
+36.255.173.0/24
+36.255.174.0/23
 36.255.176.0/22
 39.0.0.0/24
 39.0.2.0/23
@@ -311,31 +317,47 @@
 43.0.0.0/10
 43.64.0.0/12
 43.80.0.0/13
-43.88.0.0/14
-43.92.0.0/17
-43.92.128.0/18
-43.92.240.0/20
-43.94.0.0/16
+43.88.128.0/17
+43.89.0.0/16
+43.90.0.0/15
 43.95.64.0/19
 43.95.96.0/20
 43.95.112.0/21
-43.95.128.0/18
 43.96.0.0/11
-43.130.128.0/17
-43.131.128.0/17
-43.132.8.0/21
+43.130.128.0/18
+43.131.128.0/18
+43.132.8.0/24
+43.132.10.0/23
+43.132.12.0/22
 43.132.16.0/20
 43.132.32.0/19
-43.132.68.0/22
-43.132.72.0/21
-43.132.80.0/20
-43.132.96.0/19
-43.132.128.0/17
-43.133.0.0/16
-43.134.0.0/15
+43.132.75.0/24
+43.132.78.0/23
+43.132.87.0/24
+43.132.92.0/24
+43.135.224.0/19
 43.136.0.0/13
-43.144.0.0/12
+43.144.0.0/13
+43.152.4.0/22
+43.152.8.0/23
+43.152.11.0/24
+43.152.12.0/22
+43.152.16.0/20
+43.152.32.0/20
+43.152.48.0/22
+43.152.52.0/23
+43.152.55.0/24
+43.152.57.0/24
+43.152.60.0/22
+43.152.64.0/18
+43.152.128.0/17
+43.153.64.0/18
+43.156.0.0/16
+43.157.192.0/18
+43.158.0.0/15
 43.160.0.0/11
+43.192.0.0/14
+43.196.0.0/15
 43.224.12.0/22
 43.224.24.0/22
 43.224.44.0/22
@@ -389,13 +411,14 @@
 43.228.64.0/21
 43.228.76.0/22
 43.228.100.0/22
-43.228.116.0/24
-43.228.118.0/23
+43.228.116.0/22
 43.228.132.0/22
 43.228.136.0/22
 43.228.148.0/22
 43.228.152.0/22
 43.228.188.0/22
+43.228.204.0/22
+43.228.240.0/22
 43.229.40.0/22
 43.229.48.0/22
 43.229.56.0/22
@@ -420,7 +443,15 @@
 43.231.144.0/20
 43.231.160.0/20
 43.231.176.0/21
-43.236.0.0/15
+43.236.0.0/16
+43.237.0.0/17
+43.237.128.0/18
+43.237.192.0/22
+43.237.197.0/24
+43.237.198.0/23
+43.237.200.0/21
+43.237.208.0/20
+43.237.224.0/19
 43.238.0.0/16
 43.239.0.0/19
 43.239.32.0/20
@@ -486,6 +517,7 @@
 43.246.0.0/18
 43.246.64.0/19
 43.246.96.0/22
+43.246.112.0/24
 43.246.148.0/24
 43.246.150.0/24
 43.246.228.0/22
@@ -552,9 +584,6 @@
 43.250.244.0/22
 43.251.4.0/22
 43.251.36.0/22
-43.251.69.0/24
-43.251.70.0/24
-43.251.149.0/24
 43.251.192.0/22
 43.251.232.0/22
 43.251.244.0/22
@@ -608,7 +637,7 @@
 45.40.224.0/19
 45.65.16.0/20
 45.87.53.0/24
-45.87.54.0/23
+45.87.54.0/24
 45.112.132.0/22
 45.112.188.0/22
 45.112.208.0/20
@@ -728,7 +757,8 @@
 45.125.76.0/22
 45.125.80.0/20
 45.125.96.0/21
-45.125.136.0/22
+45.125.136.0/23
+45.125.138.0/24
 45.126.48.0/21
 45.126.108.0/22
 45.126.112.0/21
@@ -862,7 +892,6 @@
 52.94.249.0/27
 52.130.0.0/15
 54.222.0.0/15
-54.231.208.0/20
 54.240.224.0/24
 58.14.0.0/15
 58.16.0.0/13
@@ -892,18 +921,13 @@
 59.80.0.0/15
 59.82.0.0/16
 59.83.0.0/18
-59.83.132.0/22
-59.83.136.0/21
 59.83.144.0/20
 59.83.160.0/20
 59.83.180.0/22
 59.83.184.0/21
 59.83.192.0/19
-59.83.224.0/20
-59.83.240.0/21
-59.83.248.0/22
-59.83.252.0/23
-59.83.254.0/24
+59.83.224.0/21
+59.83.232.0/22
 59.107.0.0/16
 59.108.0.0/14
 59.151.0.0/17
@@ -918,7 +942,7 @@
 59.153.92.0/22
 59.153.136.0/22
 59.153.152.0/22
-59.153.158.0/23
+59.153.159.0/24
 59.153.164.0/22
 59.153.168.0/21
 59.153.176.0/20
@@ -926,31 +950,7 @@
 59.155.0.0/16
 59.172.0.0/14
 59.191.0.0/17
-59.192.0.0/14
-59.196.0.0/15
-59.198.0.0/17
-59.198.128.0/22
-59.198.133.0/24
-59.198.134.0/23
-59.198.136.0/21
-59.198.144.0/20
-59.198.160.0/19
-59.198.192.0/18
-59.199.0.0/16
-59.200.0.0/13
-59.208.0.0/13
-59.216.0.0/15
-59.218.0.0/18
-59.218.64.0/19
-59.218.96.0/21
-59.218.104.0/24
-59.218.106.0/23
-59.218.108.0/22
-59.218.112.0/20
-59.218.128.0/17
-59.219.0.0/16
-59.220.0.0/14
-59.224.0.0/11
+59.192.0.0/10
 60.0.0.0/11
 60.55.0.0/16
 60.63.0.0/16
@@ -990,11 +990,11 @@
 61.232.0.0/14
 61.236.0.0/15
 61.240.0.0/14
+62.3.6.0/24
 62.234.0.0/16
 64.188.38.0/23
 64.188.40.0/22
 64.188.44.0/23
-66.90.88.0/24
 68.79.0.0/18
 69.230.192.0/18
 69.231.128.0/18
@@ -1017,7 +1017,6 @@
 101.2.172.0/22
 101.4.0.0/14
 101.16.0.0/12
-101.33.20.0/23
 101.33.128.0/17
 101.34.0.0/15
 101.36.0.0/18
@@ -1026,7 +1025,9 @@
 101.36.128.0/17
 101.37.0.0/16
 101.38.0.0/15
-101.40.0.0/13
+101.40.0.0/14
+101.45.0.0/16
+101.46.0.0/15
 101.48.0.0/15
 101.50.8.0/21
 101.50.56.0/22
@@ -1082,7 +1083,7 @@
 101.144.0.0/12
 101.192.0.0/14
 101.196.0.0/16
-101.198.0.0/23
+101.198.0.0/22
 101.198.128.0/24
 101.198.170.0/23
 101.198.172.0/22
@@ -1091,7 +1092,7 @@
 101.198.189.0/24
 101.198.190.0/23
 101.198.194.0/24
-101.198.196.0/23
+101.198.196.0/22
 101.198.200.0/22
 101.198.224.0/19
 101.199.0.0/19
@@ -1148,6 +1149,7 @@
 103.5.192.0/22
 103.5.252.0/22
 103.6.76.0/22
+103.6.108.0/22
 103.6.120.0/22
 103.6.220.0/22
 103.7.140.0/22
@@ -1170,7 +1172,6 @@
 103.10.0.0/22
 103.10.16.0/22
 103.10.84.0/22
-103.10.111.0/24
 103.10.140.0/22
 103.11.16.0/22
 103.11.168.0/22
@@ -1285,7 +1286,6 @@
 103.30.20.0/22
 103.30.96.0/22
 103.30.148.0/22
-103.30.202.0/23
 103.30.228.0/22
 103.30.236.0/22
 103.31.0.0/22
@@ -1303,6 +1303,7 @@
 103.35.32.0/20
 103.35.48.0/22
 103.35.104.0/22
+103.35.180.0/23
 103.35.220.0/22
 103.36.28.0/22
 103.36.36.0/22
@@ -1368,6 +1369,7 @@
 103.40.240.0/20
 103.41.0.0/22
 103.41.52.0/22
+103.41.116.0/22
 103.41.140.0/22
 103.41.148.0/22
 103.41.152.0/22
@@ -1503,6 +1505,8 @@
 103.56.32.0/22
 103.56.56.0/21
 103.56.72.0/21
+103.56.100.0/22
+103.56.104.0/22
 103.56.140.0/22
 103.56.152.0/22
 103.56.184.0/22
@@ -1752,7 +1756,7 @@
 103.88.60.0/22
 103.88.64.0/22
 103.88.72.0/22
-103.88.96.0/21
+103.88.96.0/22
 103.88.152.0/23
 103.88.164.0/22
 103.88.212.0/22
@@ -1813,7 +1817,6 @@
 103.94.116.0/22
 103.94.160.0/22
 103.94.200.0/22
-103.95.28.0/24
 103.95.52.0/22
 103.95.68.0/22
 103.95.88.0/21
@@ -1845,7 +1848,7 @@
 103.98.88.0/22
 103.98.100.0/22
 103.98.124.0/24
-103.98.126.0/23
+103.98.126.0/24
 103.98.136.0/21
 103.98.144.0/22
 103.98.164.0/22
@@ -1856,9 +1859,9 @@
 103.98.224.0/21
 103.98.232.0/22
 103.98.240.0/21
-103.98.248.0/23
 103.98.250.0/24
 103.98.252.0/22
+103.99.55.0/24
 103.99.56.0/22
 103.99.104.0/22
 103.99.116.0/22
@@ -2011,6 +2014,8 @@
 103.119.156.0/22
 103.119.180.0/22
 103.119.200.0/22
+103.119.224.0/23
+103.119.227.0/24
 103.120.52.0/22
 103.120.72.0/22
 103.120.76.0/24
@@ -2191,7 +2196,6 @@
 103.153.99.0/24
 103.153.114.0/23
 103.153.122.0/23
-103.153.128.0/24
 103.153.132.0/23
 103.153.146.0/23
 103.153.160.0/23
@@ -2208,7 +2212,7 @@
 103.155.34.0/23
 103.155.48.0/23
 103.155.76.0/23
-103.155.100.0/23
+103.155.101.0/24
 103.155.248.0/23
 103.156.28.0/23
 103.156.68.0/23
@@ -2229,7 +2233,7 @@
 103.158.16.0/23
 103.158.200.0/23
 103.158.224.0/23
-103.159.81.0/24
+103.159.80.0/23
 103.159.122.0/23
 103.159.124.0/23
 103.159.134.0/23
@@ -2240,13 +2244,12 @@
 103.160.254.0/23
 103.161.14.0/23
 103.161.102.0/23
-103.161.138.0/23
+103.161.139.0/24
 103.161.208.0/23
 103.161.220.0/23
 103.161.254.0/23
 103.162.10.0/23
 103.162.32.0/23
-103.162.38.0/23
 103.162.116.0/23
 103.163.28.0/23
 103.163.32.0/23
@@ -2271,6 +2274,34 @@
 103.166.242.0/23
 103.167.0.0/23
 103.167.36.0/23
+103.168.98.0/23
+103.168.170.0/23
+103.169.50.0/23
+103.169.62.0/23
+103.169.108.0/23
+103.169.162.0/23
+103.169.202.0/23
+103.169.216.0/23
+103.170.4.0/23
+103.170.134.0/23
+103.170.212.0/23
+103.171.32.0/23
+103.171.214.0/23
+103.172.32.0/23
+103.172.160.0/23
+103.172.191.0/24
+103.173.102.0/23
+103.173.182.0/23
+103.173.184.0/23
+103.174.94.0/23
+103.175.14.0/23
+103.175.114.0/23
+103.175.118.0/23
+103.176.52.0/23
+103.176.222.0/23
+103.176.244.0/23
+103.177.28.0/23
+103.177.70.0/23
 103.192.0.0/19
 103.192.48.0/21
 103.192.56.0/22
@@ -2278,7 +2309,10 @@
 103.192.88.0/21
 103.192.96.0/20
 103.192.112.0/22
-103.192.128.0/20
+103.192.128.0/21
+103.192.137.0/24
+103.192.138.0/23
+103.192.140.0/22
 103.192.144.0/22
 103.192.164.0/22
 103.192.188.0/22
@@ -2305,8 +2339,7 @@
 103.196.168.0/22
 103.196.185.0/24
 103.196.186.0/23
-103.197.181.0/24
-103.197.183.0/24
+103.197.180.0/22
 103.197.228.0/22
 103.197.253.0/24
 103.197.254.0/23
@@ -2318,8 +2351,6 @@
 103.198.156.0/22
 103.198.180.0/22
 103.198.196.0/22
-103.198.201.0/24
-103.198.202.0/23
 103.199.164.0/22
 103.199.196.0/22
 103.199.228.0/22
@@ -2404,16 +2435,18 @@
 103.208.16.0/22
 103.208.28.0/22
 103.208.48.0/22
-103.208.148.0/22
 103.209.112.0/22
 103.209.136.0/22
-103.209.200.0/22
+103.209.201.0/24
+103.209.202.0/23
 103.209.208.0/22
 103.209.216.0/22
 103.210.0.0/22
 103.210.96.0/22
 103.210.156.0/22
-103.210.160.0/19
+103.210.164.0/22
+103.210.168.0/21
+103.210.176.0/20
 103.210.217.0/24
 103.210.218.0/23
 103.211.44.0/22
@@ -2452,7 +2485,7 @@
 103.215.32.0/21
 103.215.44.0/22
 103.215.100.0/23
-103.215.108.0/22
+103.215.104.0/21
 103.215.116.0/22
 103.215.120.0/22
 103.215.140.0/22
@@ -2501,7 +2534,6 @@
 103.220.192.0/21
 103.220.200.0/22
 103.220.240.0/21
-103.221.32.0/22
 103.221.88.0/22
 103.221.96.0/19
 103.221.128.0/18
@@ -2539,11 +2571,8 @@
 103.224.220.0/22
 103.224.224.0/21
 103.224.232.0/22
-103.225.32.0/22
 103.226.40.0/22
-103.226.57.0/24
-103.226.58.0/23
-103.226.60.0/22
+103.226.56.0/21
 103.226.80.0/22
 103.226.116.0/22
 103.226.132.0/22
@@ -2610,6 +2639,7 @@
 103.234.128.0/22
 103.234.172.0/22
 103.234.180.0/22
+103.234.244.0/22
 103.235.56.0/21
 103.235.80.0/22
 103.235.85.0/24
@@ -2695,8 +2725,6 @@
 103.244.60.0/22
 103.244.64.0/20
 103.244.80.0/21
-103.244.116.0/23
-103.244.118.0/24
 103.244.164.0/22
 103.244.232.0/22
 103.244.252.0/22
@@ -2854,15 +2882,7 @@
 110.6.0.0/15
 110.16.0.0/14
 110.34.40.0/21
-110.40.0.0/15
-110.42.0.0/16
-110.43.0.0/18
-110.43.64.0/21
-110.43.72.0/22
-110.43.76.0/23
-110.43.80.0/20
-110.43.96.0/19
-110.43.128.0/17
+110.40.0.0/14
 110.44.12.0/22
 110.44.144.0/20
 110.48.0.0/16
@@ -2904,7 +2924,14 @@
 110.236.0.0/15
 110.240.0.0/12
 111.0.0.0/10
-111.66.0.0/16
+111.66.0.0/17
+111.66.128.0/19
+111.66.160.0/20
+111.66.176.0/23
+111.66.178.0/24
+111.66.180.0/22
+111.66.184.0/21
+111.66.192.0/18
 111.67.192.0/20
 111.68.64.0/19
 111.72.0.0/13
@@ -2946,7 +2973,7 @@
 112.0.0.0/10
 112.64.0.0/14
 112.73.64.0/18
-112.74.0.0/16
+112.74.0.0/15
 112.80.0.0/12
 112.96.0.0/13
 112.109.128.0/17
@@ -3017,7 +3044,11 @@
 114.31.64.0/21
 114.54.0.0/15
 114.60.0.0/14
-114.64.0.0/14
+114.64.0.0/15
+114.66.0.0/17
+114.66.160.0/19
+114.66.192.0/18
+114.67.0.0/16
 114.68.0.0/18
 114.68.64.0/19
 114.68.96.0/22
@@ -3042,6 +3073,7 @@
 114.112.96.0/20
 114.112.116.0/22
 114.112.120.0/21
+114.112.129.0/24
 114.112.136.0/21
 114.112.144.0/20
 114.112.160.0/19
@@ -3096,6 +3128,7 @@
 115.169.14.0/23
 115.169.16.0/20
 115.169.39.0/24
+115.169.40.0/24
 115.169.42.0/23
 115.169.44.0/22
 115.169.48.0/20
@@ -3215,7 +3248,7 @@
 117.53.48.0/20
 117.53.176.0/20
 117.57.0.0/16
-117.58.0.0/18
+117.58.0.0/17
 117.59.0.0/16
 117.60.0.0/14
 117.64.0.0/13
@@ -3249,6 +3282,8 @@
 118.26.40.0/21
 118.26.48.0/20
 118.26.64.0/19
+118.26.96.0/22
+118.26.103.0/24
 118.26.112.0/21
 118.26.121.0/24
 118.26.122.0/23
@@ -3257,7 +3292,7 @@
 118.26.144.0/22
 118.26.149.0/24
 118.26.150.0/23
-118.26.152.0/21
+118.26.156.0/22
 118.26.160.0/19
 118.26.192.0/18
 118.28.0.0/15
@@ -3283,8 +3318,6 @@
 118.103.164.0/22
 118.103.168.0/21
 118.103.176.0/22
-118.103.245.0/24
-118.103.246.0/23
 118.112.0.0/13
 118.120.0.0/14
 118.124.0.0/15
@@ -3307,7 +3340,12 @@
 118.184.192.0/19
 118.184.240.0/20
 118.186.0.0/15
-118.188.0.0/16
+118.188.0.0/22
+118.188.8.0/21
+118.188.16.0/20
+118.188.32.0/19
+118.188.64.0/18
+118.188.128.0/17
 118.190.0.0/16
 118.191.0.0/20
 118.191.32.0/19
@@ -3524,13 +3562,22 @@
 121.59.40.0/21
 121.59.48.0/20
 121.59.64.0/19
-121.59.96.0/20
+121.59.96.0/22
+121.59.101.0/24
+121.59.102.0/23
+121.59.104.0/23
+121.59.108.0/22
 121.59.112.0/21
 121.59.121.0/24
 121.59.122.0/23
 121.59.124.0/22
-121.59.128.0/20
-121.59.144.0/21
+121.59.128.0/21
+121.59.136.0/22
+121.59.141.0/24
+121.59.142.0/23
+121.59.145.0/24
+121.59.146.0/23
+121.59.148.0/22
 121.59.152.0/24
 121.59.154.0/23
 121.59.156.0/22
@@ -3541,7 +3588,8 @@
 121.76.0.0/15
 121.79.128.0/18
 121.89.0.0/16
-121.100.128.0/17
+121.91.104.0/21
+121.100.128.0/18
 121.101.0.0/18
 121.101.208.0/20
 121.192.0.0/13
@@ -3556,6 +3604,13 @@
 122.0.64.0/18
 122.0.128.0/17
 122.4.0.0/14
+122.8.79.0/24
+122.8.80.0/22
+122.8.86.0/23
+122.8.88.0/24
+122.8.91.0/24
+122.8.92.0/22
+122.8.128.0/17
 122.9.0.0/16
 122.10.132.0/23
 122.10.136.0/23
@@ -3570,19 +3625,7 @@
 122.48.0.0/16
 122.49.0.0/18
 122.51.0.0/16
-122.64.0.0/14
-122.68.0.0/15
-122.70.0.0/18
-122.70.64.0/19
-122.70.96.0/20
-122.70.112.0/21
-122.70.120.0/22
-122.70.124.0/23
-122.70.126.0/24
-122.70.128.0/17
-122.71.0.0/16
-122.72.0.0/13
-122.80.0.0/12
+122.64.0.0/11
 122.96.0.0/15
 122.98.144.0/20
 122.98.160.0/21
@@ -3655,16 +3698,12 @@
 123.64.0.0/11
 123.96.0.0/15
 123.98.0.0/17
-123.99.128.0/20
-123.99.144.0/22
-123.99.148.0/23
-123.99.150.0/24
-123.99.152.0/21
+123.99.128.0/19
 123.99.160.0/20
 123.99.176.0/21
 123.99.184.0/22
-123.99.188.0/23
-123.99.191.0/24
+123.99.188.0/24
+123.99.190.0/23
 123.99.192.0/18
 123.100.0.0/19
 123.100.232.0/24
@@ -3700,7 +3739,7 @@
 123.242.0.0/17
 123.242.192.0/21
 123.244.0.0/14
-123.249.0.0/16
+123.249.0.0/17
 123.253.240.0/22
 123.254.96.0/21
 124.6.64.0/18
@@ -3743,7 +3782,7 @@
 124.71.192.0/19
 124.71.224.0/20
 124.71.240.0/21
-124.71.250.0/23
+124.71.250.0/24
 124.71.252.0/22
 124.72.0.0/13
 124.88.0.0/13
@@ -3814,15 +3853,13 @@
 132.232.0.0/16
 132.237.134.0/24
 134.175.0.0/16
-135.84.254.0/23
+135.84.255.0/24
 135.159.208.0/20
 135.244.80.0/20
 137.59.59.0/24
 137.59.88.0/22
 138.32.244.0/24
-139.5.56.0/22
-139.5.61.0/24
-139.5.62.0/23
+139.5.56.0/21
 139.5.80.0/22
 139.5.92.0/22
 139.5.128.0/22
@@ -3830,7 +3867,14 @@
 139.5.192.0/22
 139.5.204.0/22
 139.5.244.0/22
-139.9.0.0/16
+139.9.0.0/18
+139.9.64.0/19
+139.9.96.0/23
+139.9.98.0/24
+139.9.100.0/22
+139.9.104.0/21
+139.9.112.0/20
+139.9.128.0/17
 139.129.0.0/16
 139.138.238.0/28
 139.148.0.0/16
@@ -3853,14 +3897,7 @@
 139.159.128.0/17
 139.170.0.0/16
 139.176.0.0/16
-139.183.0.0/17
-139.183.128.0/18
-139.183.192.0/19
-139.183.224.0/20
-139.183.241.0/24
-139.183.242.0/23
-139.183.244.0/22
-139.183.248.0/21
+139.183.0.0/16
 139.186.0.0/16
 139.189.0.0/16
 139.196.0.0/15
@@ -3870,6 +3907,7 @@
 139.198.72.0/21
 139.198.80.0/20
 139.198.96.0/20
+139.198.114.0/23
 139.198.116.0/22
 139.198.122.0/23
 139.198.124.0/22
@@ -3927,7 +3965,6 @@
 144.211.138.0/24
 144.255.0.0/16
 146.56.192.0/18
-146.88.175.0/24
 146.196.56.0/22
 146.196.68.0/22
 146.196.92.0/22
@@ -3940,6 +3977,7 @@
 147.243.13.32/27
 147.243.13.64/27
 147.243.14.32/27
+147.243.103.0/25
 148.70.0.0/16
 150.0.0.0/16
 150.115.0.0/16
@@ -3965,7 +4003,6 @@
 150.242.112.0/21
 150.242.120.0/22
 150.242.152.0/22
-150.242.158.0/24
 150.242.160.0/21
 150.242.168.0/22
 150.242.184.0/21
@@ -3976,7 +4013,6 @@
 150.242.248.0/22
 150.248.0.0/16
 150.255.0.0/16
-152.32.178.0/23
 152.104.128.0/17
 152.136.0.0/16
 153.0.0.0/16
@@ -3997,6 +4033,7 @@
 157.0.0.0/16
 157.18.0.0/16
 157.61.0.0/16
+157.119.0.0/22
 157.119.8.0/21
 157.119.16.0/22
 157.119.28.0/22
@@ -4016,7 +4053,7 @@
 157.148.0.0/16
 157.156.0.0/16
 157.255.0.0/16
-158.60.128.0/17
+158.60.0.0/16
 158.79.0.0/24
 158.79.2.0/23
 158.79.4.0/22
@@ -4043,6 +4080,7 @@
 160.202.216.0/21
 160.202.224.0/19
 160.238.64.0/22
+161.49.5.7/32
 161.120.0.0/16
 161.163.0.0/21
 161.163.28.0/23
@@ -4080,15 +4118,11 @@
 163.228.0.0/16
 163.244.246.0/24
 164.52.80.0/24
-165.84.197.0/24
-165.154.50.0/23
-165.154.52.0/22
-165.154.56.0/21
-165.154.64.0/18
+165.154.100.0/22
+165.154.104.0/21
+165.154.112.0/20
 165.154.128.0/18
 165.154.192.0/19
-165.154.250.0/23
-165.154.252.0/22
 165.156.30.0/24
 166.111.0.0/16
 167.139.0.0/16
@@ -4283,7 +4317,6 @@
 194.138.136.0/24
 194.138.202.0/23
 194.138.245.0/24
-195.142.215.0/24
 198.175.100.0/22
 198.208.17.0/24
 198.208.19.0/24
@@ -4487,7 +4520,6 @@
 202.52.143.0/24
 202.53.140.0/24
 202.53.143.0/24
-202.53.202.0/24
 202.57.212.0/22
 202.57.216.0/22
 202.57.240.0/20
@@ -4673,7 +4705,12 @@
 202.158.242.0/24
 202.160.140.0/22
 202.160.156.0/22
-202.160.176.64/26
+202.160.176.64/29
+202.160.176.72/30
+202.160.176.76/32
+202.160.176.78/31
+202.160.176.80/28
+202.160.176.96/27
 202.160.176.128/25
 202.160.177.0/24
 202.160.178.0/23
@@ -5425,7 +5462,6 @@
 203.34.161.0/24
 203.34.162.0/24
 203.34.187.0/24
-203.34.197.0/24
 203.34.198.0/24
 203.34.204.0/22
 203.34.232.0/24
@@ -5548,7 +5584,6 @@
 203.86.250.0/24
 203.86.254.0/23
 203.88.32.0/19
-203.88.100.0/22
 203.88.192.0/19
 203.89.0.0/22
 203.89.136.0/22
@@ -5630,8 +5665,7 @@
 203.130.56.0/22
 203.130.60.0/23
 203.132.32.0/19
-203.134.240.0/22
-203.134.246.0/23
+203.134.240.0/21
 203.135.96.0/19
 203.135.160.0/20
 203.142.12.0/23
@@ -5806,11 +5840,9 @@
 211.155.68.0/24
 211.155.72.0/21
 211.155.80.0/20
-211.155.97.0/24
-211.155.98.0/23
-211.155.100.0/22
-211.155.104.0/21
-211.155.113.0/24
+211.155.96.0/20
+211.155.112.0/23
+211.155.114.0/24
 211.155.116.0/22
 211.155.120.0/21
 211.155.128.0/17
@@ -5827,7 +5859,7 @@
 212.64.0.0/17
 212.129.128.0/17
 213.199.169.0/24
-213.255.230.0/23
+213.255.231.0/24
 218.0.0.0/12
 218.16.0.0/13
 218.24.0.0/14
@@ -5842,7 +5874,8 @@
 218.98.0.0/18
 218.98.77.0/24
 218.98.78.0/23
-218.98.80.0/20
+218.98.80.0/24
+218.98.92.0/22
 218.98.96.0/22
 218.98.100.0/24
 218.98.102.0/23
@@ -5912,8 +5945,7 @@
 220.155.32.0/19
 220.155.64.0/18
 220.155.128.0/17
-220.158.241.0/24
-220.158.243.0/24
+220.158.240.0/22
 220.160.0.0/11
 220.192.0.0/12
 220.231.0.0/18
@@ -5944,12 +5976,19 @@
 220.242.134.0/23
 220.242.173.0/24
 220.242.183.0/24
-220.242.197.0/24
-220.242.205.0/24
-220.242.207.0/24
-220.242.217.0/24
-220.242.218.0/23
-220.242.220.0/22
+220.242.185.0/24
+220.242.186.0/24
+220.242.188.0/23
+220.242.190.0/24
+220.242.192.0/24
+220.242.196.0/22
+220.242.200.0/24
+220.242.202.0/23
+220.242.204.0/22
+220.242.209.0/24
+220.242.210.0/23
+220.242.214.0/24
+220.242.216.0/21
 220.242.224.0/19
 220.243.0.0/17
 220.243.128.0/18
@@ -6026,6 +6065,7 @@
 222.126.174.76/30
 222.126.174.88/29
 222.126.174.144/28
+222.126.176.0/29
 222.126.178.0/23
 222.126.180.0/22
 222.126.184.0/21
@@ -6064,6 +6104,7 @@
 223.166.0.0/15
 223.192.0.0/15
 223.198.0.0/15
+223.201.0.0/22
 223.201.8.0/21
 223.201.16.0/20
 223.201.32.0/19
--- a/bin/clash.meta/clash-linux-amd64
+++ b/bin/clash.meta/clash-linux-amd64
--- a/bin/clash.meta/clash-linux-armv5
+++ b/bin/clash.meta/clash-linux-armv5
--- a/bin/clash.meta/clash-linux-armv7
+++ b/bin/clash.meta/clash-linux-armv7
--- a/bin/clash.meta/clash-linux-armv8
+++ b/bin/clash.meta/clash-linux-armv8
--- a/bin/clash.meta/clash-linux-mips-softfloat
+++ b/bin/clash.meta/clash-linux-mips-softfloat
--- a/bin/clash.meta/clash-linux-mipsle-hardfloat
+++ b/bin/clash.meta/clash-linux-mipsle-hardfloat
--- a/bin/clash.meta/clash-linux-mipsle-softfloat
+++ b/bin/clash.meta/clash-linux-mipsle-softfloat
--- a/bin/clash.net/clash-linux-386
+++ b/bin/clash.net/clash-linux-386
--- a/bin/clash.net/clash-linux-amd64
+++ b/bin/clash.net/clash-linux-amd64
--- a/bin/clash.net/clash-linux-armv5
+++ b/bin/clash.net/clash-linux-armv5
--- a/bin/clash.net/clash-linux-armv7
+++ b/bin/clash.net/clash-linux-armv7
--- a/bin/clash.net/clash-linux-armv8
+++ b/bin/clash.net/clash-linux-armv8
--- a/bin/clash.net/clash-linux-mips-softfloat
+++ b/bin/clash.net/clash-linux-mips-softfloat
--- a/bin/clash.net/clash-linux-mipsle-hardfloat
+++ b/bin/clash.net/clash-linux-mipsle-hardfloat
--- a/bin/clash.net/clash-linux-mipsle-softfloat
+++ b/bin/clash.net/clash-linux-mipsle-softfloat
--- a/bin/clash/clash-linux-386
+++ b/bin/clash/clash-linux-386
--- a/bin/clash/clash-linux-amd64
+++ b/bin/clash/clash-linux-amd64
--- a/bin/clash/clash-linux-armv5
+++ b/bin/clash/clash-linux-armv5
--- a/bin/clash/clash-linux-armv7
+++ b/bin/clash/clash-linux-armv7
--- a/bin/clash/clash-linux-armv8
+++ b/bin/clash/clash-linux-armv8
--- a/bin/clash/clash-linux-mips-softfloat
+++ b/bin/clash/clash-linux-mips-softfloat
--- a/bin/clash/clash-linux-mipsle-hardfloat
+++ b/bin/clash/clash-linux-mipsle-hardfloat
--- a/bin/clash/clash-linux-mipsle-softfloat
+++ b/bin/clash/clash-linux-mipsle-softfloat
--- a/bin/clashdb.tar.gz
+++ b/bin/clashdb.tar.gz
--- a/bin/clashfm.tar.gz
+++ b/bin/clashfm.tar.gz
--- a/bin/clashpre/clash-linux-386
+++ b/bin/clashpre/clash-linux-386
--- a/bin/clashpre/clash-linux-amd64
+++ b/bin/clashpre/clash-linux-amd64
--- a/bin/clashpre/clash-linux-armv5
+++ b/bin/clashpre/clash-linux-armv5
--- a/bin/clashpre/clash-linux-armv7
+++ b/bin/clashpre/clash-linux-armv7
--- a/bin/clashpre/clash-linux-armv8
+++ b/bin/clashpre/clash-linux-armv8
--- a/bin/clashpre/clash-linux-mips-softfloat
+++ b/bin/clashpre/clash-linux-mips-softfloat
--- a/bin/clashpre/clash-linux-mipsle-hardfloat
+++ b/bin/clashpre/clash-linux-mipsle-hardfloat
--- a/bin/clashpre/clash-linux-mipsle-softfloat
+++ b/bin/clashpre/clash-linux-mipsle-softfloat
--- a/bin/cn_mini.mmdb
+++ b/bin/cn_mini.mmdb
--- a/bin/geosite.dat
+++ b/bin/geosite.dat
--- a/bin/release_version
+++ b/bin/release_version
@@ -1,4 +1,4 @@
-1.4.3
+1.5.0
 1.3.0
 1.2.0
 1.1.0
--- a/bin/version
+++ b/bin/version
@@ -1,4 +1,6 @@
-GeoIP_v=20210709
-clash_v=1.6.5
-clashpre_v=2021.07.03
-versionsh=1.4.3
+clashnet_v=1.7.6
+GeoIP_v=202201280303
+clashpre_v=2022.01.27
+clash_v=1.9.0
+meta_v=1.9.0dev
+versionsh=1.5.0
--- a/bin/yacd.tar.gz
+++ b/bin/yacd.tar.gz
--- a/install.sh
+++ b/install.sh
@@ -11,6 +11,7 @@ echo "**                             by  Juewuy    **"
 echo "***********************************************"

 [ -f "/etc/storage/started_script.sh" ] && systype=Padavan && initdir='/etc/storage/started_script.sh'
+[ -d "/jffs/scripts" ] && systype=asusrouter && initdir='/jffs/scripts/net-start'
 [ -f "/jffs/.asusrouter" ] && systype=asusrouter && initdir='/jffs/.asusrouter'
 #检查root权限
 if [ "$USER" != "root" -a -z "$systype" ];then
@@ -27,6 +28,7 @@ webget(){
 		[ "$3" = "echooff" ] && progress='-s' || progress='-#'
 		[ -z "$4" ] && redirect='-L' || redirect=''
 		result=$(curl -w %{http_code} --connect-timeout 5 $progress $redirect -ko $1 $2)
+		[ -z $(echo $result | grep -e ^2) && result="200"
 	else
 		if wget --version > /dev/null 2>&1;then
 			[ "$3" = "echooff" ] && progress='-q' || progress='-q --show-progress'
@@ -71,7 +73,7 @@ tarurl=$url2/bin/clashfm.tar.gz

 gettar(){
 	webget /tmp/clashfm.tar.gz $tarurl
-	[ "$result" != "200" ] && echo "文件下载失败！" && exit 1
+	[ "$result" != "200" ] && echo "文件下载失败,请尝试使用其他安装源！" && exit 1
 	$clashdir/start.sh stop 2>/dev/null
 	#解压
 	echo -----------------------------------------------
--- a/rules/ShellClash.ini
+++ b/rules/ShellClash.ini
@@ -0,0 +1,41 @@
+[custom]
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+ruleset=🛑 广告拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
+ruleset=🛑 广告拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+ruleset=🎥 奈飞解锁,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Netflix.list
+ruleset=🎥 奈飞解锁,https://raw.githubusercontent.com/LM-Firefly/Rules/master/Global-Services/Netflix.list
+ruleset=🎥 奈飞解锁,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/DisneyPlus.list
+ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Microsoft.list
+ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
+ruleset=📲 电报消息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+ruleset=🎯 全球直连,[]GEOIP,CN
+ruleset=🐟 漏网之鱼,[]FINAL
+
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]📺 省流节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🇺🇲 美国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=🚀 手动切换`select`.*
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=🛑 广告拦截`select`[]DIRECT`[]REJECT
+custom_proxy_group=📲 电报消息`select`[]🚀 节点选择`[]♻️ 自动选择`[]📺 省流节点`[]🇸🇬 新加坡节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇰 日韩节点`[]🇺🇲 美国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=📢 谷歌FCM`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🚀 手动切换
+custom_proxy_group=🎥 奈飞解锁`select`[]🎥 流媒体解锁`[]🇸🇬 新加坡节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇰 日韩节点`[]🇺🇲 美国节点`[]🚀 节点选择
+custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]📺 省流节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🇺🇲 美国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=Ⓜ️ 微软服务`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🚀 手动切换
+custom_proxy_group=🍎 苹果服务`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🚀 手动切换
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
+custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]♻️ 自动选择`[]DIRECT`[]📺 省流节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🇺🇲 美国节点`[]🚀 手动切换
+custom_proxy_group=🎥 流媒体解锁`select`(NF|奈飞|解锁|Netflix|NETFLIX|Media)`[]🇸🇬 新加坡节点
+custom_proxy_group=📺 省流节点`url-test`(0\.[0-5]|低倍率|省流|大流量)`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=🇭🇰 香港节点`url-test`(港|HK|Hong Kong)`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=🇯🇰 日韩节点`url-test`(日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan|KR|Korea|KOR|首尔|韩|韓)`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=🇺🇲 美国节点`url-test`(美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States)`http://www.gstatic.com/generate_204`300,,150
+custom_proxy_group=🇨🇳 台湾节点`url-test`(台|新北|彰化|TW|Taiwan)`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=🇸🇬 新加坡节点`url-test`(新加坡|坡|狮城|SG|Singapore)`http://www.gstatic.com/generate_204`300,,50
+
+enable_rule_generator=true
+overwrite_original_rules=true
--- a/rules/ShellClash_Block.ini
+++ b/rules/ShellClash_Block.ini
@@ -0,0 +1,46 @@
+[custom]
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+ruleset=🛑 广告拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
+ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+ruleset=🆎 增强拦截,rules/ACL4SSR/Clash/BanEasyList.list
+ruleset=🆎 增强拦截,rules/ACL4SSR/Clash/BanEasyListChina.list
+ruleset=🆎 增强拦截,rules/ACL4SSR/Clash/BanEasyPrivacy.list
+ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+ruleset=🎥 奈飞解锁,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Netflix.list
+ruleset=🎥 奈飞解锁,https://raw.githubusercontent.com/LM-Firefly/Rules/master/Global-Services/Netflix.list
+ruleset=🎥 奈飞解锁,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/DisneyPlus.list
+ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Microsoft.list
+ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
+ruleset=📲 电报消息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+ruleset=🎯 全球直连,[]GEOIP,CN
+ruleset=🐟 漏网之鱼,[]FINAL
+
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]📺 省流节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🇺🇲 美国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=🚀 手动切换`select`.*
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=🛑 广告拦截`select`[]REJECT`[]DIRECT
+custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
+custom_proxy_group=🆎 增强拦截`select`[]DIRECT`[]REJECT
+custom_proxy_group=📲 电报消息`select`[]🚀 节点选择`[]♻️ 自动选择`[]📺 省流节点`[]🇸🇬 新加坡节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇰 日韩节点`[]🇺🇲 美国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=📢 谷歌FCM`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🚀 手动切换
+custom_proxy_group=🎥 奈飞解锁`select`[]🎥 流媒体解锁`[]🇸🇬 新加坡节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇰 日韩节点`[]🇺🇲 美国节点`[]🚀 节点选择
+custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]📺 省流节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🇺🇲 美国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=Ⓜ️ 微软服务`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🚀 手动切换
+custom_proxy_group=🍎 苹果服务`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🚀 手动切换
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
+custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]♻️ 自动选择`[]DIRECT`[]📺 省流节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🇺🇲 美国节点`[]🚀 手动切换
+custom_proxy_group=🎥 流媒体解锁`select`(NF|奈飞|解锁|Netflix|NETFLIX|Media)`[]🇸🇬 新加坡节点
+custom_proxy_group=📺 省流节点`url-test`(0\.[0-5]|低倍率|省流|大流量)`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=🇭🇰 香港节点`url-test`(港|HK|Hong Kong)`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=🇯🇰 日韩节点`url-test`(日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan|KR|Korea|KOR|首尔|韩|韓)`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=🇺🇲 美国节点`url-test`(美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States)`http://www.gstatic.com/generate_204`300,,150
+custom_proxy_group=🇨🇳 台湾节点`url-test`(台|新北|彰化|TW|Taiwan)`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=🇸🇬 新加坡节点`url-test`(新加坡|坡|狮城|SG|Singapore)`http://www.gstatic.com/generate_204`300,,50
+
+enable_rule_generator=true
+overwrite_original_rules=true
--- a/rules/ShellClash_Full.ini
+++ b/rules/ShellClash_Full.ini
@@ -0,0 +1,56 @@
+[custom]
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
+ruleset=🛑 广告拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
+ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+ruleset=🎥 奈飞解锁,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Netflix.list
+ruleset=🎥 奈飞解锁,https://raw.githubusercontent.com/LM-Firefly/Rules/master/Global-Services/Netflix.list
+ruleset=🎥 奈飞解锁,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/DisneyPlus.list
+ruleset=📺 哔哩哔哩,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/BilibiliHMT.list
+ruleset=📺 哔哩哔哩,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bilibili.list
+ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Microsoft.list
+ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
+ruleset=📲 电报消息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+ruleset=🎮 外服游戏,https://raw.githubusercontent.com/LM-Firefly/Rules/master/Game.list
+ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+ruleset=🌏 国内媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaMedia.list
+ruleset=🎶 网易音乐,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/NetEaseMusic.list
+ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
+ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Download.list
+ruleset=🎯 全球直连,[]GEOIP,CN
+ruleset=🐟 漏网之鱼,[]FINAL
+
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]📺 省流节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🇺🇲 美国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=🚀 手动切换`select`.*
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=🛑 广告拦截`select`[]DIRECT`[]REJECT
+custom_proxy_group=🍃 应用净化`select`[]DIRECT`[]REJECT
+custom_proxy_group=🎮 外服游戏`select`[]🎯 全球直连`[]🎮 游戏节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🇺🇲 美国节点`[]🚀 手动切换
+custom_proxy_group=📲 电报消息`select`[]🚀 节点选择`[]♻️ 自动选择`[]📺 省流节点`[]🇸🇬 新加坡节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇰 日韩节点`[]🇺🇲 美国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=📢 谷歌FCM`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🚀 手动切换
+custom_proxy_group=🎥 奈飞解锁`select`[]🎥 流媒体解锁`[]🇸🇬 新加坡节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇰 日韩节点`[]🇺🇲 美国节点`[]🚀 节点选择
+custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]📺 省流节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🇺🇲 美国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=🌏 国内媒体`select`[]DIRECT`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🚀 手动切换
+custom_proxy_group=📺 哔哩哔哩`select`[]🎯 全球直连`[]🇨🇳 台湾节点`[]🇭🇰 香港节点
+custom_proxy_group=Ⓜ️ 微软服务`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🚀 手动切换
+custom_proxy_group=🍎 苹果服务`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🚀 手动切换
+custom_proxy_group=📺 巴哈姆特`select`[]🇨🇳 台湾节点`[]🚀 节点选择`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=🎶 网易音乐`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择`(网易|音乐|解锁|Music|NetEase)
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
+custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]♻️ 自动选择`[]DIRECT`[]📺 省流节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🇺🇲 美国节点`[]🚀 手动切换
+custom_proxy_group=🎮 游戏节点`select`(游戏|Game|game|加速)`
+custom_proxy_group=🎥 流媒体解锁`select`(NF|奈飞|解锁|Netflix|NETFLIX|Media)`[]🇸🇬 新加坡节点
+custom_proxy_group=📺 省流节点`url-test`(0\.[0-5]|低倍率|省流|大流量)`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=🇭🇰 香港节点`url-test`(港|HK|Hong Kong)`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=🇯🇰 日韩节点`url-test`(日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan|KR|Korea|KOR|首尔|韩|韓)`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=🇺🇲 美国节点`url-test`(美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States)`http://www.gstatic.com/generate_204`300,,150
+custom_proxy_group=🇨🇳 台湾节点`url-test`(台|新北|彰化|TW|Taiwan)`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=🇸🇬 新加坡节点`url-test`(新加坡|坡|狮城|SG|Singapore)`http://www.gstatic.com/generate_204`300,,50
+
+enable_rule_generator=true
+overwrite_original_rules=true
--- a/rules/ShellClash_Full_Block.ini
+++ b/rules/ShellClash_Full_Block.ini
@@ -0,0 +1,62 @@
+[custom]
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/UnBan.list
+ruleset=🛑 广告拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
+ruleset=🍃 应用净化,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+ruleset=🆎 增强拦截,rules/ACL4SSR/Clash/BanEasyList.list
+ruleset=🆎 增强拦截,rules/ACL4SSR/Clash/BanEasyListChina.list
+ruleset=🆎 增强拦截,rules/ACL4SSR/Clash/BanEasyPrivacy.list
+ruleset=📢 谷歌FCM,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/GoogleFCM.list
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+ruleset=🎥 奈飞解锁,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Netflix.list
+ruleset=🎥 奈飞解锁,https://raw.githubusercontent.com/LM-Firefly/Rules/master/Global-Services/Netflix.list
+ruleset=🎥 奈飞解锁,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/DisneyPlus.list
+ruleset=📺 哔哩哔哩,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/BilibiliHMT.list
+ruleset=📺 哔哩哔哩,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bilibili.list
+ruleset=Ⓜ️ 微软服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Microsoft.list
+ruleset=🍎 苹果服务,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Apple.list
+ruleset=📲 电报消息,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Telegram.list
+ruleset=🎮 外服游戏,https://raw.githubusercontent.com/LM-Firefly/Rules/master/Game.list
+ruleset=🌍 国外媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyMedia.list
+ruleset=🌏 国内媒体,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaMedia.list
+ruleset=🎶 网易音乐,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/NetEaseMusic.list
+ruleset=📺 巴哈姆特,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Bahamut.list
+ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Download.list
+ruleset=🎯 全球直连,[]GEOIP,CN
+ruleset=🐟 漏网之鱼,[]FINAL
+
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]📺 省流节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🇺🇲 美国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=🚀 手动切换`select`.*
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=🛑 广告拦截`select`[]REJECT`[]DIRECT
+custom_proxy_group=🍃 应用净化`select`[]REJECT`[]DIRECT
+custom_proxy_group=🆎 增强拦截`select`[]DIRECT`[]REJECT
+custom_proxy_group=🎮 外服游戏`select`[]🎯 全球直连`[]🎮 游戏节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🇺🇲 美国节点`[]🚀 手动切换
+custom_proxy_group=📲 电报消息`select`[]🚀 节点选择`[]♻️ 自动选择`[]📺 省流节点`[]🇸🇬 新加坡节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇰 日韩节点`[]🇺🇲 美国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=📢 谷歌FCM`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🚀 手动切换
+custom_proxy_group=🎥 奈飞解锁`select`[]🎥 流媒体解锁`[]🇸🇬 新加坡节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇯🇰 日韩节点`[]🇺🇲 美国节点`[]🚀 节点选择
+custom_proxy_group=🌍 国外媒体`select`[]🚀 节点选择`[]♻️ 自动选择`[]📺 省流节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🇺🇲 美国节点`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=🌏 国内媒体`select`[]DIRECT`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🚀 手动切换
+custom_proxy_group=📺 哔哩哔哩`select`[]🎯 全球直连`[]🇨🇳 台湾节点`[]🇭🇰 香港节点
+custom_proxy_group=Ⓜ️ 微软服务`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🚀 手动切换
+custom_proxy_group=🍎 苹果服务`select`[]DIRECT`[]🚀 节点选择`[]🇺🇲 美国节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🚀 手动切换
+custom_proxy_group=📺 巴哈姆特`select`[]🇨🇳 台湾节点`[]🚀 节点选择`[]🚀 手动切换`[]DIRECT
+custom_proxy_group=🎶 网易音乐`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择`(网易|音乐|解锁|Music|NetEase)
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
+custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]♻️ 自动选择`[]DIRECT`[]📺 省流节点`[]🇭🇰 香港节点`[]🇨🇳 台湾节点`[]🇸🇬 新加坡节点`[]🇯🇰 日韩节点`[]🇺🇲 美国节点`[]🚀 手动切换
+custom_proxy_group=🎮 游戏节点`select`(游戏|Game|game|加速)`
+custom_proxy_group=🎥 流媒体解锁`select`(NF|奈飞|解锁|Netflix|NETFLIX|Media)`[]🇸🇬 新加坡节点
+custom_proxy_group=📺 省流节点`url-test`(0\.[0-5]|低倍率|省流|大流量)`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=🇭🇰 香港节点`url-test`(港|HK|Hong Kong)`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=🇯🇰 日韩节点`url-test`(日本|川日|东京|大阪|泉日|埼玉|沪日|深日|[^-]日|JP|Japan|KR|Korea|KOR|首尔|韩|韓)`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=🇺🇲 美国节点`url-test`(美|波特兰|达拉斯|俄勒冈|凤凰城|费利蒙|硅谷|拉斯维加斯|洛杉矶|圣何塞|圣克拉拉|西雅图|芝加哥|US|United States)`http://www.gstatic.com/generate_204`300,,150
+custom_proxy_group=🇨🇳 台湾节点`url-test`(台|新北|彰化|TW|Taiwan)`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=🇸🇬 新加坡节点`url-test`(新加坡|坡|狮城|SG|Singapore)`http://www.gstatic.com/generate_204`300,,50
+
+
+
+enable_rule_generator=true
+overwrite_original_rules=true
--- a/rules/ShellClash_Mini.ini
+++ b/rules/ShellClash_Mini.ini
@@ -0,0 +1,25 @@
+[custom]
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+ruleset=🛑 广告拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanAD.list
+ruleset=🛑 广告拦截,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/BanProgramAD.list
+ruleset=🎥 奈飞解锁,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/Netflix.list
+ruleset=🎥 奈飞解锁,https://raw.githubusercontent.com/LM-Firefly/Rules/master/Global-Services/Netflix.list
+ruleset=🎥 奈飞解锁,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/Ruleset/DisneyPlus.list
+ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+ruleset=🎯 全球直连,[]GEOIP,CN
+ruleset=🐟 漏网之鱼,[]FINAL
+
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`[]📺 省流节点`select`.*
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=🛑 广告拦截`select`[]DIRECT`[]REJECT
+custom_proxy_group=🎥 奈飞解锁`select`[]🎥 流媒体解锁`[]🚀 节点选择
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
+custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]📺 省流节点`[]♻️ 自动选择`[]DIRECT
+custom_proxy_group=🎥 流媒体解锁`select`(NF|奈飞|解锁|Netflix|NETFLIX|Media)`[]🚀 节点选择
+custom_proxy_group=📺 省流节点`url-test`(0\.[0-5]|低倍率|省流|大流量)`http://www.gstatic.com/generate_204`300,,50
+
+enable_rule_generator=true
+overwrite_original_rules=true
--- a/rules/ShellClash_Nano.ini
+++ b/rules/ShellClash_Nano.ini
@@ -0,0 +1,16 @@
+[custom]
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/LocalAreaNetwork.list
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/GoogleCN.list
+ruleset=🚀 节点选择,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ProxyLite.list
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaDomain.list
+ruleset=🎯 全球直连,https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/ChinaCompanyIp.list
+ruleset=🎯 全球直连,[]GEOIP,CN
+ruleset=🐟 漏网之鱼,[]FINAL
+
+custom_proxy_group=🚀 节点选择`select`[]♻️ 自动选择`select`.*
+custom_proxy_group=♻️ 自动选择`url-test`.*`http://www.gstatic.com/generate_204`300,,50
+custom_proxy_group=🎯 全球直连`select`[]DIRECT`[]🚀 节点选择`[]♻️ 自动选择
+custom_proxy_group=🐟 漏网之鱼`select`[]🚀 节点选择`[]♻️ 自动选择`[]DIRECT
+
+enable_rule_generator=true
+overwrite_original_rules=true
--- a/scripts/clash.sh
+++ b/scripts/clash.sh
@@ -136,14 +136,15 @@ checkrestart(){
 }
 #功能相关
 setport(){
+	getconfig 
 	[ -z "$secret" ] && secret=未设置
 	[ -z "$authentication" ] && authentication=未设置
 	inputport(){
-		read -p "请输入端口号(1000-65535) > " portx
+		read -p "请输入端口号(1-65535) > " portx
 		if [ -z "$portx" ]; then
 			setport
-		elif [ $portx -gt 65535 -o $portx -le 999 ]; then
-			echo -e "\033[31m输入错误！请输入正确的数值(1000-65535)！\033[0m"
+		elif [ $portx -gt 65535 -o $portx -le 1 ]; then
+			echo -e "\033[31m输入错误！请输入正确的数值(1-65535)！\033[0m"
 			inputport
 		elif [ -n "$(echo $mix_port$redir_port$dns_port$db_port|grep $portx)" ]; then
 			echo -e "\033[31m输入错误！请不要输入重复的端口！\033[0m"
@@ -153,7 +154,6 @@ setport(){
 			inputport
 		else
 			setconfig $xport $portx 
-			$xport=$portx
 			echo -e "\033[32m设置成功！！！\033[0m"
 			setport
 		fi
@@ -259,6 +259,9 @@ setport(){
 setdns(){
 	[ -z "$dns_nameserver" ] && dns_nameserver='114.114.114.114, 223.5.5.5'
 	[ -z "$dns_fallback" ] && dns_fallback='1.0.0.1, 8.8.4.4'
+	[ -z "$ipv6_dns" ] && ipv6_dns=已开启
+	[ -z "$dns_redir" ] && dns_redir=未开启
+	[ -z "$dns_no" ] && dns_no=未禁用
 	echo -----------------------------------------------
 	echo -e "当前基础DNS：\033[32m$dns_nameserver\033[0m"
 	echo -e "fallbackDNS：\033[36m$dns_fallback\033[0m"
@@ -268,8 +271,10 @@ setdns(){
 	echo -e " 1 修改\033[32m基础DNS\033[0m"
 	echo -e " 2 修改\033[36mfallback_DNS\033[0m"
 	echo -e " 3 \033[33m重置\033[0mDNS配置"
-	echo -e " 4 禁用内置DNS(慎用)"
-	echo -e " 5 使用\033[32m加密DNS\033[0m"
+	echo -e " 4 一键配置\033[32m加密DNS\033[0m"
+	echo -e " 5 ipv6_dns解析：	\033[36m$ipv6_dns\033[0m	————建议开启"
+	echo -e " 6 Dnsmasq转发：	\033[36m$dns_redir\033[0m	————用于解决dns劫持失败的问题"
+	echo -e " 7 禁用内置DNS：	\033[36m$dns_no\033[0m	————不明勿动"
 	echo -e " 0 返回上级菜单"
 	echo -----------------------------------------------
 	read -p "请输入对应数字 > " num
@@ -283,6 +288,7 @@ setdns(){
 			echo -e "\033[32m设置成功！！！\033[0m"
 		fi
 		setdns
+		
 	elif [ "$num" = 2 ]; then
 		read -p "请输入新的DNS > " dns_fallback
 		dns_fallback=$(echo $dns_fallback | sed 's/|/\,\ /g')
@@ -291,6 +297,7 @@ setdns(){
 			echo -e "\033[32m设置成功！！！\033[0m"
 		fi
 		setdns
+		
 	elif [ "$num" = 3 ]; then
 		dns_nameserver=""
 		dns_fallback=""
@@ -298,14 +305,8 @@ setdns(){
 		setconfig dns_fallback
 		echo -e "\033[33mDNS配置已重置！！！\033[0m"
 		setdns
+		
 	elif [ "$num" = 4 ]; then
-		echo -----------------------------------------------
-		echo -e "\033[31m仅限搭配其他DNS服务(比如dnsmasq、smartDNS)时使用！\033[0m"
-		dns_no=已禁用
-		setconfig dns_no $dns_no
-		echo -e "\033[33m已禁用内置DNS！！！\033[0m"
-		setdns
-	elif [ "$num" = 5 ]; then
 		$clashdir/start.sh webget /tmp/ssl_test https://www.baidu.com echooff rediron skipceroff
 		if [ "$？" = "1" ];then
 			echo -----------------------------------------------
@@ -326,11 +327,54 @@ setdns(){
 		rm -rf /tmp/ssl_test
 		sleep 1
 		setdns
+		
+	elif [ "$num" = 5 ]; then
+		echo -----------------------------------------------
+		if [ "$ipv6_dns" = "未开启" ]; then 
+			echo -e "\033[32m开启成功！！\033[0m"
+			ipv6_dns=已开启
+		else
+			echo -e "\033[33m禁用成功！！\033[0m"
+			ipv6_dns=未开启
+		fi
+		sleep 1
+		setconfig ipv6_dns $ipv6_dns
+		setdns
+				
+	elif [ "$num" = 6 ]; then
+		echo -----------------------------------------------
+		if [ "$dns_redir" = "未开启" ]; then 
+			echo -e "\033[31m将使用OpenWrt中Dnsmasq插件自带的DNS转发功能转发DNS请求至clash内核！\033[0m"
+			echo -e "\033[33m启用后将禁用本插件自带的iptables转发功能\033[0m"
+			dns_redir=已开启
+			echo -e "\033[32m已启用Dnsmasq转发DNS功能！！！\033[0m"
+			sleep 1
+		else
+			echo -e "\033[33m禁用成功！！\033[0m"
+			dns_redir=未开启
+		fi
+		sleep 1
+		setconfig dns_redir $dns_redir
+		setdns
+	
+	elif [ "$num" = 7 ]; then
+		echo -----------------------------------------------
+		if [ "$dns_no" = "未禁用" ]; then
+			echo -e "\033[31m仅限搭配其他DNS服务(比如dnsmasq、smartDNS)时使用！\033[0m"
+			dns_no=已禁用
+			echo -e "\033[32m已禁用内置DNS！！！\033[0m"
+		else
+			dns_no=未禁用
+			echo -e "\033[33m已启用内置DNS！！！\033[0m"
+		fi
+		sleep 1
+		setconfig dns_no $dns_no
+		setdns
 	fi
 }
 checkport(){
 	for portx in $dns_port $mix_port $redir_port $db_port ;do
-		if [ -n "$(netstat -ntul 2>&1 |grep :$portx)" ];then
+		if [ -n "$(netstat -ntul 2>&1 |grep \:$portx\ )" ];then
 			echo -----------------------------------------------
 			echo -e "检测到端口【$portx】被以下进程占用！clash可能无法正常启动！\033[33m"
 			echo $(netstat -ntulp | grep :$portx | head -n 1)
@@ -501,6 +545,7 @@ localproxy(){
 			else
 				local_proxy=已开启
 				setconfig local_proxy $local_proxy
+				setconfig local_type $local_type
 				echo -e "\033[32m已经成功使用$local_type方式配置本机代理~\033[0m"
 				[ "$local_type" = "环境变量" ] && $clashdir/start.sh set_proxy $mix_port $db_port &&echo -e "\033[36m如未生效，请重新启动终端或重新连接SSH！\033[0m" && sleep 1
 				[ "$local_type" = "iptables增强模式" ] && $clashdir/start.sh start
@@ -508,6 +553,7 @@ localproxy(){
 		else
 			local_proxy=未开启
 			setconfig local_proxy $local_proxy
+			setconfig local_type
 			$clashdir/start.sh stop
 			echo -e "\033[33m已经停用本机代理规则并停止clash服务！！\033[0m"
 			[ "$local_type" = "环境变量" ] && echo -e "\033[36m如未生效，请重新启动终端或重新连接SSH！\033[0m" && sleep 1
@@ -776,7 +822,7 @@ clashadv(){
 	echo -e " 7 使用自定义配置"
 	echo -e " 8 手动指定相关端口、秘钥及本机host"
 	echo -----------------------------------------------
-	echo -e " 9 \033[31m重置\033[0m配置文件"
+	echo -e " 9 \033[31m重置/备份/还原\033[0m脚本设置"
 	echo -e " 0 返回上级菜单 \033[0m"
 	echo -----------------------------------------------
 	read -p "请输入对应数字 > " num
@@ -939,20 +985,115 @@ EOF
 		clashadv
 		
 	elif [ "$num" = 9 ]; then	
-		read -p "确认重置配置文件？(1/0) > " res
-		if [ "$res" = "1" ];then
-			echo "versionsh_l=$versionsh_l" > $ccfg
-			echo "start_time=$start_time" >> $ccfg
-			echo "#标识clash运行状态的文件，不明勿动！" >> $ccfg
-			echo -e "\033[33m配置文件已重置，请重新运行脚本！\033[0m"
-			exit
+		echo -e " 1 备份脚本设置"
+		echo -e " 2 还原脚本设置"
+		echo -e " 3 重置脚本设置"
+		echo -e " 0 返回上级菜单"
+		echo -----------------------------------------------
+		read -p "请输入对应数字 > " num
+		if [ -z "$num" ]; then
+			errornum
+		elif [ "$num" = 0 ]; then
+			i=
+		elif [ "$num" = 1 ]; then
+			cp -f $ccfg $ccfg.bak
+			echo -e "\033[32m脚本设置已备份！\033[0m"
+		elif [ "$num" = 2 ]; then
+			if [ -f "$ccfg.bak" ];then
+				mv -f $ccfg $ccfg.bak2
+				mv -f $ccfg.bak $ccfg
+				mv -f $ccfg.bak2 $ccfg.bak
+				echo -e "\033[32m脚本设置已还原！(被覆盖的配置已备份！)\033[0m"
+			else
+				echo -e "\033[31m找不到备份文件，请先备份脚本设置！\033[0m"
+			fi
+		elif [ "$num" = 3 ]; then
+			mv -f $ccfg $ccfg.bak
+			echo -e "\033[32m脚本设置已重置！(旧文件已备份！)\033[0m"
 		fi
-		clashadv
+		echo -e "\033[33m请重新启动脚本！\033[0m"
+		exit 0

 	else
 		errornum
 	fi
 }
+streaming(){
+	[ -z "$netflix_pre" ] && netflix_pre=未开启
+	[ -z "$disneyP_pre" ] && disneyP_pre=未开启
+	[ -z "$streaming_int" ] && streaming_int=24
+	netflix_dir=$clashdir/streaming/Netflix_Domains.list
+	disneyp_dir=$clashdir/streaming/Disney_Plus_Domains.list
+	####
+	echo -e "\033[30;46m欢迎使用流媒体预解析功能：\033[0m"
+	echo -e "\033[33m感谢OpenClash项目提供相关域名数据库！\033[0m"
+	echo -e "\033[31m修改后需重启服务！\033[0m"
+	echo -----------------------------------------------
+	echo -e " 1 预解析\033[36mNetflix域名  	\033[33m$netflix_pre\033[0m"
+	echo -e " 2 预解析\033[36mDisney+域名  	\033[33m$disneyP_pre\033[0m"
+	echo -e " 3 设置预解析间隔	\033[32m$streaming_int小时\033[0m"
+	echo -e " 4 更新本地\033[32m域名数据库\033[0m"
+	echo -e " 0 返回上级菜单" 
+	echo -----------------------------------------------
+	read -p "请输入对应数字 > " num
+	if [ -z "$num" ]; then
+		errornum
+	elif [ "$num" = 0 ]; then
+		i=
+	elif [ "$num" = 1 ]; then	
+		echo -----------------------------------------------
+		if [ "$netflix_pre" = "未开启" ] > /dev/null 2>&1; then
+			echo -e "\033[33m已启用Netflix域名预解析功能！！\033[0m"
+			netflix_pre=已开启
+			sleep 1
+		else
+			echo -e "\033[31m已停用Netflix域名预解析功能！！\033[0m"
+			[ -f "$netflix_dir" ] && rm -rf $netflix_dir
+			netflix_pre=未开启
+		fi
+		setconfig netflix_pre $netflix_pre
+		sleep 1
+		streaming
+	elif [ "$num" = 2 ]; then	
+		echo -----------------------------------------------
+		if [ "$disneyP_pre" = "未开启" ] > /dev/null 2>&1; then
+			echo -e "\033[33m已启用Disney+域名预解析功能！！\033[0m"
+			disneyP_pre=已开启
+			sleep 1
+		else
+			echo -e "\033[31m已停用Disney+域名预解析功能！！\033[0m"
+			[ -f "$disneyp_dir" ] && rm -rf $disneyp_dir
+			disneyP_pre=未开启
+		fi
+		setconfig disneyP_pre $disneyP_pre
+		sleep 1
+		streaming
+	elif [ "$num" = 3 ]; then	
+		echo -----------------------------------------------
+		read -p "请输入刷新间隔(1-24小时,不支持小数) > " num
+			if [ -z "$num" ]; then 
+				errornum
+			elif [ $num -gt 24 ] || [ $num -lt 1 ]; then 
+				errornum
+			else	
+				streaming_int=$num
+				setconfig streaming_int $streaming_int
+				echo -e "\033[32m设置成功！！！\033[0m"
+			fi
+			sleep 1
+			streaming
+	elif [ "$num" = 4 ]; then
+		[ -f "$netflix_dir" ] && rm -rf $netflix_dir
+		[ -f "$disneyp_dir" ] && rm -rf $disneyp_dir
+		echo -----------------------------------------------
+		echo -e "\033[32m本地文件已清理，将在下次刷新时自动更新数据库文件！！！\033[0m"
+		sleep 1
+		streaming
+	else
+		errornum
+		streaming
+	fi		
+}
 tools(){
 	ssh_tools(){
 		[ -n "$(cat /etc/firewall.user 2>1 | grep '启用外网访问SSH服务')" ] && ssh_ol=禁止 || ssh_ol=开启
@@ -1015,12 +1156,14 @@ tools(){
 	echo -----------------------------------------------
 	echo -e "\033[30;47m欢迎使用其他工具菜单：\033[0m"
 	echo -e "\033[33m本页工具可能无法兼容全部Linux设备，请酌情使用！\033[0m"
+	echo -e "磁盘占用/所在目录："
+	du -sh $clashdir
 	echo -----------------------------------------------
 	echo -e " 1 ShellClash测试菜单"
 	[ -f "/etc/firewall.user" ] && echo -e " 2 \033[32m配置\033[0m外网访问SSH"
 	#echo -e " 3 配置DDNS服务:	\033[36m$ipv6_support\033[0m	————待施工"
 	[ -x /usr/sbin/otapredownload ] && echo -e " 3 \033[33m$mi_update\033[0m小米系统自动更新"
-	#[ -w "/etc/config/firewall" ] && echo -e " 4 \033[32修复\033[0mRedir_host模式Netflix访问"
+	echo -e " 4 \033[32m流媒体预解析\033[0m————用于解决DNS解锁在TV应用上失效的问题"
 	echo -----------------------------------------------
 	echo -e " 0 返回上级菜单 \033[0m"
 	echo -----------------------------------------------
@@ -1046,11 +1189,21 @@ tools(){
 		tools
 		
 	elif [ "$num" = 4 ]; then
-		sed -i "s/drop_invalid\ \'1\'/drop_invalid\ \'0\'/g" /etc/config/firewall
-		echo -----------------------------------------------
-		read -P "已修复，是否立即重启设备使其生效？(1/0) > " res
-		[ "$res" = 1 ] && reboot
-		sleep 1
+		nslookup baidu.com > /dev/null 2>&1
+		if [ "$?" = 0 ];then
+			checkcfg=$(cat $ccfg)
+			streaming
+			if [ -n "$PID" ];then
+				checkcfg_new=$(cat $ccfg)
+				[ "$checkcfg" != "$checkcfg_new" ] && checkrestart
+			fi
+		else
+			echo -----------------------------------------------
+			echo "当前设备缺少nslookup命令，无法启用全媒体预解析功能！"
+			echo "Centos请尝试使用以下命令安装【yum -y install bind-utils】"
+			echo "Debian/Ubuntu等请尝试使用【sudo apt-get install dnsutils -y】"
+			sleep 1
+		fi
 		tools
 		
 	else
@@ -1301,6 +1454,10 @@ case "$1" in
 		echo "	-h 帮助列表"
 		echo "	-u 卸载脚本"
 		echo -----------------------------------------
+		echo "	$clashdir/start.sh start	启动服务"
+		echo "	$clashdir/start.sh stop		停止服务"
+		echo "	$clashdir/start.sh init		写入服务"
+		echo -----------------------------------------
 		echo "在线求助：t.me/clashfm"
 		echo "官方博客：juewuy.github.io"
 		echo "发布页面：github.com/juewuy/ShellClash"
--- a/scripts/clashservice
+++ b/scripts/clashservice
@@ -14,27 +14,31 @@ BINDIR=$(cat $DIR/mark | grep bindir | awk -F "=" '{print $2}')
 start_service() {
 	#检测必须文件
 	$DIR/start.sh bfstart
-	#使用procd创建clash后台进程
-	procd_open_instance
-	procd_set_param respawn
-	procd_set_param stderr 1
-	procd_set_param stdout 1
-	procd_set_param command $BINDIR/clash -d $BINDIR
-	procd_close_instance
-	#其他设置
-	$DIR/start.sh afstart
+	if [ "$?" = "0" ];then
+		#使用procd创建clash后台进程
+		procd_open_instance
+		procd_set_param respawn
+		procd_set_param stderr 0
+		procd_set_param stdout 0
+		procd_set_param command $BINDIR/clash -d $BINDIR
+		procd_close_instance
+		#其他设置
+		$DIR/start.sh afstart
+	fi
 }

 start() {
 	if [ -z "$(pidof procd)" ];then
 		#检测必须文件
 		$DIR/start.sh bfstart
-		#创建后台进程
-		service_start  $BINDIR/clash -d $BINDIR
-		#其他设置
-		$DIR/start.sh afstart
-		#设置守护进程
-		$DIR/start.sh deamon
+		if [ "$?" = "0" ];then
+			#创建后台进程
+			service_start  $BINDIR/clash -d $BINDIR
+			#其他设置
+			$DIR/start.sh afstart
+			#设置守护进程
+			$DIR/start.sh deamon
+		fi
 	else
 		start_service
 	fi
--- a/scripts/getdate.sh
+++ b/scripts/getdate.sh
@@ -5,23 +5,20 @@
 linkconfig(){
 	echo -----------------------------------------------
 	echo 当前使用规则为：$rule_link
-	echo 1	ACL4SSR通用版无去广告（推荐）
-	echo 2	ACL4SSR精简全能版（推荐）
-	echo 3	ACL4SSR通用版+去广告加强
-	echo 4	ACL4SSR精简版+去广告加强
-	echo 5	ACL4SSR重度全分组+奈飞分流
-	echo 6	ACL4SSR重度全分组+去广告加强
-	echo 7	洞主规则精简版（推荐）
-	echo 8	洞主规则重度完整版
-	echo 9	神机规则高级版
-	echo 10	神机规则-回国专用
-	echo 11	李哥规则-墙洞专用
-	echo 12	基础规则-仅Geoip CN+Final
-	echo 13	网易云解锁-仅规则分组
-	echo 14	ACL4SSR重度全分组+谷歌优化
-	echo 15	ACL4SSR通用版+LM-Firefly游戏规则
-	echo 16	ACL4SSR精简版+LM-Firefly游戏规则
-	echo 17	ACL4SSR重度+LM-Firefly游戏规则
+	echo " 1	Acl4SSR全能优化版（推荐）"
+	echo " 2	Acl4SSR精简优化版（推荐）"
+	echo " 3	Acl4SSR全能优化+去广告增强"
+	echo " 4	Acl4SSR极简版（适合自建节点）"
+	echo " 5	Acl4SSR分流&游戏增强"
+	echo " 6	Acl4SSR分流&游戏&去广告增强（低性能设备慎用）"
+	echo " 7	洞主规则精简版（推荐）"
+	echo " 8	洞主规则重度完整版"
+	echo " 9	神机规则高级版"
+	echo " 10	神机规则-回国专用"
+	echo " 11	李哥规则-墙洞专用"
+	echo " 12	基础规则-仅Geoip CN+Final"
+	echo " 13	网易云解锁-仅规则分组"
+	echo " 14	ACL4SSR重度全分组+谷歌优化"
 	echo -----------------------------------------------
 	echo 0 返回上级菜单
 	read -p "请输入对应数字 > " num
@@ -40,12 +37,13 @@ linkconfig(){
 linkserver(){
 	echo -----------------------------------------------
 	echo -e "\033[36m以下为互联网采集的第三方服务器，具体安全性请自行斟酌！\033[0m"
+	echo -e "\033[32m感谢以下作者的无私奉献！！！\033[0m"
 	echo 当前使用后端为：$server_link
-	echo 1 subcon.dlj.tf
-	echo 2 api.dler.io
-	echo 3 api.wcc.best
-	echo 4 api2.tsutsu.cc
-	echo 5 api.v1.mk
+	echo 1 api.dler.io			（墙洞提供）
+	echo 2 sub.shellclash.ga	（作者提供）
+	echo 3 api.wcc.best			（sub_web作者提供）
+	echo 4 sub.id9.cc			（品云提供）
+	echo 5 sub.maoxiongnet.com	（猫熊提供）
 	echo -----------------------------------------------
 	echo 0 返回上级菜单
 	read -p "请输入对应数字 > " num
@@ -64,7 +62,6 @@ linkserver(){
 linkfilter(){
 	[ -z "$exclude" ] && exclude="未设置"
 	echo -----------------------------------------------
-	echo -e "\033[44m 实验性功能，遇问题请加TG群反馈：\033[42;30m t.me/clashfm \033[0m"
 	echo -e "\033[33m当前过滤关键字：\033[47;30m$exclude\033[0m"
 	echo -----------------------------------------------
 	echo -e "\033[33m匹配关键字的节点会在导入时被【屏蔽】！！！\033[0m"
@@ -85,7 +82,6 @@ linkfilter(){
 linkfilter2(){
 	[ -z "$include" ] && include="未设置"
 	echo -----------------------------------------------
-	echo -e "\033[44m 实验性功能，遇问题请加TG群反馈：\033[42;30m t.me/clashfm \033[0m"
 	echo -e "\033[33m当前筛选关键字：\033[47;30m$include\033[0m"
 	echo -----------------------------------------------
 	echo -e "\033[33m仅有匹配关键字的节点才会被【导入】！！！\033[0m"
@@ -114,12 +110,14 @@ getyaml(){
 	fi
 }
 getlink(){
+	echo -----------------------------------------------
+	echo -e "\033[30;47m 欢迎使用在线生成配置文件功能！\033[0m"
+	echo -----------------------------------------------
 	#设置输入循环
 	i=1
 	while [ $i -le 99 ]
 	do
 		echo -----------------------------------------------
-		echo -e "\033[44m 遇问题请加TG群反馈：\033[42;30m t.me/clashfm \033[0m"
 		echo -e "\033[33m本功能依赖第三方在线subconverter服务实现，脚本本身不提供任何代理服务！\033[0m"
 		echo -e "\033[31m严禁使用本脚本从事任何非法活动，否则一切后果请自负！\033[0m"
 		echo -----------------------------------------------
@@ -186,8 +184,12 @@ getlink(){
 } 
 getlink2(){
 	echo -----------------------------------------------
-	echo -e "\033[33m仅限导入完整clash配置文件链接！！！\033[0m"
-	echo -e "可使用\033[4;32mhttps://acl4ssr.netlify.app\033[0m在线生成配置文件"
+	echo -e "\033[32m仅限导入完整clash配置文件链接！！！\033[0m"
+	echo -----------------------------------------------
+	echo -e "\033[33m有流媒体需求，请使用\033[32m6-1在线生成配置文件功能！！！\033[0m"
+	echo -e "\033[33m如不了解机制，请使用\033[32m6-1在线生成配置文件功能！！！\033[0m"
+	echo -e "\033[33m如遇任何问题，请使用\033[32m6-1在线生成配置文件功能！！！\033[0m"
+	echo -e "\033[31m此功能可能会导致部分节点无法连接或者规则覆盖不完整！！！\033[0m"
 	echo -----------------------------------------------
 	echo -e "\033[33m0 返回上级菜单\033[0m"
 	echo -----------------------------------------------
@@ -255,7 +257,19 @@ clashlink(){
 		getlink
 	  
 	elif [ "$num" = 2 ];then
-		getlink2
+		echo -----------------------------------------------
+		echo -e "\033[33m此功能可能会导致严重bug，仅限熟练了解clash运行机制的用户使用！！！\033[0m"
+		echo -e "如你不熟悉clash机制或者使用此功能出现bug，请使用\033[32m在线生成配置文件功能！\033[0m"
+		echo -----------------------------------------------
+		read -p "是否继续？[1/0] > " res
+		if [ "$res" = '1' ]; then
+			getlink2
+		else
+			echo -----------------------------------------------
+			echo -e "\033[32m正在跳转……\033[0m"
+			sleep 1
+			getlink
+		fi
 		
 	elif [ "$num" = 3 ];then
 		yamlbak=$yaml.bak
@@ -428,7 +442,7 @@ getcore(){
 	else
 		echo -e "\033[32m$clashcore核心下载成功！\033[0m"
 		mv -f /tmp/clash.new $bindir/clash
-		chmod  777 $bindir/clash  #授予权限
+		chmod 777 $bindir/clash  #授予权限
 		setconfig clashcore $clashcore
 		setconfig clashv $version
 	fi
@@ -449,7 +463,13 @@ setcore(){
 	echo "2 clashpre：  支持Tun模式、混合模式"
 	echo "(高级预览版)  内存占用更高"
 	echo
-	echo "3 手动指定处理器架构"
+	echo "3 clash.net： 支持部分vless协议"
+	echo "(.net定制版)  第三方定制内核"
+	echo
+	echo "4 clash.meta：支持大部分vless协议"
+	echo "(meta定制版)  第三方定制内核"
+	echo
+	echo "5 手动指定处理器架构"
 	echo -----------------------------------------------
 	echo 0 返回上级菜单 
 	read -p "请输入对应数字 > " num
@@ -466,6 +486,14 @@ setcore(){
 			version=$clashpre_v
 			getcore
 		elif [ "$num" = 3 ]; then
+			clashcore=clash.net
+			version=$clashnet_v
+			getcore
+		elif [ "$num" = 4 ]; then
+			clashcore=clash.meta
+			version=$meta_v
+			getcore
+		elif [ "$num" = 5 ]; then
 			setcpucore
 			setcore
 		else
@@ -496,9 +524,9 @@ setgeo(){
 	[ -n "$geo_type" ] && echo -e "当前使用的是\033[47;30m$geo_type数据库\033[0m"
 	echo -e "\033[36m请选择需要更新/切换的GeoIP/CN_IP数据库：\033[0m"
 	echo -----------------------------------------------
-	echo -e " 1 由\033[32malecthw\033[0m提供的全球版GeoIP数据库(约4mb)"
-	echo -e " 2 由\033[32mHackl0us\033[0m提供的精简版CN-IP数据库(约0.1mb)"
-	echo -e " 3 由\033[32m17mon\033[0m提供的CN-IP文件(需启用CN_IP绕过内核功能，约0.1mb)"
+	echo -e " 1 由\033[32malecthw\033[0m提供的全球版GeoIP数据库(约6mb)"
+	echo -e " 2 由\033[32mHackl0us\033[0m提供的精简版CN-IP数据库(约0.2mb)"
+	echo -e " 3 由\033[32m17mon\033[0m提供的CN-IP文件(需启用CN_IP绕过内核功能，约0.2mb)"
 	echo " 0 返回上级菜单"
 	echo -----------------------------------------------
 	read -p "请输入对应数字 > " num
@@ -534,6 +562,7 @@ getdb(){
 		if [ "$res" = 1 ]; then
 			rm -rf /www/clash
 			rm -rf $clashdir/ui
+			rm -rf $bindir/ui
 		fi
 	fi
 	dblink="${update_url}/bin/${db_type}.tar.gz"
@@ -624,6 +653,7 @@ setdb(){
 		if [ "$res" = 1 ];then
 			rm -rf /www/clash
 			rm -rf $clashdir/ui
+			rm -rf $bindir/ui
 			echo -----------------------------------------------
 			echo -e "\033[31m面板已经卸载！\033[0m"
 			sleep 1
@@ -695,7 +725,7 @@ setserver(){
 	echo -e " 1 \033[32m正式版\033[0m&Jsdelivr-CDN源(推荐)"
 	echo -e " 2 \033[36m测试版\033[0m&Jsdelivr-CDN源"
 	echo -e " 3 \033[36m测试版\033[0m&Github源(需开启clash服务）"
-	[ -z "$(curl -V 2>/dev/null)" ] && [ -n "$(wget -V 2>&1 | grep BusyBox)" ] && echo -e " 4 \033[33mHttp专用源\033[0m@Qust.me(感谢\033[32m酱紫表\033[0m提供及维护)"
+	[ -z "$(curl -V 2>/dev/null)" ] && [ -n "$(wget -V 2>&1 | grep BusyBox)" ] && echo -e " 4 \033[33mHttp专用源\033[0m"
 	echo -e " 5 自定义源地址(用于本地源或自建源)"
 	echo -e " 6 \033[31m版本回退\033[0m"
 	echo -e " 0 返回上级菜单"
@@ -712,7 +742,7 @@ setserver(){
 		update_url='https://raw.githubusercontent.com/juewuy/ShellClash/master'
 		saveserver
 	elif [ "$num" = 4 ]; then
-		update_url='http://sc.qust.me'
+		update_url='http://shellclash.ga'
 		saveserver
 	elif [ "$num" = 5 ]; then
 		echo -----------------------------------------------
@@ -765,6 +795,9 @@ update(){
 	echo -ne "\033[32m正在检查更新！\033[0m\r"
 	checkupdate
 	[ "$clashcore" = "clash" ] && clash_n=$clash_v || clash_n=$clashpre_v
+	[ "$clashcore" = "clashpre" ] && clash_n=$clashpre_v
+	[ "$clashcore" = "clash.net" ] && clash_n=$clashnet_v
+	[ "$clashcore" = "clash.meta" ] && clash_n=$meta_v
 	clash_v=$($bindir/clash -v 2>/dev/null | awk '{print $2}')
 	[ -z "$clash_v" ] && clash_v=$clashv
 	echo -e "\033[30;47m欢迎使用更新功能：\033[0m"
@@ -839,14 +872,14 @@ update(){
 userguide(){
 	whichmod(){	
 		echo -----------------------------------------------
-		echo -e "\033[33m是否需要代理UDP流量(主要用于游戏)？ \033[0m"
+		echo -e "\033[33m是否需要代理UDP流量(主要用于连接外服游戏)？ \033[0m"
 		echo -----------------------------------------------
-		echo -e " 1 \033[33m不代理UDP流量\033[0m(可能会导致一部分外服游戏/应用无法连接)"
+		echo -e " 1 \033[33m不代理UDP流量\033[0m(推荐)"
 		ip tuntap >/dev/null 2>&1 && [ "$?" = 0 ] && \
-		echo -e " 2 \033[32m使用Tun虚拟网卡\033[0m代理UDP流量(更低的延迟但更多的CPU消耗)" || \
+		echo -e " 2 \033[32m使用Tun虚拟网卡\033[0m代理UDP流量" || \
 		echo -e " - \033[0m使用Tun模式(你的设备不支持此模式，如为虚拟机运行请调整虚拟网卡设置)\033[0m"
 		[ -n "$(iptables -j TPROXY 2>&1 | grep 'on-port')" ] && \
-		echo -e " 3 \033[32m使用Tproxy模式\033[0m代理UDP流量(较低CPU消耗但相对高的延迟)"
+		echo -e " 3 \033[32m使用Tproxy模式\033[0m代理UDP流量"
 		echo -----------------------------------------------
 		read -p "请输入对应数字 > " num
 		if [ -z "$num" ] || [ "$num" -gt 4 ];then
@@ -873,6 +906,7 @@ userguide(){
 		echo -----------------------------------------------
 		echo -e " 1 \033[32m主路由或旁路由\033[0m"
 		echo -e " 2 \033[36mLinux本机代理\033[0m"
+		[ -f "$ccfg.bak" ] && echo -e " 3 \033[33m还原之前备份的设置\033[0m"
 		echo -----------------------------------------------
 		read -p "请输入对应数字 > " num
 		if [ -z "$num" ] || [ "$num" -gt 4 ];then
@@ -906,6 +940,11 @@ userguide(){
 			fi
 			setconfig local_proxy $local_proxy
 			setconfig local_type $local_type
+		elif [ "$num" = 3 ];then
+			mv -f $ccfg.bak $ccfg
+			echo -e "\033[32m脚本设置已还原！\033[0m"
+			echo -e "\033[33m请重新启动脚本！\033[0m"
+			exit 0
 		fi
 	}
 	forwhat
@@ -943,6 +982,31 @@ userguide(){
 		setconfig dns_fallback \'"$dns_fallback"\' 
 	fi
 	rm -rf /tmp/ssl_test
+	#开启公网访问
+	sethost(){
+		read -p "请输入你的公网IP地址 > " host
+		echo $host | grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}'
+		if [ -z "$host" ];then
+			echo -e "\033[31m请输入正确的IP地址！\033[0m"
+			sethost
+		fi
+	}
+	echo -----------------------------------------------
+	echo -e "\033[32m是否开启公网访问Dashboard面板及socks服务？\033[0m"
+	echo -e "注意当前设备必须有公网IP才能从公网正常访问"
+	echo -e "此功能会增加暴露风险请谨慎使用！"
+	echo -e "vps设备可能还需要额外在服务商后台开启相关端口(默认为7890与9999)"
+	read -p "现在开启？(1/0) > " res
+	if [ "$res" = 1 ];then
+		host=$(curl ip.sb  2>/dev/null | grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}')
+		if [ -z "$host" ];then
+			sethost
+		fi	
+		public_support=已开启
+		setconfig host $host
+		setconfig public_support $public_support
+	fi
+	
 	#提示导入订阅或者配置文件
 	echo -----------------------------------------------
 	echo -e "\033[32m是否导入配置文件？\033[0m(这是运行前的最后一步)"
@@ -963,8 +1027,6 @@ testcommand(){
 	echo -----------------------------------------------
 	echo -e "\033[30;47m这里是测试命令菜单\033[0m"
 	echo -e "\033[33m如遇问题尽量运行相应命令后截图发群\033[0m"
-	echo -e "磁盘占用/所在目录："
-	du -sh $clashdir
 	echo -----------------------------------------------
 	echo " 1 查看clash运行时的报错信息"
 	echo " 2 查看系统DNS端口(:53)占用 "
--- a/scripts/start.sh
+++ b/scripts/start.sh
@@ -20,17 +20,24 @@ getconfig(){
 	[ -z "$dns_over" ] && dns_over=已开启
 	[ -z "$modify_yaml" ] && modify_yaml=未开启
 	[ -z "$ipv6_support" ] && ipv6_support=未开启
+	[ -z "$ipv6_dns" ] && ipv6_dns=$ipv6_support
 	[ -z "$start_old" ] && start_old=未开启
 	[ -z "$local_proxy" ] && local_proxy=未开启
 	[ -z "$mix_port" ] && mix_port=7890
 	[ -z "$redir_port" ] && redir_port=7892
 	[ -z "$db_port" ] && db_port=9999
 	[ -z "$dns_port" ] && dns_port=1053
+	[ -z "$dns_redir" ] && dns_redir=未开启
 	[ -z "$cn_ip_route" ] && cn_ip_route=未开启
 	[ -z "$public_support" ] && public_support=未开启
+	[ -z "$stearming_int" ] && stearming_int=24
 	[ -z "$dns_nameserver" ] && dns_nameserver='114.114.114.114, 223.5.5.5'
 	[ -z "$dns_fallback" ] && dns_fallback='1.0.0.1, 8.8.4.4'
 	[ -z "$multiport" ] && multiport='22,53,587,465,995,993,143,80,443,8080'
+	#获取本机host地址
+	[ -z "$host" ] && host=$(ubus call network.interface.lan status 2>&1 | grep \"address\" | grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}';)
+	[ -z "$host" ] && host=$(ip a 2>&1 | grep -w 'inet' | grep 'global' | grep -E '\ 1(92|0|72)\.' | sed 's/.*inet.//g' | sed 's/\/[0-9][0-9].*$//g' | head -n 1)
+	[ -z "$host" ] && host=127.0.0.1
 	#是否代理常用端口
 	[ "$common_ports" = "已开启" ] && ports="-m multiport --dports $multiport"
 	}
@@ -81,30 +88,25 @@ mark_time(){
 	sed -i '/start_time*/'d $clashdir/mark
 	echo start_time=$start_time >> $clashdir/mark
 }
-gethost(){
-	[ -z "$host" ] && host=$(ubus call network.interface.lan status 2>&1 | grep \"address\" | grep -oE '[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}';)
-	[ -z "$host" ] && host=$(ip a 2>&1 | grep -w 'inet' | grep 'global' | grep -E '\ 1(92|0|72)\.' | sed 's/.*inet.//g' | sed 's/\/[0-9][0-9].*$//g' | head -n 1)
-	[ -n "$host" ] && lanhost="-s $(echo $host | grep -oE '^1(92|0|72)\.')0.0.0/8"
-}
 #配置文件相关
 getyaml(){
 	[ -z "$rule_link" ] && rule_link=1
 	[ -z "$server_link" ] && server_link=1
 	#前后端订阅服务器地址索引，可在此处添加！
 	Server=`sed -n ""$server_link"p"<<EOF
-subcon.dlj.tf
-api.dler.io
-api.wcc.best
-api2.tsutsu.cc
-api.v1.mk
+https://api.dler.io
+http://sub.shellclash.ga
+https://api.wcc.best
+https://sub.id9.cc
+https://sub.maoxiongnet.com
 EOF`
 	Config=`sed -n ""$rule_link"p"<<EOF
-https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_NoReject.ini
-https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Mini_MultiMode.ini
-https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_AdblockPlus.ini
-https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Mini_AdblockPlus.ini
-https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Full_Netflix.ini
-https://raw.githubusercontent.com/ACL4SSR/ACL4SSR/master/Clash/config/ACL4SSR_Online_Full_AdblockPlus.ini
+https://github.com/juewuy/ShellClash/raw/master/rules/ShellClash.ini
+https://github.com/juewuy/ShellClash/raw/master/rules/ShellClash_Mini.ini
+https://github.com/juewuy/ShellClash/raw/master/rules/ShellClash_Block.ini
+https://github.com/juewuy/ShellClash/raw/master/rules/ShellClash_Nano.ini
+https://github.com/juewuy/ShellClash/raw/master/rules/ShellClash_Full.ini
+https://github.com/juewuy/ShellClash/raw/master/rules/ShellClash_Full_Block.ini
 https://gist.githubusercontent.com/tindy2013/1fa08640a9088ac8652dbd40c5d2715b/raw/lhie1_clash.ini
 https://gist.githubusercontent.com/tindy2013/1fa08640a9088ac8652dbd40c5d2715b/raw/lhie1_dler.ini
 https://gist.githubusercontent.com/tindy2013/1fa08640a9088ac8652dbd40c5d2715b/raw/connershua_pro.ini
@@ -120,8 +122,8 @@ EOF`
 	Https=$(echo ${Https//\%26/\&})   #将%26替换回&
 	#如果传来的是Url链接则合成Https链接，否则直接使用Https链接
 	if [ -z "$Https" ];then
-		#[ -n "$(echo $Url | grep -o 'https://dler')" ] && Server='api.dler.io'
-		Https="https://$Server/sub?target=clash&insert=true&new_name=true&scv=true&exclude=$exclude&include=$include&url=$Url&config=$Config"
+		[ -n "$(echo $Url | grep -o 'vless')" ] && Server='http://sub.shellclash.ga'
+		Https="$Server/sub?target=clash&insert=true&new_name=true&scv=true&udp=true&exclude=$exclude&include=$include&url=$Url&config=$Config"
 		markhttp=1
 	fi
 	#输出
@@ -133,7 +135,7 @@ EOF`
 	yaml=$clashdir/config.yaml
 	yamlnew=/tmp/clash_config_$USER.yaml
 	rm -rf $yamlnew
-	$0 webget $yamlnew $Https 0 0 0 1
+	$0 webget $yamlnew $Https
 	if [ "$?" = "1" ];then
 		if [ -z "$markhttp" ];then
 			echo -----------------------------------------------
@@ -177,7 +179,7 @@ EOF`
 		if cat $yamlnew | grep 'Proxy Group:' >/dev/null;then
 			echo -----------------------------------------------
 			logger "已经停止对旧格式配置文件的支持！！！" 31
-			echo -e "请使用新格式或者使用【导入节点/链接】功能！"
+			echo -e "请使用新格式或者使用【在线生成配置文件】功能！"
 			echo -----------------------------------------------
 			exit 1
 		fi
@@ -188,12 +190,20 @@ EOF`
 			echo -----------------------------------------------
 			exit 1
 		fi
+		#检测vless协议
+		if [ -n "$(cat $yamlnew | grep -E 'vless')" ] && [ "$clashcore" = "clash" -o "$clashcore" = "clashpre" ];then
+			echo -----------------------------------------------
+			logger "检测到vless协议！将改为使用clash.meta核心启动！" 33
+			rm -rf $bindir/clash
+			setconfig clashcore clash.meta
+			echo -----------------------------------------------
+		fi
 		#检测是否存在高级版规则
 		if [ "$clashcore" = "clash" -a -n "$(cat $yamlnew | grep -E '^script:|proxy-providers|rule-providers')" ];then
 			echo -----------------------------------------------
-			logger "检测到高级版核心专属规则！将改为使用premium核心启动！" 33
+			logger "检测到高级版核心专属规则！将改为使用clash.net核心启动！" 33
 			rm -rf $bindir/clash
-			setconfig clashcore clashpre
+			setconfig clashcore clash.net
 			echo -----------------------------------------------
 		fi
 		#使用核心内置test功能检测
@@ -221,22 +231,32 @@ EOF`
 modify_yaml(){
 ##########需要变更的配置###########
 	lan='allow-lan: true'
-	mode='mode: Rule'
+	#mode='mode: Rule'
 	log='log-level: info'
 	[ "$ipv6_support" = "已开启" ] && ipv6='ipv6: true' || ipv6='ipv6: false'
+	[ "$ipv6_dns" = "已开启" ] && dns_v6='ipv6: true' || dns_v6=$ipv6
 	external="external-controller: 0.0.0.0:$db_port"
 	[ -d $clashdir/ui ] && db_ui=ui
-	[ "$redir_mod" != "Redir模式" ] && tun='tun: {enable: true, stack: system}' || tun='tun: {enable: false}'
+	if [ "$redir_mod" = "混合模式" -o "$redir_mod" = "Tun模式" ];then
+		[ "$clashcore" = "clash.meta" ] && stack=gvisor || stack=system
+		tun="tun: {enable: true, stack: $stack}"
+	else
+		tun='tun: {enable: false}'
+	fi
 	exper='experimental: {ignore-resolve-fail: true, interface-name: en0}'
 	#dns配置
+	dns_default='114.114.114.114, 223.5.5.5'
 	if [ "$dns_mod" = "fake-ip" ];then
-		dns='dns: {enable: true, listen: 0.0.0.0:'$dns_port', use-hosts: true, fake-ip-range: 198.18.0.1/16, enhanced-mode: fake-ip, fake-ip-filter: ["*.lan", "time.windows.com", "time.nist.gov", "time.apple.com", "time.asia.apple.com", "*.ntp.org.cn", "*.openwrt.pool.ntp.org", "time1.cloud.tencent.com", "time.ustc.edu.cn", "pool.ntp.org", "ntp.ubuntu.com", "ntp.aliyun.com", "ntp1.aliyun.com", "ntp2.aliyun.com", "ntp3.aliyun.com", "ntp4.aliyun.com", "ntp5.aliyun.com", "ntp6.aliyun.com", "ntp7.aliyun.com", "time1.aliyun.com", "time2.aliyun.com", "time3.aliyun.com", "time4.aliyun.com", "time5.aliyun.com", "time6.aliyun.com", "time7.aliyun.com", "*.time.edu.cn", "time1.apple.com", "time2.apple.com", "time3.apple.com", "time4.apple.com", "time5.apple.com", "time6.apple.com", "time7.apple.com", "time1.google.com", "time2.google.com", "time3.google.com", "time4.google.com", "music.163.com", "*.music.163.com", "*.126.net", "musicapi.taihe.com", "music.taihe.com", "songsearch.kugou.com", "trackercdn.kugou.com", "*.kuwo.cn", "api-jooxtt.sanook.com", "api.joox.com", "joox.com", "y.qq.com", "*.y.qq.com", "streamoc.music.tc.qq.com", "mobileoc.music.tc.qq.com", "isure.stream.qqmusic.qq.com", "dl.stream.qqmusic.qq.com", "aqqmusic.tc.qq.com", "amobile.music.tc.qq.com", "*.xiami.com", "*.music.migu.cn", "music.migu.cn", "*.msftconnecttest.com", "*.msftncsi.com", "localhost.ptlogin2.qq.com", "*.*.*.srv.nintendo.net", "*.*.stun.playstation.net", "xbox.*.*.microsoft.com", "*.*.xboxlive.com", "proxy.golang.org","*.sgcc.com.cn","*.alicdn.com","*.aliyuncs.com"], nameserver: ['$dns_nameserver', 127.0.0.1:53], fallback: ['$dns_fallback'], fallback-filter: {geoip: true}}'
+		dns='dns: {enable: true, listen: 0.0.0.0:'$dns_port', use-hosts: true, fake-ip-range: 198.18.0.1/16, enhanced-mode: fake-ip, fake-ip-filter: ["*.lan", "time.windows.com", "time.nist.gov", "time.apple.com", "time.asia.apple.com", "*.ntp.org.cn", "*.openwrt.pool.ntp.org", "time1.cloud.tencent.com", "time.ustc.edu.cn", "pool.ntp.org", "ntp.ubuntu.com", "ntp.aliyun.com", "ntp1.aliyun.com", "ntp2.aliyun.com", "ntp3.aliyun.com", "ntp4.aliyun.com", "ntp5.aliyun.com", "ntp6.aliyun.com", "ntp7.aliyun.com", "time1.aliyun.com", "time2.aliyun.com", "time3.aliyun.com", "time4.aliyun.com", "time5.aliyun.com", "time6.aliyun.com", "time7.aliyun.com", "*.time.edu.cn", "time1.apple.com", "time2.apple.com", "time3.apple.com", "time4.apple.com", "time5.apple.com", "time6.apple.com", "time7.apple.com", "time1.google.com", "time2.google.com", "time3.google.com", "time4.google.com", "music.163.com", "*.music.163.com", "*.126.net", "musicapi.taihe.com", "music.taihe.com", "songsearch.kugou.com", "trackercdn.kugou.com", "*.kuwo.cn", "api-jooxtt.sanook.com", "api.joox.com", "joox.com", "y.qq.com", "*.y.qq.com", "streamoc.music.tc.qq.com", "mobileoc.music.tc.qq.com", "isure.stream.qqmusic.qq.com", "dl.stream.qqmusic.qq.com", "aqqmusic.tc.qq.com", "amobile.music.tc.qq.com", "*.xiami.com", "*.music.migu.cn", "music.migu.cn", "*.msftconnecttest.com", "*.msftncsi.com", "localhost.ptlogin2.qq.com", "*.*.*.srv.nintendo.net", "*.*.stun.playstation.net", "xbox.*.*.microsoft.com", "*.*.xboxlive.com", "proxy.golang.org","*.sgcc.com.cn","*.alicdn.com","*.aliyuncs.com"], default-nameserver: ['$dns_default', 127.0.0.1:53], nameserver: ['$dns_nameserver', 127.0.0.1:53], fallback: ['$dns_fallback'], fallback-filter: {geoip: true}}'
 	else
-		dns='dns: {enable: true, ipv6: true, listen: 0.0.0.0:'$dns_port', use-hosts: true, enhanced-mode: redir-host, nameserver: ['$dns_nameserver$dns_local'], fallback: ['$dns_fallback'], fallback-filter: {geoip: true}}'
+		dns='dns: {enable: true, '$dns_v6', listen: 0.0.0.0:'$dns_port', use-hosts: true, enhanced-mode: redir-host, default-nameserver: ['$dns_default', 127.0.0.1:53], nameserver: ['$dns_nameserver$dns_local'], fallback: ['$dns_fallback'], fallback-filter: {geoip: true}}'
 	fi
 	#设置目录
 	yaml=$clashdir/config.yaml
 	tmpdir=/tmp/clash_$USER
+	#预读取变量
+	mode=$(grep "^mode" $yaml | head -1 | awk '{print $2}')
+	[ -z "$mode" ] && mode='Rule'
 	#预删除需要添加的项目
 	a=$(grep -n "port:" $yaml | head -1 | cut -d ":" -f 1)
 	b=$(grep -n "^prox" $yaml | head -1 | cut -d ":" -f 1)
@@ -254,7 +274,7 @@ mixed-port: $mix_port
 redir-port: $redir_port
 authentication: ["$authentication"]
 $lan
-$mode
+mode: $mode
 $log
 $ipv6
 external-controller: :$db_port
@@ -271,9 +291,9 @@ EOF
 	cut -c 1- $tmpdir/set.yaml $yaml_user $tmpdir/proxy.yaml > $tmpdir/config.yaml
 	#插入自定义规则
 	sed -i "/#自定义规则/d" $tmpdir/config.yaml
+	space=$(sed -n '/^rules/{n;p}' $tmpdir/proxy.yaml | grep -oE '^\ *') #获取空格数
 	if [ -f $clashdir/rules.yaml ];then
 		sed -i '/^$/d' $clashdir/rules.yaml && echo >> $clashdir/rules.yaml #处理换行
-		space=$(sed -n '/^rules/{n;p}' $tmpdir/proxy.yaml | grep -oE '^\ *') #获取空格数
 		while read line;do
 			[ -z "$(echo "$line " | grep '#')" ] && \
 			[ -n "$(echo "$line" | grep '\-\ ')" ] && \
@@ -281,6 +301,10 @@ EOF
 			sed -i "/^rules:/a\\$space$line #自定义规则" $tmpdir/config.yaml
 		done < $clashdir/rules.yaml
 	fi
+	#tun/fake-ip防止流量回环
+	if [ "$redir_mod" = "混合模式" -o "$redir_mod" = "Tun模式" -o "$dns_mod" = "fake-ip" ];then
+		sed -i "/^rules:/a\\$space- SRC-IP-CIDR,198.18.0.0/16,REJECT #自定义规则(防止回环)" $tmpdir/config.yaml
+	fi
 	#如果没有使用小闪存模式
 	if [ "$tmpdir" != "$bindir" ];then
 		cmp -s $tmpdir/config.yaml $yaml >/dev/null 2>&1
@@ -309,8 +333,11 @@ cn_ip_route(){
 	fi
 }
 start_redir(){
-	#获取本地局域网地址段
-	gethost
+	#允许tun网卡接受流量
+	if [ "$redir_mod" = "Tun模式" -o "$redir_mod" = "混合模式" ];then
+		iptables -I FORWARD -o utun -j ACCEPT
+		[ "$ipv6_support" = "已开启" ] && ip6tables -I FORWARD -o utun -j ACCEPT > /dev/null 2>&1
+	fi
 	#流量过滤规则
 	iptables -t nat -N clash
 	iptables -t nat -A clash -d 0.0.0.0/8 -j RETURN
@@ -334,7 +361,7 @@ start_redir(){
 		done
 		iptables -t nat -A clash -p tcp $ports -j REDIRECT --to-ports $redir_port
 	fi
-	iptables -t nat -A PREROUTING -p tcp $lanhost -j clash
+	iptables -t nat -A PREROUTING -p tcp -j clash
 	if [ "$public_support" = "已开启" ];then
 		iptables -I INPUT -p tcp --dport $mix_port -j ACCEPT
 		iptables -I INPUT -p tcp --dport $db_port -j ACCEPT
@@ -364,11 +391,6 @@ start_redir(){
 	fi
 }
 start_dns(){
-	#允许tun网卡接受流量
-	if [ "$redir_mod" = "Tun模式" -o "$redir_mod" = "混合模式" ];then
-		iptables -I FORWARD -o utun -j ACCEPT
-		[ "$ipv6_support" = "已开启" ] && ip6tables -I FORWARD -o utun -j ACCEPT > /dev/null 2>&1
-	fi
 	#设置dns转发
 	iptables -t nat -N clash_dns
 	if [ "$macfilter_type" = "白名单" -a -n "$(cat $clashdir/mac)" ];then
@@ -411,7 +433,6 @@ start_dns(){
 	fi
 }
 start_udp(){
-	gethost	#获取本地局域网地址段
 	ip rule add fwmark 1 table 100
 	ip route add local default dev lo table 100
 	iptables -t mangle -N clash
@@ -436,7 +457,7 @@ start_udp(){
 		done
 		iptables -t mangle -A clash -p udp -j TPROXY --on-port $redir_port --tproxy-mark 1
 	fi
-	iptables -t mangle -A PREROUTING -p udp $lanhost -j clash
+	iptables -t mangle -A PREROUTING -p udp -j clash
 }
 start_output(){
 	#流量过滤规则
@@ -484,11 +505,10 @@ start_output(){
 	iptables -t nat -A OUTPUT -p udp -j clash_dns_out
 }
 stop_iptables(){
-	gethost #获取本地局域网地址段
    #重置iptables规则
 	ip rule del fwmark 1 table 100  2> /dev/null
 	ip route del local default dev lo table 100 2> /dev/null
-	iptables -t nat -D PREROUTING -p tcp $lanhost -j clash 2> /dev/null
+	iptables -t nat -D PREROUTING -p tcp -j clash 2> /dev/null
 	iptables -D INPUT -p tcp --dport $mix_port -j ACCEPT 2> /dev/null
 	iptables -D INPUT -p tcp --dport $db_port -j ACCEPT 2> /dev/null
 	iptables -t nat -D PREROUTING -p udp -j clash_dns 2> /dev/null
@@ -508,7 +528,7 @@ stop_iptables(){
 	iptables -t nat -F clash_dns_out 2> /dev/null
 	iptables -t nat -X clash_dns_out 2> /dev/null
 	#重置udp规则
-	iptables -t mangle -D PREROUTING -p udp $lanhost -j clash 2> /dev/null
+	iptables -t mangle -D PREROUTING -p udp -j clash 2> /dev/null
 	iptables -t mangle -F clash 2> /dev/null
 	iptables -t mangle -X clash 2> /dev/null
 	#重置ipv6规则
@@ -521,6 +541,10 @@ stop_iptables(){
 	ip6tables -D FORWARD -o utun -j ACCEPT 2> /dev/null
 	#清理ipset规则
 	ipset destroy cn_ip >/dev/null 2>&1
+	#移除dnsmasq转发规则
+	uci del dhcp.@dnsmasq[-1].server >/dev/null 2>&1
+	uci delete dhcp.@dnsmasq[0].cachesize >/dev/null 2>&1
+	/etc/init.d/dnsmasq restart >/dev/null 2>&1
 }
 #面板配置保存相关
 web_save(){
@@ -575,7 +599,6 @@ web_restore(){
 }
 #启动相关
 catpac(){
-	gethost
 	cat > /tmp/clash_pac <<EOF
 function FindProxyForURL(url, host) {
 	if (
@@ -608,7 +631,7 @@ bfstart(){
 		else
 			logger "未找到clash核心，正在下载！" 33
 			if [ -z "$clashcore" ];then
-				[ "$redir_mod" = "混合模式" -o "$redir_mod" = "Tun模式" ] && clashcore=clashpre || clashcore=clash
+				[ "$redir_mod" = "混合模式" -o "$redir_mod" = "Tun模式" ] && clashcore=clash.net || clashcore=clash
 			fi
 			[ -z "$cpucore" ] && source $clashdir/getdate.sh && getcpucore
 			[ -z "$cpucore" ] && logger 找不到设备的CPU信息，请手动指定处理器架构类型！ 31 && setcpucore
@@ -632,6 +655,15 @@ bfstart(){
 			setconfig Geo_v $Geo_v
 		fi
 	fi
+	# if [ "$clashcore" = "clash.meta" -a ! -f $bindir/geosite.dat ];then
+		# if [ -f $clashdir/geosite.dat ];then
+			# mv $clashdir/geosite.dat $bindir/geosite.dat
+		# else
+			# logger "未找到geosite数据库，正在下载！" 33
+			# $0 webget $bindir/geosite.dat $update_url/bin/geosite.dat
+			# [ "$?" = "1" ] && rm -rf $bindir/geosite.dat && logger "数据库下载失败，已退出！" 31 && exit 1
+		# fi
+	# fi
 	#检查dashboard文件
 	if [ -f $clashdir/ui/index.html -a ! -f $bindir/ui/index.html ];then
 		cp -rf $clashdir/ui $bindir
@@ -658,6 +690,7 @@ bfstart(){
 		if [ -z "$(id shellclash 2>/dev/null | grep 'root')" ];then
 			userdel shellclash 2>/dev/null
 			useradd shellclash -u 7890
+			groupmod shellclash -g 7890
 			sed -Ei s/7890:7890/0:7890/g /etc/passwd
 		fi
 		if [ "$start_old" != "已开启" ];then
@@ -676,7 +709,17 @@ afstart(){
 	if [ "$?" = 0 ];then
 		#设置iptables转发规则
 		[ "$dns_mod" = "redir_host" ] && [ "$cn_ip_route" = "已开启" ] && cn_ip_route
-		[ "$redir_mod" != "纯净模式" ] && [ "$dns_no" != "已禁用" ] && start_dns
+		if [ "$redir_mod" != "纯净模式" ] && [ "$dns_no" != "已禁用" ];then
+			if [ "$dns_redir" != "已开启" ];then
+				start_dns
+			else
+				#openwrt使用dnsmasq转发
+				uci del dhcp.@dnsmasq[-1].server >/dev/null 2>&1
+				uci delete dhcp.@dnsmasq[0].resolvfile 2>/dev/null
+				uci add_list dhcp.@dnsmasq[0].server=127.0.0.1#$dns_port > /dev/null 2>&1
+				/etc/init.d/dnsmasq restart >/dev/null 2>&1
+			fi
+		fi
 		[ "$redir_mod" != "纯净模式" ] && [ "$redir_mod" != "Tun模式" ] && start_redir
 		[ "$redir_mod" = "Redir模式" ] && [ "$tproxy_mod" = "已开启" ] && start_udp
 		[ "$local_proxy" = "已开启" ] && [ "$local_type" = "iptables增强模式" ] && start_output
@@ -686,6 +729,11 @@ afstart(){
 		[ "$local_proxy" = "已开启" ] && $0 set_proxy $mix_port $db_port
 		#加载定时任务
 		[ -f $clashdir/cron ] && croncmd $clashdir/cron
+		#流媒体预解析
+		if [ "$netflix_pre" = "已开启" -o "$disneyp_pre" = "已开启" ];then
+			cronset '#ShellClash流媒体预解析' "* */$stearming_int * * * $clashdir/start.sh steaming #ShellClash流媒体预解析"
+			$0 steaming & #后台执行流媒体预解析进程
+		fi		
 		#启用面板配置自动保存
 		if [ "$restore" = false ];then
 			cronset '#每10分钟保存节点配置' "*/10 * * * * test -n \"\$(pidof clash)\" && $clashdir/start.sh web_save #每10分钟保存节点配置"
@@ -758,7 +806,15 @@ restart)
        $0 start
        ;;
 init)
-        [ -d "/etc/storage/clash" ] && clashdir=/etc/storage/clash && profile=/opt/etc/profile
+        if [ -d "/etc/storage/clash" ];then
+			clashdir=/etc/storage/clash
+			if [ -w "/opt/etc/profile" ];then
+				profile=/opt/etc/profile
+			else
+				profile=/etc/profile
+				sed -i '' $profile #将软链接转化为一般文件
+			fi
+		fi
 		[ -d "/jffs/clash" ] && clashdir=/jffs/clash && profile=/jffs/configs/profile.add
 		echo "alias clash=\"$clashdir/clash.sh\"" >> $profile 
 		echo "export clashdir=\"$clashdir\"" >> $profile 
@@ -784,7 +840,7 @@ webget)
 			[ "$6" = "skipceroff" ] && certificate='' || certificate='-k'
 			#[ -n "$7" ] && agent='-A "clash"'
 			result=$(curl $agent -w %{http_code} --connect-timeout 3 $progress $redirect $certificate -o "$2" "$3")
-			[ "$?" != "0" ] && export all_proxy="" && result=$(curl $agent -w %{http_code} --connect-timeout 3 $progress $redirect $certificate -o "$2" "$3")
+			[ "$result" != "200" ] && export all_proxy="" && result=$(curl $agent -w %{http_code} --connect-timeout 3 $progress $redirect $certificate -o "$2" "$3")
 		else
 			if wget --version > /dev/null 2>&1;then
 				[ "$4" = "echooff" ] && progress='-q' || progress='-q --show-progress'
@@ -835,6 +891,36 @@ unset_proxy)
 		sed -i '/all_proxy/'d  $profile
 		sed -i '/ALL_PROXY/'d  $profile
 	;;
+steaming)	
+		#设置循环检测clashDNS端口
+		i=1
+		while [ $i -lt 10 ];do
+			sleep 1
+			nslookup baidu.com 127.0.0.1:${dns_port} > /dev/null 2>&1
+			[ "$?" = 0 ] && i=10
+		done
+		getconfig
+		steaming_dns(){
+			steaming_dir=$clashdir/steaming/${steaming_type}_Domains.list
+			if [ ! -f "$steaming_dir" ];then
+				echo 未找到$steaming_type域名数据库，正在下载！
+				mkdir -p $clashdir/steaming
+				$0 webget "$steaming_dir" "$update_url/bin/${steaming_type}_Domains.list"
+				[ "$?" = "1" ] && logger "$steaming_type数据库文件下载失败"
+			fi
+			if [ -f "$steaming_dir" ];then
+				for line in $(cat $steaming_dir);do
+					[ -n "$line" ] && nslookup "$line" 127.0.0.1:${dns_port}
+				done >/dev/null 2>&1
+				echo "$steaming_type域名预解析完成！"
+			fi
+		}
+		echo
+		echo "正在后台进行流媒体预解析服务，请耐心等待！"
+		[ "$netflix_pre" = "已开启" ] && steaming_type=Netflix && steaming_dns
+		[ "$disneyP_pre" = "已开启" ] && steaming_type=Disney_Plus && steaming_dns
+		echo "请输入回车继续！"
+	;;
 esac

 exit 0
Author	SHA1	Message	Date
juewuy	9873d09a76	v1.5.0-正式版 ~同步最新1.9.0版本内核 ~meta核切换至dev分支版本并移除了geosite的自动下载功能 ~同步最新Geoip及CNIP数据库文件 ~同步最新Dashboard面板文件 ~DNS解析默认不再提供IPV6结果，需手动开启 ~现在将从配置文件中获取运行模式而不是固定的Rule模式 ~在线生成配置文件功能添加对vless协议的支持 ~增加了对vless协议的检测机制，优化使用体验 ~修复使用环境变量设置本机代理不生效的bug ~修复meta内核版本号显示不正常的bug ~修复部分情况下下载出错后不会正常重试的bug	2022-01-31 15:01:08 +08:00
juewuy	a12cdaf5b2	v1.5.0-预览版 ~同步最新1.9.0官方内核及premium内核 ~meta核切换至dev分支版本并移除了geosite的自动下载功能 ~同步最新Geoip及CNIP数据库文件 ~同步最新Dashboard面板文件 ~DNS解析默认不再提供IPV6结果，需手动开启 ~现在将从配置文件中获取运行模式而不是固定的Rule模式 ~在线生成配置文件功能添加对vless协议的支持 ~增加了对vless协议的检测机制，优化使用体验 ~修复使用环境变量设置本机代理不生效的bug ~修复meta内核版本号显示不正常的bug ~修复部分情况下下载出错后不会正常重试的bug	2022-01-31 14:39:32 +08:00
juewuy	4030037f3a	v1.5.0-预览版 ~同步最新1.9.0官方内核及premium内核 ~meta核切换至dev分支版本并移除了geosite的自动下载功能 ~同步最新Geoip及CNIP数据库文件 ~同步最新Dashboard面板文件 ~DNS解析默认不再提供IPV6结果，需手动开启 ~现在将从配置文件中获取运行模式而不是固定的Rule模式 ~在线生成配置文件功能添加对vless协议的支持 ~增加了对vless协议的检测机制，优化使用体验 ~修复使用环境变量设置本机代理不生效的bug ~修复meta内核版本号显示不正常的bug	2022-01-30 22:19:44 +08:00
juewuy	c49ea34b93	v1.5.0-预览版 ~同步最新1.9.0官方内核及premium内核 ~meta核切换至dev分支版本并移除了geosite的自动下载功能 ~同步最新Geoip及CNIP数据库文件 ~同步最新Dashboard面板文件 ~DNS解析默认不再提供IPV6结果，需手动开启 ~现在将从配置文件中获取运行模式而不是固定的Rule模式 ~在线生成配置文件功能添加对vless协议的支持 ~增加了对vless协议的检测机制，优化使用体验 ~修复使用环境变量设置本机代理不生效的bug	2022-01-30 22:07:52 +08:00
juewuy	3072d37387	v1.5.0-预览版 ~同步最新1.9.0官方内核及premium内核 ~同步最新Geoip及CNIP数据库文件 ~同步最新Dashboard面板文件 ~DNS解析默认不再提供IPV6结果，需手动开启 ~现在将从配置文件中获取运行模式而不是固定的Rule模式 ~在线生成配置文件功能添加对vless协议的支持 ~增加了对vless协议的检测机制，优化使用体验 ~修复使用环境变量设置本机代理不生效的bug	2022-01-30 20:54:34 +08:00
juewuy	4be6c79fe9	优化	2022-01-30 14:41:48 +02:00
juewuy	9381d803fb	增加v2fly奈飞规则源地址	2022-01-30 14:23:24 +02:00
juewuy	4be10c9091	增加大量奈飞规则源地址	2022-01-30 14:03:52 +02:00
juewuy	502ac9e579	还原变更	2022-01-30 13:55:21 +02:00
juewuy	f30b59cfbc	调试奈飞规则	2022-01-30 13:51:11 +02:00
juewuy	9ee90187d1	修改说明	2022-01-30 13:46:33 +02:00
juewuy	251a5614fb	修改安装描述	2022-01-30 15:23:26 +08:00
juewuy	8cbc6e64f8	v1.5.0-预览版 ~DNS解析默认不再提供IPV6结果，需手动开启 ~现在将从配置文件中获取运行模式而不是固定的Rule模式 ~在线生成配置文件功能添加对vless协议的支持 ~增加了对vless协议的检测机制，优化使用体验 ~修复使用环境变量设置本机代理不生效的bug	2022-01-30 15:03:54 +08:00
juewuy	b3fa32e789	v1.5.0-预览版 ~DNS解析默认不再提供IPV6结果，需手动开启 ~现在将从配置文件中获取运行模式而不是固定的Rule模式 ~在线生成配置文件功能添加对vless协议的支持 ~增加了对vless协议的检测机制，优化使用体验 ~修复使用环境变量设置本机代理不生效的bug	2022-01-30 12:50:25 +08:00
juewuy	4f90ca2af0	Merge pull request #107 from RikudouPatrickstar/patch-2 调整 clashservice	2022-01-30 10:39:02 +08:00
RikudouPatrickstar	aa1bb1fbd3	取消 clash 内核日志输出	2022-01-27 13:12:28 +08:00
RikudouPatrickstar	c28b2fafdc	添加 bfstart 返回值判断	2022-01-21 17:14:31 +08:00
juewuy	4195500d5f	v1.4.12 ~优化内置DNS设置工具，默认支持返回支持ipv6的DNS解析 ~增加流媒体预解析工具 ~修复tun模式类型异常的bug	2022-01-19 20:52:32 +08:00
juewuy	d0d8458d6a	v1.4.11 ~增加流媒体预解析工具 ~修复tun模式类型异常的bug	2022-01-15 16:22:48 +08:00
juewuy	6186730bbf	v1.4.11 ~增加流媒体预解析工具 ~修复tun模式类型异常的bug	2022-01-15 16:22:26 +08:00
juewuy	d2ac69c946	v1.4.11 ~增加流媒体预解析工具	2022-01-15 15:16:11 +08:00
juewuy	b590a7625c	部分规则权重调整	2022-01-09 19:23:42 +08:00
juewuy	c5f19962bf	v1.4.10 ~替换大量默认规则为自写规则（acl4ssr优化版） ~增加新手引导中对开启公网访问的指引 ~增加defaultDNS参数（无需额外配置） ~修复部分情况下配置文件报错bug ~尝试适配meta核心的tun模块（未测试） ~增加自动下载meta核心必需的geosite.dat数据库功能	2022-01-08 20:32:11 +08:00
juewuy	ddabecd112	v1.4.10 ~替换大量默认规则为自写规则（acl4ssr优化版） ~增加新手引导中对开启公网访问的指引 ~增加defaultDNS参数（无需额外配置） ~修复部分情况下配置文件报错bug ~尝试适配meta核心的tun模块（未测试） ~增加自动下载meta核心必需的geosite.dat数据库功能	2022-01-08 20:26:49 +08:00
juewuy	2208bb3e5c	v1.4.10 ~替换默认规则为自写规则（acl4ssr优化版） ~增加新手引导中对开启公网访问的引导 ~增加defaultDNS ~修复部分配置文件报错bug ~尝试适配meta核心的tun模块 ~增加自动下载meta核心必需的geosite.dat数据库功能	2022-01-08 20:19:50 +08:00
juewuy	7a0c336e7d	v1.4.10 ~替换默认规则为自写规则（acl4ssr优化版） ~增加新手引导中对开启公网访问的引导 ~增加defaultDNS ~修复部分配置文件报错bug ~尝试适配meta核心的tun模块	2022-01-08 19:11:53 +08:00
juewuy	0a29c1b553	v1.4.10 ~替换默认规则为自写规则（acl4ssr优化版） ~增加新手引导中对开启公网访问的引导 ~增加defaultDNS ~修复部分配置文件报错bug ~尝试适配meta核心的tun模块	2022-01-08 19:09:03 +08:00
juewuy	988751d9cd	v1.4.10 ~替换默认规则为自写规则（acl4ssr优化版） ~增加新手引导中对开启公网访问的引导 ~增加defaultDNS ~修复部分配置文件报错bug ~尝试适配meta核心的tun模块	2022-01-08 19:01:49 +08:00
juewuy	81df5db2f5	v1.4.10 ~替换默认规则为自写规则（acl4ssr优化版） ~增加新手引导中对开启公网访问的引导 ~增加defaultDNS ~修复部分配置文件报错bug ~尝试适配meta核心的tun模块	2022-01-08 18:58:15 +08:00
juewuy	2c7c8a70c0	v1.4.10 ~替换默认规则为自写规则（acl4ssr优化版） ~增加新手引导中对开启公网访问的引导 ~增加defaultDNS ~修复部分配置文件报错bug ~尝试适配meta核心的tun模块	2022-01-08 18:52:46 +08:00
juewuy	f9518d063c	v1.4.10 ~替换默认规则为自写规则（acl4ssr优化版） ~增加新手引导中对开启公网访问的引导 ~增加defaultDNS ~修复部分配置文件报错bug ~尝试适配meta核心的tun模块	2022-01-08 18:16:22 +08:00
juewuy	2fc57559ee	v1.4.10 ~替换默认规则为自写规则（acl4ssr优化版） ~增加新手引导中对开启公网访问的引导 ~增加defaultDNS ~修复部分配置文件报错bug ~尝试适配meta核心的tun模块	2022-01-08 18:16:05 +08:00
juewuy	329b458a29	v1.4.10 ~替换默认规则为自写规则（acl4ssr优化版） ~增加新手引导中对开启公网访问的引导 ~增加defaultDNS ~修复部分配置文件报错bug ~尝试适配meta核心的tun模块	2022-01-08 18:12:20 +08:00
juewuy	4b9a385a31	v1.4.10 ~替换默认规则为自写规则（acl4ssr优化版） ~增加新手引导中对开启公网访问的引导 ~增加defaultDNS ~修复部分配置文件报错bug ~尝试适配meta核心的tun模块	2022-01-08 18:06:25 +08:00
juewuy	08c5a54cdc	v1.4.10 ~替换默认规则为自写规则（acl4ssr优化版） ~增加新手引导中对开启公网访问的引导 ~增加defaultDNS ~修复部分配置文件报错bug ~尝试适配meta核心的tun模块	2022-01-08 17:50:20 +08:00
juewuy	d8bcdc697f	v1.4.10 ~替换默认规则为自写规则（acl4ssr优化版） ~增加新手引导中对开启公网访问的引导 ~增加defaultDNS ~修复部分配置文件报错bug ~尝试适配meta核心的tun模块	2022-01-08 17:42:39 +08:00
juewuy	8fed757b7b	v1.4.10 ~替换默认规则为自写规则（acl4ssr优化版） ~增加新手引导中对开启公网访问的引导 ~增加defaultDNS ~修复部分配置文件报错bug ~尝试适配meta核心的tun模块	2022-01-08 17:26:51 +08:00
juewuy	5d3c996fac	v1.4.10 ~替换默认规则为自写规则（acl4ssr优化版） ~增加新手引导中对开启公网访问的引导 ~增加defaultDNS ~修复部分配置文件报错bug ~尝试适配meta核心的tun模块	2022-01-08 17:25:20 +08:00
juewuy	9e53658493	v1.4.10 ~替换默认规则为自写规则（acl4ssr优化版） ~增加新手引导中对开启公网访问的引导 ~增加defaultDNS ~修复部分配置文件报错bug ~尝试适配meta核心的tun模块	2022-01-08 17:21:06 +08:00
juewuy	a01f85f88b	v1.4.9 ~增加meta内核 ~增加对更多华硕/梅林设备的支持 ~修复部分设备修改端口时报错的bug ~尝试修复tun/混合模式时产生流量回环的bug	2022-01-05 23:23:52 +08:00
juewuy	c4b93ddadd	v1.4.9 ~增加meta内核 ~增加对更多华硕/梅林设备的支持 ~修复部分设备修改端口时报错的bug ~尝试修复tun/混合模式时产生流量回环的bug	2022-01-05 23:20:48 +08:00
juewuy	42bc60c5c6	v1.4.9 ~增加meta内核 ~增加对更多华硕/梅林设备的支持 ~修复部分设备修改端口时报错的bug	2022-01-05 23:15:31 +08:00
juewuy	752eb4cf6c	v1.4.9 ~增加meta内核 ~增加对更多华硕/梅林设备的支持 ~修复部分设备修改端口时报错的bug	2022-01-05 22:48:29 +08:00
juewuy	83a902df03	v1.4.9 ~增加对更多华硕/梅林设备的支持 ~修复部分设备修改端口时报错的bug	2022-01-04 20:12:14 +08:00
juewuy	1969c8cb8c	v1.4.8 ~同步1.7.6版本.net内核 ~同步最新版本GeoIP数据库文件 ~在线生成配置文件时，默认添加udp支持 ~修复个人sub源无法使用的bug ~修复小闪存模式下面板无法正常更新的bug	2022-01-02 23:38:35 +08:00
juewuy	8dcaa7908f	v1.4.8 ~同步1.7.6版本.net内核 ~同步最新版本GeoIP数据库文件 ~在线生成配置文件时，默认添加udp支持 ~修复个人sub源无法使用的bug ~修复小闪存模式下面板无法正常更新的bug	2022-01-02 20:39:18 +08:00
juewuy	1341e90f72	v1.4.7 ~添加个人服务器安装源及sub源 ~更新安装说明 ~更新根证书文件	2021-12-20 20:34:42 +08:00
juewuy	600305c39b	v1.4.6 ~添加个人服务器安装源及sub源 ~更新安装说明	2021-12-20 20:33:31 +08:00
juewuy	cbef3d139c	修改安装源	2021-12-20 14:54:31 +08:00
juewuy	b4bddc4f0e	v1.4.6 ~适配更多华硕设备（待测试） ~增加Openwrt系统使用Dnsmasq转发DNS的设置（7-6，未测试） ~替换部分在线生成服务器地址 ~部分内容文字描述调整	2021-12-18 20:14:28 +08:00
juewuy	b315dee718	v1.4.6 ~适配更多华硕设备（待测试） ~增加Openwrt系统使用Dnsmasq转发DNS的设置（7-6，未测试） ~替换部分在线生成服务器地址 ~部分内容文字描述调整	2021-12-18 20:14:03 +08:00
juewuy	8b241be6c1	v1.4.5 ~同步最新Dashboard面板文件 ~同步最新Geoip数据库文件	2021-12-06 23:46:03 +08:00
juewuy	732679cac9	v1.4.5 ~同步最新Dashboard面板文件 ~同步最新Geoip数据库文件	2021-12-05 22:04:49 +08:00
juewuy	e312d5e8cd	v1.4.5 ~同步最新Dashboard面板文件 ~同步最新Geoip数据库文件	2021-12-05 22:02:52 +08:00
juewuy	4a59e858e9	v1.4.4-test ~同步最新1.7.1clash核心 ~同步最新Geoip数据库文件	2021-10-29 17:51:03 +08:00
juewuy	4bc922dee6	v1.4.5-test ~同步最新1.7.1clash核心 ~同步最新Geoip数据库文件	2021-09-16 13:05:08 +08:00
juewuy	2c59be20f3	v1.4.4-test ~适配hanwckf及chongshengb等版本Padavan固件 ~增加clash.net核心 ~增加脚本设置一键备份还原功能	2021-08-30 18:03:37 +08:00
juewuy	b3a153e684	v1.4.4-test ~适配hanwckf及chongshengb等版本Padavan固件 ~增加clash.net核心 ~增加脚本设置一键备份还原功能	2021-08-30 18:00:09 +08:00
juewuy	4767a9dc3a	v1.4.4-test ~适配hanwckf及chongshengb等版本Padavan固件 ~增加clash.net核心 ~增加脚本设置一键备份还原功能	2021-08-30 17:49:33 +08:00
juewuy	5159886b64	Merge pull request #74 from light-d/patch-1 Update README_CN.md	2021-08-30 17:10:58 +08:00
juewuy	47437a1826	Merge pull request #72 from w1ndy/patch-1 Change group id to match iptable rules	2021-08-30 17:10:45 +08:00
light-d	d49b36fe2f	Update README_CN.md line67 install_n.sh is not available, use install.sh instead	2021-08-26 01:56:53 +08:00
Di Weng	16ce0c997c	Change group id to match iptable rules	2021-08-25 13:38:19 +08:00
juewuy	cd801e120c	v1.4.4-test ~适配hanwckf及chongshengb等版本Padavan固件	2021-07-26 16:50:00 +08:00