Merge pull request #167 from itdoginfo/dis-cf

Dis cf

Subnets/IPv4/Meta.lst

@@ -36,7 +36,7 @@
 129.134.164.0/23
 129.134.168.0/21
 129.134.176.0/20
-129.134.194.0/24
+129.134.194.0/23
 129.134.196.0/24
 157.240.0.0/17
 157.240.128.0/23

Subnets/IPv4/digitalocean.lst

@@ -41,6 +41,7 @@
 129.212.144.0/20
 129.212.160.0/21
 129.212.168.0/22
+129.212.174.0/24
 129.212.176.0/20
 129.212.192.0/18
 134.122.0.0/17
@@ -135,9 +136,7 @@
 165.232.32.0/19
 165.232.64.0/18
 165.232.128.0/18
-165.245.128.0/18
+165.245.128.0/17
-165.245.192.0/19
-165.245.224.0/20
 167.71.0.0/16
 167.99.0.0/16
 167.172.0.0/16
@@ -146,8 +145,8 @@
 168.144.16.0/20
 168.144.32.0/20
 168.144.48.0/22
-168.144.64.0/19
+168.144.64.0/18
-168.144.96.0/20
+168.144.128.0/20
 170.64.128.0/17
 174.138.0.0/17
 178.62.0.0/16

Subnets/IPv4/meta.lst

@@ -36,7 +36,7 @@
 129.134.164.0/23
 129.134.168.0/21
 129.134.176.0/20
-129.134.194.0/24
+129.134.194.0/23
 129.134.196.0/24
 157.240.0.0/17
 157.240.128.0/23

Subnets/IPv4/ovh.lst

@@ -1,7 +1,6 @@
 2.26.132.0/24
 2.26.153.0/24
 2.26.166.0/24
-2.27.107.0/24
 2.27.172.0/24
 2.27.243.0/24
 2.58.172.0/24
@@ -11,10 +10,12 @@
 5.135.0.0/16
 5.175.164.0/24
 5.175.168.0/24
+5.175.179.0/24
 5.175.195.0/24
 5.178.106.0/24
 5.178.110.0/24
 5.182.19.0/24
+5.183.214.0/24
 5.196.0.0/16
 5.231.207.0/24
 8.7.244.0/24
@@ -50,6 +51,7 @@
 37.60.48.0/20
 37.139.130.0/24
 37.187.0.0/16
+40.27.29.0/24
 40.160.0.0/17
 40.160.128.0/19
 40.160.224.0/22
@@ -65,7 +67,6 @@
 40.160.252.0/24
 40.160.254.0/24
 40.183.94.0/24
-40.183.103.0/24
 43.226.0.0/23
 45.39.79.0/24
 45.43.142.0/24
@@ -115,6 +116,7 @@
 62.122.126.0/24
 62.141.62.0/24
 63.251.117.0/24
+64.81.171.0/24
 64.83.69.0/24
 64.94.92.0/23
 64.95.150.0/23
@@ -124,14 +126,12 @@
 66.92.25.0/24
 66.92.161.0/24
 66.92.168.0/24
-66.179.22.0/24
 66.179.218.0/23
 67.63.54.0/24
 68.65.214.0/24
 68.232.108.0/24
 69.17.37.0/24
 69.72.31.0/24
-72.244.39.0/24
 72.251.0.0/17
 77.73.34.0/24
 77.74.120.0/23
@@ -144,6 +144,7 @@
 77.246.211.0/24
 79.110.61.0/24
 79.137.0.0/17
+79.172.216.0/24
 80.71.226.0/24
 80.87.206.0/24
 80.240.94.0/24
@@ -159,6 +160,7 @@
 82.29.126.0/24
 82.38.2.0/24
 82.38.32.0/24
+82.38.35.0/24
 82.38.82.0/24
 82.38.124.0/22
 82.38.140.0/22
@@ -192,6 +194,7 @@
 82.41.204.0/22
 82.41.212.0/22
 82.41.224.0/21
+82.47.36.0/23
 82.117.230.0/23
 82.117.245.0/24
 82.129.0.0/22
@@ -215,21 +218,24 @@
 84.32.10.0/24
 85.217.144.0/23
 86.54.26.0/24
+87.76.144.0/24
 87.76.170.0/24
 87.98.128.0/17
 87.229.51.0/24
 88.216.221.0/24
 88.218.34.0/24
 89.19.44.0/24
-89.21.84.0/24
 89.125.172.0/24
+89.144.54.0/24
 91.90.88.0/21
 91.121.0.0/16
+91.124.14.0/24
 91.124.192.0/24
 91.124.199.0/24
 91.134.0.0/16
 91.198.19.0/24
 91.199.32.0/24
+91.199.42.0/24
 91.213.192.0/24
 91.224.117.0/24
 91.246.38.0/24
@@ -240,7 +246,6 @@
 92.118.168.0/24
 92.222.0.0/16
 92.246.224.0/19
-92.249.62.0/24
 93.88.206.0/24
 93.114.69.0/24
 93.174.111.0/24
@@ -280,10 +285,10 @@
 123.100.227.0/24
 128.0.118.0/24
 132.243.197.0/24
+134.195.148.0/24
 135.125.0.0/16
 135.148.0.0/16
 136.0.95.0/24
-136.0.248.0/24
 137.74.0.0/16
 137.83.50.0/24
 138.249.2.0/24
@@ -295,6 +300,7 @@
 141.11.39.0/24
 141.11.45.0/24
 141.11.74.0/23
+141.11.96.0/24
 141.11.107.0/24
 141.11.187.0/24
 141.11.250.0/24
@@ -325,6 +331,7 @@
 142.4.192.0/19
 142.44.128.0/17
 142.111.85.0/24
+142.249.79.0/24
 142.252.51.0/24
 142.252.115.0/24
 142.252.127.0/24
@@ -333,7 +340,6 @@
 143.20.195.0/24
 144.2.32.0/19
 144.31.149.0/24
-144.172.73.0/24
 144.217.0.0/16
 144.225.112.0/24
 144.225.123.0/24
@@ -364,6 +370,7 @@
 151.243.6.0/24
 151.243.120.0/24
 151.243.160.0/22
+151.243.166.0/24
 151.243.236.0/24
 151.244.78.0/24
 151.245.54.0/24
@@ -376,6 +383,7 @@
 151.247.217.0/24
 152.228.128.0/17
 155.117.5.0/24
+155.117.127.0/24
 155.117.210.0/24
 155.117.212.0/23
 155.117.233.0/24
@@ -387,17 +395,16 @@
 162.19.0.0/16
 162.141.71.0/24
 162.212.35.0/24
-163.5.50.0/24
 163.5.62.0/24
 163.5.149.0/24
 163.5.187.0/24
 163.223.88.0/24
+164.37.39.0/24
 164.132.0.0/16
 166.0.112.0/24
 166.1.88.0/24
 166.1.90.0/24
 166.1.231.0/24
-167.94.252.0/24
 167.114.0.0/16
 167.148.125.0/24
 167.148.193.0/24
@@ -412,11 +419,12 @@
 172.83.201.0/24
 176.31.0.0/16
 178.32.0.0/15
+178.214.214.0/24
 180.131.145.0/24
 181.41.194.0/24
 184.174.96.0/23
 184.174.99.0/24
-185.2.49.0/24
+185.2.48.0/23
 185.5.39.0/24
 185.10.200.0/22
 185.12.32.0/23
@@ -466,6 +474,7 @@
 192.109.11.0/24
 192.124.170.0/24
 192.124.180.0/24
+192.144.79.0/24
 192.152.126.0/24
 192.177.90.0/24
 192.207.105.0/24
@@ -509,7 +518,6 @@
 203.5.184.0/24
 203.27.201.0/24
 205.234.176.0/24
-206.123.148.0/24
 206.168.95.0/24
 206.168.174.0/23
 206.206.126.0/24
@@ -547,3 +555,4 @@
 217.65.73.0/24
 217.182.0.0/16
 217.217.26.0/24
+222.167.192.0/24

Subnets/IPv6/Meta.lst

@@ -31,8 +31,7 @@
 2a03:2887:ff62::/47
 2a03:2887:ff64::/46
 2a03:2887:ff68::/46
-2a03:2887:ff70::/47
+2a03:2887:ff70::/46
-2a03:2887:ff73::/48
 2c0f:ef78:3::/48
 2c0f:ef78:5::/48
 2c0f:ef78:9::/48

Subnets/IPv6/cloudfront.lst

@@ -20,6 +20,7 @@
 2600:9000:5308::/45
 2600:9000:f534::/46
 2600:f0f0:601::/48
+2600:f0f1:14::/48
 2600:9000:f520::/44
 2600:9000:5320::/43
 2600:9000:5310::/44

Subnets/IPv6/digitalocean.lst

@@ -4,6 +4,7 @@
 2604:a880::/47
 2604:a880:2::/48
 2604:a880:4::/46
+2604:a880:8::/48
 2604:a880:51::/48
 2604:a880:400::/48
 2604:a880:800::/48

Subnets/IPv6/meta.lst

@@ -31,8 +31,7 @@
 2a03:2887:ff62::/47
 2a03:2887:ff64::/46
 2a03:2887:ff68::/46
-2a03:2887:ff70::/47
+2a03:2887:ff70::/46
-2a03:2887:ff73::/48
 2c0f:ef78:3::/48
 2c0f:ef78:5::/48
 2c0f:ef78:9::/48

Ukraine/inside-clashx.lst

@@ -249,6 +249,7 @@ DOMAIN-SUFFIX,depirf.ru
 DOMAIN-SUFFIX,des-life.ru
 DOMAIN-SUFFIX,developer.qiwi.com
 DOMAIN-SUFFIX,deviantart.net
+DOMAIN-SUFFIX,diakov.net
 DOMAIN-SUFFIX,digitalrussia.tv
 DOMAIN-SUFFIX,dimonvideo.ru
 DOMAIN-SUFFIX,direct.yandex.ru
@@ -314,6 +315,7 @@ DOMAIN-SUFFIX,e1.ru
 DOMAIN-SUFFIX,eadaily.com
 DOMAIN-SUFFIX,easynod.ru
 DOMAIN-SUFFIX,easynod.servebeer.com
+DOMAIN-SUFFIX,eax.me
 DOMAIN-SUFFIX,econri.org
 DOMAIN-SUFFIX,edem.tv
 DOMAIN-SUFFIX,edemtv.me
@@ -800,6 +802,7 @@ DOMAIN-SUFFIX,myaccount.partypoker.com
 DOMAIN-SUFFIX,myarena.ru
 DOMAIN-SUFFIX,myarena.site
 DOMAIN-SUFFIX,mybook.ru
+DOMAIN-SUFFIX,myfanfic.ru
 DOMAIN-SUFFIX,myshows.me
 DOMAIN-SUFFIX,mysku.club
 DOMAIN-SUFFIX,mysku.ru
@@ -1044,6 +1047,7 @@ DOMAIN-SUFFIX,remontflash.ru
 DOMAIN-SUFFIX,remontka.pro
 DOMAIN-SUFFIX,remplanner.ru
 DOMAIN-SUFFIX,ren.tv
+DOMAIN-SUFFIX,repack.me
 DOMAIN-SUFFIX,reporter-crimea.ru
 DOMAIN-SUFFIX,republic-tv.ru
 DOMAIN-SUFFIX,rezka.ag

Ukraine/inside-dnsmasq-ipset.lst

@@ -249,6 +249,7 @@ ipset=/depirf.ru/vpn_domains
 ipset=/des-life.ru/vpn_domains
 ipset=/developer.qiwi.com/vpn_domains
 ipset=/deviantart.net/vpn_domains
+ipset=/diakov.net/vpn_domains
 ipset=/digitalrussia.tv/vpn_domains
 ipset=/dimonvideo.ru/vpn_domains
 ipset=/direct.yandex.ru/vpn_domains
@@ -314,6 +315,7 @@ ipset=/e1.ru/vpn_domains
 ipset=/eadaily.com/vpn_domains
 ipset=/easynod.ru/vpn_domains
 ipset=/easynod.servebeer.com/vpn_domains
+ipset=/eax.me/vpn_domains
 ipset=/econri.org/vpn_domains
 ipset=/edem.tv/vpn_domains
 ipset=/edemtv.me/vpn_domains
@@ -800,6 +802,7 @@ ipset=/myaccount.partypoker.com/vpn_domains
 ipset=/myarena.ru/vpn_domains
 ipset=/myarena.site/vpn_domains
 ipset=/mybook.ru/vpn_domains
+ipset=/myfanfic.ru/vpn_domains
 ipset=/myshows.me/vpn_domains
 ipset=/mysku.club/vpn_domains
 ipset=/mysku.ru/vpn_domains
@@ -1044,6 +1047,7 @@ ipset=/remontflash.ru/vpn_domains
 ipset=/remontka.pro/vpn_domains
 ipset=/remplanner.ru/vpn_domains
 ipset=/ren.tv/vpn_domains
+ipset=/repack.me/vpn_domains
 ipset=/reporter-crimea.ru/vpn_domains
 ipset=/republic-tv.ru/vpn_domains
 ipset=/rezka.ag/vpn_domains

Ukraine/inside-dnsmasq-nfset.lst

@@ -249,6 +249,7 @@ nftset=/depirf.ru/4#inet#fw4#vpn_domains
 nftset=/des-life.ru/4#inet#fw4#vpn_domains
 nftset=/developer.qiwi.com/4#inet#fw4#vpn_domains
 nftset=/deviantart.net/4#inet#fw4#vpn_domains
+nftset=/diakov.net/4#inet#fw4#vpn_domains
 nftset=/digitalrussia.tv/4#inet#fw4#vpn_domains
 nftset=/dimonvideo.ru/4#inet#fw4#vpn_domains
 nftset=/direct.yandex.ru/4#inet#fw4#vpn_domains
@@ -314,6 +315,7 @@ nftset=/e1.ru/4#inet#fw4#vpn_domains
 nftset=/eadaily.com/4#inet#fw4#vpn_domains
 nftset=/easynod.ru/4#inet#fw4#vpn_domains
 nftset=/easynod.servebeer.com/4#inet#fw4#vpn_domains
+nftset=/eax.me/4#inet#fw4#vpn_domains
 nftset=/econri.org/4#inet#fw4#vpn_domains
 nftset=/edem.tv/4#inet#fw4#vpn_domains
 nftset=/edemtv.me/4#inet#fw4#vpn_domains
@@ -800,6 +802,7 @@ nftset=/myaccount.partypoker.com/4#inet#fw4#vpn_domains
 nftset=/myarena.ru/4#inet#fw4#vpn_domains
 nftset=/myarena.site/4#inet#fw4#vpn_domains
 nftset=/mybook.ru/4#inet#fw4#vpn_domains
+nftset=/myfanfic.ru/4#inet#fw4#vpn_domains
 nftset=/myshows.me/4#inet#fw4#vpn_domains
 nftset=/mysku.club/4#inet#fw4#vpn_domains
 nftset=/mysku.ru/4#inet#fw4#vpn_domains
@@ -1044,6 +1047,7 @@ nftset=/remontflash.ru/4#inet#fw4#vpn_domains
 nftset=/remontka.pro/4#inet#fw4#vpn_domains
 nftset=/remplanner.ru/4#inet#fw4#vpn_domains
 nftset=/ren.tv/4#inet#fw4#vpn_domains
+nftset=/repack.me/4#inet#fw4#vpn_domains
 nftset=/reporter-crimea.ru/4#inet#fw4#vpn_domains
 nftset=/republic-tv.ru/4#inet#fw4#vpn_domains
 nftset=/rezka.ag/4#inet#fw4#vpn_domains

Ukraine/inside-kvas.lst

@@ -249,6 +249,7 @@ depirf.ru
 des-life.ru
 developer.qiwi.com
 deviantart.net
+diakov.net
 digitalrussia.tv
 dimonvideo.ru
 direct.yandex.ru
@@ -314,6 +315,7 @@ e1.ru
 eadaily.com
 easynod.ru
 easynod.servebeer.com
+eax.me
 econri.org
 edem.tv
 edemtv.me
@@ -800,6 +802,7 @@ myaccount.partypoker.com
 myarena.ru
 myarena.site
 mybook.ru
+myfanfic.ru
 myshows.me
 mysku.club
 mysku.ru
@@ -1044,6 +1047,7 @@ remontflash.ru
 remontka.pro
 remplanner.ru
 ren.tv
+repack.me
 reporter-crimea.ru
 republic-tv.ru
 rezka.ag

Ukraine/inside-mikrotik-fwd.lst

@@ -249,6 +249,7 @@
 /ip dns static add name=des-life.ru type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=developer.qiwi.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=deviantart.net type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
+/ip dns static add name=diakov.net type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=digitalrussia.tv type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=dimonvideo.ru type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=direct.yandex.ru type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
@@ -314,6 +315,7 @@
 /ip dns static add name=eadaily.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=easynod.ru type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=easynod.servebeer.com type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
+/ip dns static add name=eax.me type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=econri.org type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=edem.tv type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=edemtv.me type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
@@ -800,6 +802,7 @@
 /ip dns static add name=myarena.ru type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=myarena.site type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=mybook.ru type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
+/ip dns static add name=myfanfic.ru type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=myshows.me type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=mysku.club type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=mysku.ru type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
@@ -1044,6 +1047,7 @@
 /ip dns static add name=remontka.pro type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=remplanner.ru type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=ren.tv type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
+/ip dns static add name=repack.me type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=reporter-crimea.ru type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=republic-tv.ru type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost
 /ip dns static add name=rezka.ag type=FWD address-list=allow-domains match-subdomain=yes forward-to=localhost

Ukraine/inside-raw.lst

@@ -249,6 +249,7 @@ depirf.ru
 des-life.ru
 developer.qiwi.com
 deviantart.net
+diakov.net
 digitalrussia.tv
 dimonvideo.ru
 direct.yandex.ru
@@ -314,6 +315,7 @@ e1.ru
 eadaily.com
 easynod.ru
 easynod.servebeer.com
+eax.me
 econri.org
 edem.tv
 edemtv.me
@@ -800,6 +802,7 @@ myaccount.partypoker.com
 myarena.ru
 myarena.site
 mybook.ru
+myfanfic.ru
 myshows.me
 mysku.club
 mysku.ru
@@ -1044,6 +1047,7 @@ remontflash.ru
 remontka.pro
 remplanner.ru
 ren.tv
+repack.me
 reporter-crimea.ru
 republic-tv.ru
 rezka.ag

convert.py

@@ -329,9 +329,11 @@ if __name__ == '__main__':
     # Discord (domains + UDP subnets on high ports)
     discord_subnets = lines_from_file('Subnets/IPv4/discord.lst')
     discord_domains = lines_from_file('Services/discord.lst')
+    discord_cf_subnets = ["104.16.0.0/12"]
     srs_rule('discord', [
         {"domain_suffix": discord_domains},
         {"network": ["udp"], "ip_cidr": discord_subnets, "port_range": ["50000:65535"]},
+        {"network": ["udp"], "ip_cidr": discord_cf_subnets, "port_range": ["19000:20000"]},
     ])
 
     # Mihomo main