projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0d7392e
)
[utils] Actualize major IPv4 address blocks per country
author
Sergey M․
<dstftw@gmail.com>
Mon, 28 Oct 2019 23:10:20 +0000
(06:10 +0700)
committer
Sergey M․
<dstftw@gmail.com>
Mon, 28 Oct 2019 23:10:20 +0000
(06:10 +0700)
youtube_dl/utils.py
patch
|
blob
|
history
diff --git
a/youtube_dl/utils.py
b/youtube_dl/utils.py
index 53117ea905b3e00fa5c74349dddb2a8ff565fe90..aed988b884b69c269638d179ad5d15070a1ae260 100644
(file)
--- a/
youtube_dl/utils.py
+++ b/
youtube_dl/utils.py
@@
-4979,7
+4979,7
@@
class ISO3166Utils(object):
class GeoUtils(object):
# Major IPv4 address blocks per country
_country_ip_map = {
class GeoUtils(object):
# Major IPv4 address blocks per country
_country_ip_map = {
- 'AD': '
85.94.160
.0/19',
+ 'AD': '
46.172.224
.0/19',
'AE': '94.200.0.0/13',
'AF': '149.54.0.0/17',
'AG': '209.59.64.0/18',
'AE': '94.200.0.0/13',
'AF': '149.54.0.0/17',
'AG': '209.59.64.0/18',
@@
-4987,28
+4987,30
@@
class GeoUtils(object):
'AL': '46.99.0.0/16',
'AM': '46.70.0.0/15',
'AO': '105.168.0.0/13',
'AL': '46.99.0.0/16',
'AM': '46.70.0.0/15',
'AO': '105.168.0.0/13',
- 'AP': '159.117.192.0/21',
+ 'AP': '182.50.184.0/21',
+ 'AQ': '23.154.160.0/24',
'AR': '181.0.0.0/12',
'AS': '202.70.112.0/20',
'AR': '181.0.0.0/12',
'AS': '202.70.112.0/20',
- 'AT': '
84.112.0.0/13
',
+ 'AT': '
77.116.0.0/14
',
'AU': '1.128.0.0/11',
'AW': '181.41.0.0/18',
'AU': '1.128.0.0/11',
'AW': '181.41.0.0/18',
- 'AZ': '5.191.0.0/16',
+ 'AX': '185.217.4.0/22',
+ 'AZ': '5.197.0.0/16',
'BA': '31.176.128.0/17',
'BB': '65.48.128.0/17',
'BD': '114.130.0.0/16',
'BE': '57.0.0.0/8',
'BA': '31.176.128.0/17',
'BB': '65.48.128.0/17',
'BD': '114.130.0.0/16',
'BE': '57.0.0.0/8',
- 'BF': '1
29.45.128.0/17
',
+ 'BF': '1
02.178.0.0/15
',
'BG': '95.42.0.0/15',
'BH': '37.131.0.0/17',
'BI': '154.117.192.0/18',
'BJ': '137.255.0.0/16',
'BG': '95.42.0.0/15',
'BH': '37.131.0.0/17',
'BI': '154.117.192.0/18',
'BJ': '137.255.0.0/16',
- 'BL': '1
92.131.134.0/24
',
+ 'BL': '1
85.212.72.0/23
',
'BM': '196.12.64.0/18',
'BN': '156.31.0.0/16',
'BO': '161.56.0.0/16',
'BQ': '161.0.80.0/20',
'BM': '196.12.64.0/18',
'BN': '156.31.0.0/16',
'BO': '161.56.0.0/16',
'BQ': '161.0.80.0/20',
- 'BR': '1
52.240
.0.0/12',
+ 'BR': '1
91.128
.0.0/12',
'BS': '24.51.64.0/18',
'BT': '119.2.96.0/19',
'BW': '168.167.0.0/16',
'BS': '24.51.64.0/18',
'BT': '119.2.96.0/19',
'BW': '168.167.0.0/16',
@@
-5016,20
+5018,20
@@
class GeoUtils(object):
'BZ': '179.42.192.0/18',
'CA': '99.224.0.0/11',
'CD': '41.243.0.0/16',
'BZ': '179.42.192.0/18',
'CA': '99.224.0.0/11',
'CD': '41.243.0.0/16',
- 'CF': '19
6.32.200
.0/21',
- 'CG': '1
97.214.128.0/17
',
+ 'CF': '19
7.242.176
.0/21',
+ 'CG': '1
60.113.0.0/16
',
'CH': '85.0.0.0/13',
'CH': '85.0.0.0/13',
- 'CI': '1
54.232
.0.0/14',
+ 'CI': '1
02.136
.0.0/14',
'CK': '202.65.32.0/19',
'CL': '152.172.0.0/14',
'CK': '202.65.32.0/19',
'CL': '152.172.0.0/14',
- 'CM': '1
65.210.0.0/15
',
+ 'CM': '1
02.244.0.0/14
',
'CN': '36.128.0.0/10',
'CO': '181.240.0.0/12',
'CR': '201.192.0.0/12',
'CU': '152.206.0.0/15',
'CV': '165.90.96.0/19',
'CW': '190.88.128.0/17',
'CN': '36.128.0.0/10',
'CO': '181.240.0.0/12',
'CR': '201.192.0.0/12',
'CU': '152.206.0.0/15',
'CV': '165.90.96.0/19',
'CW': '190.88.128.0/17',
- 'CY': '
46.198.0.0/15
',
+ 'CY': '
31.153.0.0/16
',
'CZ': '88.100.0.0/14',
'DE': '53.0.0.0/8',
'DJ': '197.241.0.0/17',
'CZ': '88.100.0.0/14',
'DE': '53.0.0.0/8',
'DJ': '197.241.0.0/17',
@@
-5046,6
+5048,7
@@
class GeoUtils(object):
'EU': '2.16.0.0/13',
'FI': '91.152.0.0/13',
'FJ': '144.120.0.0/16',
'EU': '2.16.0.0/13',
'FI': '91.152.0.0/13',
'FJ': '144.120.0.0/16',
+ 'FK': '80.73.208.0/21',
'FM': '119.252.112.0/20',
'FO': '88.85.32.0/19',
'FR': '90.0.0.0/9',
'FM': '119.252.112.0/20',
'FO': '88.85.32.0/19',
'FR': '90.0.0.0/9',
@@
-5055,8
+5058,8
@@
class GeoUtils(object):
'GE': '31.146.0.0/16',
'GF': '161.22.64.0/18',
'GG': '62.68.160.0/19',
'GE': '31.146.0.0/16',
'GF': '161.22.64.0/18',
'GG': '62.68.160.0/19',
- 'GH': '
45.208.0.0/14
',
- 'GI': '
85.115.128.0/19
',
+ 'GH': '
154.160.0.0/12
',
+ 'GI': '
95.164.0.0/16
',
'GL': '88.83.0.0/19',
'GM': '160.182.0.0/15',
'GN': '197.149.192.0/18',
'GL': '88.83.0.0/19',
'GM': '160.182.0.0/15',
'GN': '197.149.192.0/18',
@@
-5085,13
+5088,13
@@
class GeoUtils(object):
'JE': '87.244.64.0/18',
'JM': '72.27.0.0/17',
'JO': '176.29.0.0/16',
'JE': '87.244.64.0/18',
'JM': '72.27.0.0/17',
'JO': '176.29.0.0/16',
- 'JP': '1
26
.0.0.0/8',
+ 'JP': '1
33
.0.0.0/8',
'KE': '105.48.0.0/12',
'KG': '158.181.128.0/17',
'KH': '36.37.128.0/17',
'KI': '103.25.140.0/22',
'KM': '197.255.224.0/20',
'KE': '105.48.0.0/12',
'KG': '158.181.128.0/17',
'KH': '36.37.128.0/17',
'KI': '103.25.140.0/22',
'KM': '197.255.224.0/20',
- 'KN': '198.
32.3
2.0/19',
+ 'KN': '198.
167.19
2.0/19',
'KP': '175.45.176.0/22',
'KR': '175.192.0.0/10',
'KW': '37.36.0.0/14',
'KP': '175.45.176.0/22',
'KR': '175.192.0.0/10',
'KW': '37.36.0.0/14',
@@
-5099,10
+5102,10
@@
class GeoUtils(object):
'KZ': '2.72.0.0/13',
'LA': '115.84.64.0/18',
'LB': '178.135.0.0/16',
'KZ': '2.72.0.0/13',
'LA': '115.84.64.0/18',
'LB': '178.135.0.0/16',
- 'LC': '
192.147.231.0/24
',
+ 'LC': '
24.92.144.0/20
',
'LI': '82.117.0.0/19',
'LK': '112.134.0.0/15',
'LI': '82.117.0.0/19',
'LK': '112.134.0.0/15',
- 'LR': '
41.86.0.0/19
',
+ 'LR': '
102.183.0.0/16
',
'LS': '129.232.0.0/17',
'LT': '78.56.0.0/13',
'LU': '188.42.0.0/16',
'LS': '129.232.0.0/17',
'LT': '78.56.0.0/13',
'LU': '188.42.0.0/16',
@@
-5127,7
+5130,7
@@
class GeoUtils(object):
'MT': '46.11.0.0/16',
'MU': '105.16.0.0/12',
'MV': '27.114.128.0/18',
'MT': '46.11.0.0/16',
'MU': '105.16.0.0/12',
'MV': '27.114.128.0/18',
- 'MW': '10
5.234.0.0/16
',
+ 'MW': '10
2.70.0.0/15
',
'MX': '187.192.0.0/11',
'MY': '175.136.0.0/13',
'MZ': '197.218.0.0/15',
'MX': '187.192.0.0/11',
'MY': '175.136.0.0/13',
'MZ': '197.218.0.0/15',
@@
-5158,23
+5161,23
@@
class GeoUtils(object):
'PW': '202.124.224.0/20',
'PY': '181.120.0.0/14',
'QA': '37.210.0.0/15',
'PW': '202.124.224.0/20',
'PY': '181.120.0.0/14',
'QA': '37.210.0.0/15',
- 'RE': '1
39.26
.0.0/16',
+ 'RE': '1
02.35
.0.0/16',
'RO': '79.112.0.0/13',
'RO': '79.112.0.0/13',
- 'RS': '
178.220.0.0/14
',
+ 'RS': '
93.86.0.0/15
',
'RU': '5.136.0.0/13',
'RU': '5.136.0.0/13',
- 'RW': '
105.178.0.0/15
',
+ 'RW': '
41.186.0.0/16
',
'SA': '188.48.0.0/13',
'SB': '202.1.160.0/19',
'SC': '154.192.0.0/11',
'SA': '188.48.0.0/13',
'SB': '202.1.160.0/19',
'SC': '154.192.0.0/11',
- 'SD': '1
54.96
.0.0/13',
+ 'SD': '1
02.120
.0.0/13',
'SE': '78.64.0.0/12',
'SE': '78.64.0.0/12',
- 'SG': '
152.56.0.0/14
',
+ 'SG': '
8.128.0.0/10
',
'SI': '188.196.0.0/14',
'SK': '78.98.0.0/15',
'SI': '188.196.0.0/14',
'SK': '78.98.0.0/15',
- 'SL': '1
97.215
.0.0/17',
+ 'SL': '1
02.143
.0.0/17',
'SM': '89.186.32.0/19',
'SN': '41.82.0.0/15',
'SM': '89.186.32.0/19',
'SN': '41.82.0.0/15',
- 'SO': '1
97.220.64.0/19
',
+ 'SO': '1
54.115.192.0/18
',
'SR': '186.179.128.0/17',
'SS': '105.235.208.0/21',
'ST': '197.159.160.0/19',
'SR': '186.179.128.0/17',
'SS': '105.235.208.0/21',
'ST': '197.159.160.0/19',
@@
-5197,15
+5200,15
@@
class GeoUtils(object):
'TV': '202.2.96.0/19',
'TW': '120.96.0.0/11',
'TZ': '156.156.0.0/14',
'TV': '202.2.96.0/19',
'TW': '120.96.0.0/11',
'TZ': '156.156.0.0/14',
- 'UA': '
93.72.0.0/13
',
- 'UG': '1
54.224
.0.0/13',
- 'US': '
3
.0.0.0/8',
+ 'UA': '
37.52.0.0/14
',
+ 'UG': '1
02.80
.0.0/13',
+ 'US': '
6
.0.0.0/8',
'UY': '167.56.0.0/13',
'UY': '167.56.0.0/13',
- 'UZ': '8
2.215
.64.0/18',
+ 'UZ': '8
4.54
.64.0/18',
'VA': '212.77.0.0/19',
'VA': '212.77.0.0/19',
- 'VC': '2
4.92.144.0/20
',
+ 'VC': '2
07.191.240.0/21
',
'VE': '186.88.0.0/13',
'VE': '186.88.0.0/13',
- 'VG': '
172.103.64.0/18
',
+ 'VG': '
66.81.192.0/20
',
'VI': '146.226.0.0/16',
'VN': '14.160.0.0/11',
'VU': '202.80.32.0/20',
'VI': '146.226.0.0/16',
'VN': '14.160.0.0/11',
'VU': '202.80.32.0/20',
@@
-5214,8
+5217,8
@@
class GeoUtils(object):
'YE': '134.35.0.0/16',
'YT': '41.242.116.0/22',
'ZA': '41.0.0.0/11',
'YE': '134.35.0.0/16',
'YT': '41.242.116.0/22',
'ZA': '41.0.0.0/11',
- 'ZM': '1
65.56
.0.0/13',
- 'ZW': '
41.85.192.0/19
',
+ 'ZM': '1
02.144
.0.0/13',
+ 'ZW': '
102.177.192.0/18
',
}
@classmethod
}
@classmethod