mirror of
https://github.com/gnh1201/caterpillar.git
synced 2025-09-06 18:01:07 +00:00
Update server.py
This commit is contained in:
parent
83737a2e9f
commit
19907e2834
|
@ -478,7 +478,7 @@ def proxy_server(webserver, port, scheme, method, url, conn, addr, data):
|
||||||
# get client address
|
# get client address
|
||||||
try:
|
try:
|
||||||
_, query_data = jsonrpc2_encode('get_client_address')
|
_, query_data = jsonrpc2_encode('get_client_address')
|
||||||
query = requests.post(server_url, headers=proxy_data['headers'], data=query_data, timeout=1)
|
query = requests.post(server_url, headers=proxy_data['headers'], data=query_data, timeout=30)
|
||||||
if query.status_code == 200:
|
if query.status_code == 200:
|
||||||
result = query.json()['result']
|
result = query.json()['result']
|
||||||
proxy_data['data']['client_address'] = result['client_address']
|
proxy_data['data']['client_address'] = result['client_address']
|
||||||
|
@ -489,7 +489,7 @@ def proxy_server(webserver, port, scheme, method, url, conn, addr, data):
|
||||||
# build a tunnel
|
# build a tunnel
|
||||||
try:
|
try:
|
||||||
id, raw_data = jsonrpc2_encode('relay_connect', proxy_data['data'])
|
id, raw_data = jsonrpc2_encode('relay_connect', proxy_data['data'])
|
||||||
relay = requests.post(server_url, headers=proxy_data['headers'], data=raw_data, stream=True, timeout=1)
|
relay = requests.post(server_url, headers=proxy_data['headers'], data=raw_data, stream=True, timeout=2)
|
||||||
for chunk in relay.iter_content(chunk_size=buffer_size):
|
for chunk in relay.iter_content(chunk_size=buffer_size):
|
||||||
print (chunk)
|
print (chunk)
|
||||||
except requests.exceptions.ReadTimeout as e:
|
except requests.exceptions.ReadTimeout as e:
|
||||||
|
|
Loading…
Reference in New Issue
Block a user