vbatts/shadowsocks
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

remove FORCE_NEW_PROTOCOL

Browse source
This commit is contained in:
BreakWa11 2015-10-21 22:37:32 +08:00
parent 041a5c1046
commit 3f66ec443f
1 changed files with 1 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

7
shadowsocks/tcprelay.py
View file

@ -30,11 +30,8 @@ import random
from shadowsocks import encrypt, obfs, eventloop, shell, common from shadowsocks import encrypt, obfs, eventloop, shell, common
from shadowsocks.common import pre_parse_header, parse_header from shadowsocks.common import pre_parse_header, parse_header
# set it 'False' to use both new protocol and the original shadowsocks protocal
# set it 'True' to use new protocol ONLY, to avoid GFW detecting
FORCE_NEW_PROTOCOL = False
# set it 'True' if run as a local client and connect to a server which support new protocol # set it 'True' if run as a local client and connect to a server which support new protocol
CLIENT_NEW_PROTOCOL = False CLIENT_NEW_PROTOCOL = False #deprecated
# we clear at most TIMEOUTS_CLEAN_SIZE timeouts each time # we clear at most TIMEOUTS_CLEAN_SIZE timeouts each time
TIMEOUTS_CLEAN_SIZE = 512 TIMEOUTS_CLEAN_SIZE = 512
@ -404,8 +401,6 @@ class TCPRelayHandler(object):
if self._is_local: if self._is_local:
header_result = parse_header(data) header_result = parse_header(data)
else: else:
if data is None or FORCE_NEW_PROTOCOL and common.ord(data[0]) != 0x88 and (~common.ord(data[0]) & 0xff) != 0x88:
data = self._handel_protocol_error(self._client_address, ogn_data)
data = pre_parse_header(data) data = pre_parse_header(data)
if data is None: if data is None:
data = self._handel_protocol_error(self._client_address, ogn_data) data = self._handel_protocol_error(self._client_address, ogn_data)