update GFW IPs

This commit is contained in:
Connor Olding 2020-09-02 00:51:34 +02:00
parent d64db84783
commit 3a09d52345
2 changed files with 199 additions and 11 deletions

View File

@ -13,15 +13,13 @@ def detect_gfw(r, ip, check):
hosted = de("facebook.com") or de("instagram.com") or de("whatsapp.com")
if (
(rs("31.13.") and not hosted) or
rs("66.220.") or
rs("69.63.") or
(rs("69.171.") and not rs("69.171.250.")) or
rs("74.86.") or
rs("75.126.") or
r in gfw_ips
):
if rs("31.13.") and not hosted:
return True
if rs("69.171.") and not rs("69.171.250."):
return True
if r in gfw_ips:
return True
return False

View File

@ -90,20 +90,77 @@ for i in range(1, 255):
gfw_ips = {
"4.36.66.178",
# "4.78.139.50",
"8.7.198.45",
"8.7.198.46",
"23.225.141.210",
"38.121.72.166",
# "45.77.186.255",
"46.82.174.68",
"46.82.174.69",
"47.88.58.234",
"49.2.123.56",
"50.87.93.246",
# "50.117.117.42",
# "52.175.9.80",
"54.76.135.1",
"54.234.18.200",
"54.245.22.188",
"59.24.3.173",
"59.24.3.174",
"64.13.192.74",
# "64.13.192.74",
# "64.13.192.76",
# "64.13.232.149",
"66.220.146.94",
"66.220.147.11",
"66.220.147.47",
"66.220.149.18",
"66.220.149.32",
"66.220.149.99",
"66.220.151.20",
"66.220.152.17",
"66.220.155.12",
"66.220.155.14",
"66.220.158.32",
"67.15.100.252",
"67.15.129.210",
"67.228.102.32",
"67.228.235.91",
"67.228.235.93",
"67.230.169.182",
"69.63.176.15",
"69.63.176.59",
"69.63.176.143",
"69.63.178.13",
"69.63.180.173",
"69.63.181.11",
"69.63.181.12",
"69.63.184.14",
"69.63.184.30",
"69.63.184.142",
"69.63.186.30",
"69.63.186.31",
"69.63.187.12",
"69.63.189.16",
"69.63.190.26",
"74.86.3.208",
"74.86.12.172",
"74.86.12.173",
"74.86.17.48",
"74.86.118.24",
"74.86.142.55",
"74.86.151.162",
"74.86.151.167",
"74.86.226.234",
"74.86.228.110",
"75.126.2.43",
"75.126.33.156",
"75.126.115.192",
"75.126.124.162",
"75.126.135.131",
"75.126.150.210",
"75.126.164.178",
"75.126.215.88",
"77.4.7.92",
"78.16.49.15",
"88.191.249.182",
@ -111,7 +168,101 @@ gfw_ips = {
"88.191.253.157",
"93.46.8.89",
"93.46.8.90",
"93.179.102.140",
"98.159.108.57",
"103.39.76.66",
"103.56.16.112",
"103.73.161.52",
"103.97.3.19",
# "103.223.122.178",
"103.226.246.99",
"103.228.130.61",
"103.240.180.117",
"103.252.115.153",
# "104.16.252.55",
# "104.31.143.88",
# "104.244.43.99",
# "104.244.43.104",
# "104.244.43.182",
# "104.244.43.228",
# "104.244.43.234",
"104.244.46.5",
"104.244.46.52",
"104.244.46.57",
"104.244.46.63",
"104.244.46.71",
"104.244.46.93",
"104.244.46.185",
"104.244.46.244",
"108.160.161.20",
"108.160.162.104",
"108.160.163.108",
"108.160.165.8",
"108.160.165.9",
"108.160.165.11",
"108.160.165.55",
"108.160.165.141",
"108.160.165.147",
"108.160.165.211",
"108.160.165.212",
"108.160.166.42",
"108.160.166.49",
"108.160.166.57",
"108.160.166.61",
"108.160.167.30",
"108.160.167.148",
"108.160.167.156",
"108.160.167.165",
"108.160.167.174",
"108.160.169.179",
"108.160.169.181",
"108.160.169.185",
"108.160.169.186",
"108.160.170.26",
"108.160.170.43",
"108.160.170.44",
"108.160.170.51",
"108.160.172.1",
"108.160.172.204",
"108.160.173.207",
"111.243.214.169",
# "114.43.24.59",
"118.193.240.37",
"118.193.240.41",
"119.28.87.227",
"128.121.146.235",
"128.242.240.85",
"128.242.240.117",
"150.107.3.176",
"154.83.14.134",
"154.83.15.45",
"154.85.102.30",
"154.85.102.32",
# "157.240.2.36",
# "157.240.7.8",
# "157.240.8.36",
# "157.240.8.50",
"157.240.10.32",
# "157.240.10.36",
# "157.240.11.18",
# "157.240.12.5",
# "157.240.16.50",
"157.240.17.41",
"157.240.17.50",
# "157.240.21.9",
# "159.65.107.38",
# "162.125.2.6",
# "162.125.7.1",
"162.125.17.131",
"162.125.32.2",
"162.125.32.6",
"162.125.32.9",
"162.125.32.15",
"162.125.34.133",
# "162.125.80.6",
"173.244.217.42",
"173.252.73.48",
"173.252.88.67",
"173.252.100.21",
"173.252.100.32",
"173.252.102.16",
@ -123,19 +274,58 @@ gfw_ips = {
"174.37.54.20",
"174.37.154.236",
"174.37.175.229",
"199.16.158.190"
"184.173.136.86",
"185.45.7.189",
"185.60.216.11",
# "185.60.216.169",
# "185.60.219.36",
"185.60.219.41",
"192.133.77.59",
"192.133.77.133",
"192.133.77.189",
"192.133.77.197",
"197.4.4.12",
"198.27.124.186",
"198.44.185.131",
# "199.16.156.7",
# "199.16.156.40",
"199.16.158.190",
"199.59.148.97",
"199.59.148.209",
"199.59.149.136",
# "199.59.149.204",
"199.59.149.244",
# "199.59.150.11",
"199.59.150.49",
"199.96.58.15",
"199.96.58.157",
"199.96.58.177",
"199.96.62.17",
"199.96.63.53",
"199.96.63.75",
"202.53.137.209",
"202.160.128.14",
"202.160.128.40",
"202.160.128.205",
"202.160.129.6",
"202.160.129.36",
"202.160.129.164",
"202.160.130.7",
"202.160.130.66",
"202.160.130.118",
"202.160.130.145",
"203.98.7.65",
"203.111.254.117",
"203.161.230.171",
"205.186.152.122",
"208.43.170.231",
"208.43.237.140",
"208.101.21.43",
"208.101.60.87",
"209.95.56.60",
"210.56.51.192",
"210.209.84.142",
"211.104.160.39",
"243.185.187.39",
"249.129.46.48",
"253.157.14.165",