xuemingqiang/shadowsocks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rollback

Browse Source
This commit is contained in:
clowwindy
2012-12-30 14:57:56 +08:00
parent e8454cf9b1
commit dd8ccf6f6e
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
local.py
View File

@ -100,9 +100,9 @@ class Socks5Server(SocketServer.StreamRequestHandler):
def handle(self): def handle(self):
try: try:
data = self.rfile.read(2) sock = self.connection
self.rfile.read(ord(data[1])) sock.recv(262)
self.wfile.write("\x05\x00") sock.send("\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:
@ -127,7 +127,7 @@ 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", 0) reply += socket.inet_aton('0.0.0.0') + struct.pack(">H", 2222)
self.wfile.write(reply) self.wfile.write(reply)
# reply immediately # reply immediately
if '-6' in sys.argv[1:]: if '-6' in sys.argv[1:]:
@ -141,7 +141,7 @@ class Socks5Server(SocketServer.StreamRequestHandler):
except socket.error, e: except socket.error, e:
logging.warn(e) logging.warn(e)
return return
self.handle_tcp(self.connection, remote) self.handle_tcp(sock, remote)
except socket.error, e: except socket.error, e:
logging.warn(e) logging.warn(e)