Browse Source

replace send with sendall

1.4
clowwindy 12 years ago
parent
commit
3960e6495e
  1. 10
      local.py
  2. 10
      server.py

10
local.py

@ -54,10 +54,16 @@ class Socks5Server(SocketServer.StreamRequestHandler):
while True: while True:
r, w, e = select.select(fdset, [], []) r, w, e = select.select(fdset, [], [])
if sock in r: if sock in r:
if remote.send(self.encrypt(sock.recv(4096))) <= 0: data = sock.recv(4096)
if data <= 0:
break
if remote.sendall(self.encrypt(data)) is not None:
break break
if remote in r: if remote in r:
if sock.send(self.decrypt(remote.recv(4096))) <= 0: data = remote.recv(4096)
if data <= 0:
break
if sock.sendall(self.decrypt(data)) is not None:
break break
finally: finally:
sock.close() sock.close()

10
server.py

@ -54,10 +54,16 @@ class Socks5Server(SocketServer.StreamRequestHandler):
while True: while True:
r, w, e = select.select(fdset, [], []) r, w, e = select.select(fdset, [], [])
if sock in r: if sock in r:
if remote.send(self.decrypt(sock.recv(4096))) <= 0: data = sock.recv(4096)
if data <= 0:
break
if remote.sendall(self.decrypt(data)) is not None:
break break
if remote in r: if remote in r:
if sock.send(self.encrypt(remote.recv(4096))) <= 0: data = remote.recv(4096)
if data <= 0:
break
if sock.sendall(self.encrypt(data)) is not None:
break break
finally: finally:
sock.close() sock.close()

Loading…
Cancel
Save