copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

read nl after auth (if sender is 0.8.2)

This commit is contained in:
Dimitur Kirov 2005-09-10 13:43:43 +00:00
parent 3cfd5541de
commit 8be85027f0
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/common/socks5.py
View File

@ -452,7 +452,7 @@ class Socks5:
self.file_props['last-time'] self.file_props['last-time']
self.file_props['last-time'] = current_time self.file_props['last-time'] = current_time
self.file_props['received-len'] = self.size self.file_props['received-len'] = self.size
if self.size == int(self.file_props['size']): if self.size >= int(self.file_props['size']):
self.state = 8 # end connection self.state = 8 # end connection
self.file_props['error'] = 0 self.file_props['error'] = 0
self.close_file() self.close_file()
@ -512,6 +512,12 @@ class Socks5:
except Exception, e: except Exception, e:
buff = '' buff = ''
first_byte = False first_byte = False
if self.file_props['received-len'] == 0:
if len(buff) > 0:
# delimiter between auth and data
if ord(buff[0]) == 0xD:
first_byte = True
buff = buff[1:]
current_time = time.time() current_time = time.time()
self.file_props['elapsed-time'] += current_time - \ self.file_props['elapsed-time'] += current_time - \
self.file_props['last-time'] self.file_props['last-time']
@ -531,7 +537,7 @@ class Socks5:
self.disconnect(False) self.disconnect(False)
self.file_props['error'] = -1 self.file_props['error'] = -1
return 0 return 0
if self.file_props['received-len'] == int(self.file_props['size']): if self.file_props['received-len'] >= int(self.file_props['size']):
# transfer completed # transfer completed
self.rem_fd(fd) self.rem_fd(fd)
self.disconnect() self.disconnect()