Skip to content

Commit b2599c3

Browse files
committed
5.13.2 release, improve smart route.
1 parent 90defa4 commit b2599c3

22 files changed

+838
-211
lines changed
+295-57
Original file line numberDiff line numberDiff line change
@@ -1,57 +1,295 @@
1-
64.233.160.0-64.233.171.255
2-
64.233.176.0-64.233.191.255
3-
66.102.1.0-66.102.1.255
4-
74.125.20.0-74.125.21.255
5-
74.125.23.0-74.125.24.255
6-
74.125.26.0-74.125.26.255
7-
74.125.28.0-74.125.28.255
8-
74.125.30.0-74.125.31.255
9-
74.125.68.0-74.125.71.255
10-
74.125.90.0-74.125.90.255
11-
74.125.124.0-74.125.124.255
12-
74.125.126.0-74.125.136.255
13-
74.125.138.0-74.125.143.255
14-
74.125.192.0-74.125.193.255
15-
74.125.195.0-74.125.197.255
16-
74.125.199.0-74.125.206.255
17-
103.47.153.0-103.47.153.255
18-
104.199.185.0-104.199.185.255
19-
108.177.8.0-108.177.15.255
20-
108.177.96.0-108.177.98.255
21-
108.177.103.0-108.177.104.255
22-
108.177.111.0-108.177.112.255
23-
108.177.119.0-108.177.122.255
24-
108.177.125.0-108.177.127.255
25-
142.250.4.0-142.250.4.255
26-
142.250.8.0-142.250.9.255
27-
172.217.0.0-172.217.31.255
28-
172.217.160.0-172.217.172.255
29-
172.217.174.0-172.217.175.255
30-
172.217.192.0-172.217.195.255
31-
172.217.197.0-172.217.197.255
32-
172.217.203.0-172.217.204.255
33-
172.217.212.0-172.217.212.255
34-
172.217.214.0-172.217.215.255
35-
172.217.218.0-172.217.219.255
36-
172.217.222.0-172.217.222.255
37-
172.253.58.0-172.253.58.255
38-
172.253.62.0-172.253.62.255
39-
172.253.112.0-172.253.113.255
40-
172.253.115.0-172.253.118.255
41-
172.253.120.0-172.253.120.255
42-
172.253.122.0-172.253.123.255
43-
172.253.126.0-172.253.127.255
44-
173.194.66.0-173.194.70.255
45-
173.194.73.0-173.194.74.255
46-
173.194.76.0-173.194.79.255
47-
173.194.175.0-173.194.175.255
48-
173.194.192.0-173.194.208.255
49-
173.194.210.0-173.194.223.255
50-
209.85.144.0-209.85.147.255
51-
209.85.200.0-209.85.203.255
52-
209.85.232.0-209.85.235.255
53-
216.58.192.0-216.58.215.255
54-
216.58.217.0-216.58.217.255
55-
216.58.220.0-216.58.223.255
56-
216.239.36.0-216.239.36.255
57-
216.239.38.0-216.239.38.255
1+
8.8.4.0/24
2+
8.8.8.0/24
3+
8.35.200.0/21
4+
34.0.228.0/22
5+
34.0.232.0/21
6+
34.1.64.0/18
7+
34.2.32.0/19
8+
34.2.64.0/18
9+
34.2.128.0/17
10+
34.3.0.0/23
11+
34.3.3.0/24
12+
34.3.4.0/24
13+
34.3.8.0/21
14+
34.3.16.0/20
15+
34.3.32.0/19
16+
34.3.64.0/18
17+
34.4.0.0/14
18+
34.13.64.0/22
19+
34.13.72.0/21
20+
34.13.80.0/20
21+
34.13.96.0/19
22+
34.14.128.0/17
23+
34.15.0.0/16
24+
34.34.192.0/20
25+
34.34.208.0/21
26+
34.34.224.0/19
27+
34.43.0.0/16
28+
34.50.128.0/19
29+
34.52.0.0/17
30+
34.64.0.0/19
31+
34.96.0.0/18
32+
34.98.0.0/18
33+
34.98.136.0/21
34+
34.98.144.0/20
35+
34.98.160.0/19
36+
34.98.192.0/18
37+
34.99.0.0/16
38+
34.100.0.0/17
39+
34.101.0.0/20
40+
34.101.16.0/23
41+
34.101.19.0/24
42+
34.101.28.0/22
43+
34.103.0.0/16
44+
34.104.0.0/20
45+
34.104.16.0/21
46+
34.104.24.0/23
47+
34.104.26.0/24
48+
34.104.28.0/22
49+
34.104.32.0/20
50+
34.104.48.0/24
51+
34.104.53.0/24
52+
34.104.54.0/23
53+
34.109.0.0/16
54+
34.110.0.0/17
55+
34.113.0.0/16
56+
34.114.0.0/15
57+
34.116.8.0/21
58+
34.116.16.0/20
59+
34.116.32.0/19
60+
34.118.208.0/20
61+
34.118.224.0/20
62+
34.119.0.0/16
63+
34.124.64.0/19
64+
34.124.96.0/20
65+
34.126.0.0/18
66+
34.126.224.0/19
67+
34.127.128.0/19
68+
34.127.160.0/20
69+
34.127.176.0/24
70+
34.127.181.0/24
71+
34.127.182.0/23
72+
34.127.192.0/18
73+
34.128.0.0/19
74+
34.128.38.0/23
75+
34.128.40.0/23
76+
34.128.50.0/23
77+
34.128.56.0/23
78+
34.128.192.0/18
79+
34.143.0.0/17
80+
34.144.0.0/17
81+
34.144.128.0/18
82+
34.152.70.0/23
83+
34.152.82.0/23
84+
34.152.88.0/21
85+
34.152.96.0/19
86+
34.152.128.0/17
87+
34.153.0.0/19
88+
34.153.34.0/23
89+
34.153.36.0/23
90+
34.153.39.0/24
91+
34.153.56.0/23
92+
34.153.60.0/22
93+
34.153.64.0/18
94+
34.153.192.0/19
95+
34.153.226.0/23
96+
34.153.228.0/23
97+
34.153.231.0/24
98+
34.153.248.0/23
99+
34.153.252.0/22
100+
34.156.0.0/16
101+
34.157.10.0/23
102+
34.157.86.0/24
103+
34.157.120.0/24
104+
34.157.122.0/23
105+
34.157.138.0/23
106+
34.157.214.0/24
107+
34.157.218.0/23
108+
34.157.248.0/24
109+
34.158.0.0/16
110+
34.167.0.0/16
111+
34.177.0.0/19
112+
34.177.38.0/23
113+
34.177.56.0/21
114+
34.177.64.0/18
115+
34.177.128.0/17
116+
34.178.0.0/16
117+
34.180.0.0/16
118+
34.183.0.0/16
119+
34.184.0.0/13
120+
35.187.128.0/20
121+
35.190.96.0/20
122+
35.190.240.0/20
123+
35.191.0.0/16
124+
35.199.128.0/20
125+
35.201.32.0/21
126+
35.201.40.0/24
127+
35.201.42.0/23
128+
35.201.44.0/22
129+
35.201.48.0/20
130+
35.203.192.0/20
131+
35.203.208.0/23
132+
35.203.220.0/22
133+
35.203.224.0/21
134+
35.203.240.0/20
135+
35.206.0.0/21
136+
35.206.8.0/23
137+
35.206.12.0/22
138+
35.206.16.0/20
139+
35.218.0.0/16
140+
35.219.192.0/19
141+
35.220.28.0/23
142+
35.220.30.0/24
143+
35.229.0.0/20
144+
35.230.192.0/19
145+
35.230.224.0/20
146+
35.235.128.0/18
147+
35.235.192.0/20
148+
35.235.208.0/21
149+
35.235.224.0/19
150+
35.242.28.0/23
151+
35.242.30.0/24
152+
35.243.16.0/20
153+
35.243.48.0/21
154+
57.140.192.0/18
155+
64.15.112.0/20
156+
64.233.160.0/19
157+
66.22.228.0/23
158+
66.102.0.0/20
159+
66.249.64.0/19
160+
70.32.128.0/19
161+
72.14.192.0/18
162+
74.125.0.0/16
163+
104.154.0.0/20
164+
104.154.112.0/24
165+
104.154.122.0/23
166+
104.154.124.0/22
167+
104.155.240.0/20
168+
104.196.64.0/24
169+
104.196.72.0/21
170+
104.196.80.0/20
171+
104.199.64.0/23
172+
104.199.240.0/23
173+
104.237.160.0/19
174+
107.178.192.0/20
175+
107.178.224.0/20
176+
108.170.192.0/18
177+
108.177.0.0/17
178+
130.211.0.0/22
179+
136.22.160.0/20
180+
136.22.176.0/21
181+
136.22.184.0/23
182+
136.22.186.0/24
183+
136.124.0.0/15
184+
142.250.0.0/15
185+
146.148.0.0/23
186+
152.65.208.0/22
187+
152.65.214.0/23
188+
152.65.218.0/23
189+
152.65.222.0/23
190+
152.65.224.0/19
191+
162.120.128.0/17
192+
172.110.32.0/21
193+
172.217.0.0/16
194+
172.253.0.0/16
195+
173.194.0.0/16
196+
192.178.0.0/15
197+
193.186.4.0/24
198+
199.36.154.0/23
199+
199.36.156.0/24
200+
199.192.112.0/23
201+
199.192.114.0/24
202+
199.223.237.0/24
203+
199.223.238.0/23
204+
207.223.160.0/20
205+
208.65.152.0/22
206+
208.68.108.0/22
207+
208.81.188.0/22
208+
208.117.224.0/19
209+
209.85.128.0/17
210+
216.58.192.0/19
211+
216.73.80.0/20
212+
216.239.32.0/19
213+
2001:4860::/32
214+
2404:6800::/32
215+
2404:f340::/32
216+
2600:1900::/34
217+
2600:1900:4100::/43
218+
2600:1900:4130::/44
219+
2600:1900:4190::/44
220+
2600:1900:41f0::/44
221+
2600:1900:4200::/41
222+
2600:1900:42b0::/44
223+
2600:1900:42c0::/42
224+
2600:1900:4300::/40
225+
2600:1900:4400::/38
226+
2600:1900:4800::/37
227+
2600:1900:5000::/38
228+
2600:1900:5410::/44
229+
2600:1900:5420::/43
230+
2600:1900:5440::/42
231+
2600:1900:5480::/41
232+
2600:1900:5500::/40
233+
2600:1900:5600::/39
234+
2600:1900:5800::/37
235+
2600:1900:6000::/35
236+
2600:1900:8010::/44
237+
2600:1900:8020::/43
238+
2600:1900:8040::/42
239+
2600:1900:8080::/41
240+
2600:1900:8100::/40
241+
2600:1900:8200::/39
242+
2600:1900:8400::/38
243+
2600:1900:8800::/37
244+
2600:1900:9000::/36
245+
2600:1900:a000::/35
246+
2600:1900:c000::/34
247+
2600:1901:1::/48
248+
2600:1901:2::/47
249+
2600:1901:4::/46
250+
2600:1901:8::/45
251+
2600:1901:10::/44
252+
2600:1901:20::/43
253+
2600:1901:40::/42
254+
2600:1901:80::/41
255+
2600:1901:100::/40
256+
2600:1901:200::/39
257+
2600:1901:400::/38
258+
2600:1901:800::/37
259+
2600:1901:1000::/36
260+
2600:1901:2000::/35
261+
2600:1901:4000::/44
262+
2600:1901:4020::/43
263+
2600:1901:4040::/42
264+
2600:1901:4080::/41
265+
2600:1901:4100::/40
266+
2600:1901:4200::/39
267+
2600:1901:4400::/38
268+
2600:1901:4800::/37
269+
2600:1901:5000::/36
270+
2600:1901:6000::/35
271+
2600:1901:8000::/40
272+
2600:1901:8190::/44
273+
2600:1901:81a0::/44
274+
2600:1901:81d0::/44
275+
2600:1901:81e0::/44
276+
2600:1901:8200::/39
277+
2600:1901:8400::/38
278+
2600:1901:8800::/37
279+
2600:1901:9000::/36
280+
2600:1901:a000::/35
281+
2600:1901:c000::/34
282+
2600:1902::/31
283+
2600:1904::/30
284+
2600:1908::/29
285+
2605:ef80::/32
286+
2606:40::/32
287+
2606:73c0::/32
288+
2607:1c0:241:40::/60
289+
2607:1c0:300::/40
290+
2607:f8b0::/32
291+
2620:11a:a000::/40
292+
2620:120:e000::/40
293+
2800:3f0::/32
294+
2a00:1450::/32
295+
2c0f:fb50::/32

code/default/lib/noarch/front_base/connect_manager.py

+9-6
Original file line numberDiff line numberDiff line change
@@ -278,16 +278,16 @@ def _connect_thread(self, sleep_time=0):
278278

279279
def _connect_process(self):
280280
try:
281-
ip_str, sni, host = self.ip_manager.get_ip_sni_host()
282-
if not ip_str:
281+
host_info = self.ip_manager.get_ip_sni_host()
282+
if not host_info:
283283
self.no_ip_time = time.time()
284284
with self.no_ip_lock:
285285
# self.logger.warning("not enough ip")
286286
time.sleep(10)
287287
return None
288288

289289
# self.logger.debug("create ssl conn %s", ip_str)
290-
ssl_sock = self._create_ssl_connection(ip_str, sni, host)
290+
ssl_sock = self._create_ssl_connection(host_info)
291291
if not ssl_sock:
292292
time.sleep(1)
293293
return None
@@ -310,10 +310,12 @@ def _connect_ssl(self, ip_str, sni, host, close_cb, queue):
310310
self.logger.warn("_connect_ssl %s sni:%s host:%s fail:%r", ip_str, sni, host, e)
311311
queue.put(e)
312312

313-
def _create_ssl_connection(self, ip_str, sni, host):
314-
try:
315-
# ssl_sock = self.connect_creator.connect_ssl(ip_str, sni, host, close_cb=self.ip_manager.ssl_closed)
313+
def _create_ssl_connection(self, host_info):
314+
ip_str = host_info["ip_str"]
315+
sni = host_info["sni"]
316+
host = host_info["host"]
316317

318+
try:
317319
q = Queue()
318320
fn_args = (ip_str, sni, host, self.ip_manager.ssl_closed, q)
319321
t = threading.Thread(target=self._connect_ssl, args=fn_args, name="connect_ssl_%s" % ip_str)
@@ -330,6 +332,7 @@ def _create_ssl_connection(self, ip_str, sni, host):
330332
self.ip_manager.update_ip(ip_str, sni, ssl_sock.handshake_time)
331333
self.logger.debug("create_ssl update ip:%s time:%d h2:%d sni:%s, host:%s",
332334
ip_str, ssl_sock.handshake_time, ssl_sock.h2, ssl_sock.sni, ssl_sock.host)
335+
ssl_sock.host_info = host_info
333336

334337
return ssl_sock
335338
except socket.error as e:

0 commit comments

Comments
 (0)