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

remove extra blank lines

Browse source
This commit is contained in:
Tea Watermeter 2016-03-31 21:40:48 +08:00
parent 4aab90ac6a
commit a532067a6a
1 changed files with 0 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
shadowsocks/tcprelay.py
View file

@ -497,18 +497,14 @@ class TCPRelayHandler(object):
if len(data) < 3: if len(data) < 3:
logging.warning('method selection header too short') logging.warning('method selection header too short')
raise BadSocksHeader raise BadSocksHeader
socks_version = common.ord(data[0]) socks_version = common.ord(data[0])
nmethods = common.ord(data[1]) nmethods = common.ord(data[1])
if socks_version != 5: if socks_version != 5:
logging.warning('unsupported SOCKS protocol version ' + str(socks_version)) logging.warning('unsupported SOCKS protocol version ' + str(socks_version))
raise BadSocksHeader raise BadSocksHeader
if nmethods < 1 or len(data) != nmethods + 2: if nmethods < 1 or len(data) != nmethods + 2:
logging.warning('NMETHODS and number of METHODS mismatch') logging.warning('NMETHODS and number of METHODS mismatch')
raise BadSocksHeader raise BadSocksHeader
noauth_exist = False noauth_exist = False
for method in data[2:]: for method in data[2:]:
if common.ord(method) == METHOD_NOAUTH: if common.ord(method) == METHOD_NOAUTH: