dnomd343
/
shadowsocksr
mirror of https://github.com/dnomd343/shadowsocksr
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

fix a potential RST problem

1.4
clowwindy 11 years ago
parent
289467923b
commit
6caeabd03d
2 changed files with 32 additions and 16 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 24
      shadowsocks/local.py
  2. 24
      shadowsocks/server.py

24
shadowsocks/local.py
View File

@ -100,6 +100,7 @@ class Socks5Server(SocketServer.StreamRequestHandler):
else: else:
fdset = [sock, remote] fdset = [sock, remote]
while True: while True:
should_break = False
r, w, e = select.select(fdset, [], []) r, w, e = select.select(fdset, [], [])
if sock in r: if sock in r:
if not connected and config_fast_open: if not connected and config_fast_open:
@ -123,18 +124,25 @@ class Socks5Server(SocketServer.StreamRequestHandler):
pending_data = None pending_data = None
data = encryptor.encrypt(data) data = encryptor.encrypt(data)
if len(data) <= 0: if len(data) <= 0:
break should_break = True
result = send_all(remote, data) else:
if result < len(data): result = send_all(remote, data)
raise Exception('failed to send all data') if result < len(data):
raise Exception('failed to send all data')
if remote in r: if remote in r:
data = encryptor.decrypt(remote.recv(4096)) data = encryptor.decrypt(remote.recv(4096))
if len(data) <= 0: if len(data) <= 0:
break should_break = True
result = send_all(sock, data) else:
if result < len(data): result = send_all(sock, data)
raise Exception('failed to send all data') if result < len(data):
raise Exception('failed to send all data')
if should_break:
# make sure all data are read before we close the sockets
# TODO: we haven't read ALL the data, actually
# http://cs.ecs.baylor.edu/~donahoo/practical/CSockets/TCPRST.pdf
break
finally: finally:
sock.close() sock.close()
remote.close() remote.close()

24
shadowsocks/server.py
View File

@ -79,21 +79,29 @@ class Socks5Server(SocketServer.StreamRequestHandler):
try: try:
fdset = [sock, remote] fdset = [sock, remote]
while True: while True:
should_break = False
r, w, e = select.select(fdset, [], []) r, w, e = select.select(fdset, [], [])
if sock in r: if sock in r:
data = self.decrypt(sock.recv(4096)) data = self.decrypt(sock.recv(4096))
if len(data) <= 0: if len(data) <= 0:
break should_break = True
result = send_all(remote, data) else:
if result < len(data): result = send_all(remote, data)
raise Exception('failed to send all data') if result < len(data):
raise Exception('failed to send all data')
if remote in r: if remote in r:
data = self.encrypt(remote.recv(4096)) data = self.encrypt(remote.recv(4096))
if len(data) <= 0: if len(data) <= 0:
break should_break = True
result = send_all(sock, data) else:
if result < len(data): result = send_all(sock, data)
raise Exception('failed to send all data') if result < len(data):
raise Exception('failed to send all data')
if should_break:
# make sure all data are read before we close the sockets
# TODO: we haven't read ALL the data, actually
# http://cs.ecs.baylor.edu/~donahoo/practical/CSockets/TCPRST.pdf
break
finally: finally:
sock.close() sock.close()

Write Preview
Loading…
Cancel
Save