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

clearfied the code

Browse source 
- Read exactly bytes we should.
- Use self.rfile / self.wfile install of mixed.
- Do not make the band port specified.
This commit is contained in:
mitnk 2012-12-09 18:44:28 +08:00
parent 8a3adfc344
commit c681ce101d
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
local.py
View file

@ -75,9 +75,9 @@ class Socks5Server(SocketServer.StreamRequestHandler):
def handle(self): def handle(self):
try: try:
sock = self.connection data = self.rfile.read(2)
sock.recv(262) self.rfile.read(ord(data[1]))
sock.send("\x05\x00") self.wfile.write("\x05\x00")
data = self.rfile.read(4) data = self.rfile.read(4)
mode = ord(data[1]) mode = ord(data[1])
if mode != 1: if mode != 1:
@ -90,7 +90,7 @@ class Socks5Server(SocketServer.StreamRequestHandler):
addr = socket.inet_ntoa(addr_ip) addr = socket.inet_ntoa(addr_ip)
addr_to_send += addr_ip addr_to_send += addr_ip
elif addrtype == 3: elif addrtype == 3:
addr_len = sock.recv(1) addr_len = self.rfile.read(1)
addr = self.rfile.read(ord(addr_len)) addr = self.rfile.read(ord(addr_len))
addr_to_send += addr_len + addr addr_to_send += addr_len + addr
else: else:
@ -102,8 +102,8 @@ class Socks5Server(SocketServer.StreamRequestHandler):
port = struct.unpack('>H', addr_port) port = struct.unpack('>H', addr_port)
try: try:
reply = "\x05\x00\x00\x01" reply = "\x05\x00\x00\x01"
reply += socket.inet_aton('0.0.0.0') + struct.pack(">H", 2222) reply += socket.inet_aton('0.0.0.0') + struct.pack(">H", 0)
sock.send(reply) self.wfile.write(reply)
# reply immediately # reply immediately
if '-6' in sys.argv[1:]: if '-6' in sys.argv[1:]:
remote = socket.socket(socket.AF_INET6, socket.SOCK_STREAM) remote = socket.socket(socket.AF_INET6, socket.SOCK_STREAM)
@ -115,7 +115,7 @@ class Socks5Server(SocketServer.StreamRequestHandler):
except socket.error, e: except socket.error, e:
logging.warn(e) logging.warn(e)
return return
self.handle_tcp(sock, remote) self.handle_tcp(self.connection, remote)
except socket.error, e: except socket.error, e:
logging.warn(e) logging.warn(e)