Merge pull request #167 from itdoginfo/dis-cf

Dis cf

Subnets/IPv4/Discord.lst

@@ -1,6 +1,6 @@
 138.128.136.0/21
-162.159.0.0/16
+162.158.0.0/15
-172.65.202.19/32
+172.64.0.0/13
 34.0.0.0/15
 34.2.0.0/15
 35.192.0.0/12

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

Subnets/IPv4/discord.lst

@@ -1,6 +1,6 @@
 138.128.136.0/21
-162.159.0.0/16
+162.158.0.0/15
-172.65.202.19/32
+172.64.0.0/13
 34.0.0.0/15
 34.2.0.0/15
 35.192.0.0/12

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

@@ -10,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
@@ -114,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
@@ -141,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
@@ -221,8 +225,8 @@
 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
@@ -281,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
@@ -379,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
@@ -390,7 +395,6 @@
 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
@@ -420,7 +424,7 @@
 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

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
@@ -801,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

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
@@ -801,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

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
@@ -801,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

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
@@ -801,6 +802,7 @@ myaccount.partypoker.com
 myarena.ru
 myarena.site
 mybook.ru
+myfanfic.ru
 myshows.me
 mysku.club
 mysku.ru

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
@@ -801,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

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
@@ -801,6 +802,7 @@ myaccount.partypoker.com
 myarena.ru
 myarena.site
 mybook.ru
+myfanfic.ru
 myshows.me
 mysku.club
 mysku.ru

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