d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-02 09:55:55 +00:00
Code Issues Projects Releases Wiki Activity

Other Socksipy fixes

Browse Source
This commit is contained in:
Christophe Dumez 2010-11-22 17:12:22 +00:00
parent 906b0755eb
commit d49164b362
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/searchengine/nova/socks.py
View File

@ -1,7 +1,8 @@
"""SocksiPy - Python SOCKS module. """SocksiPy - Python SOCKS module.
Version 1.00 Version 1.01
Copyright 2006 Dan-Haim. All rights reserved. Copyright 2006 Dan-Haim. All rights reserved.
Various fixes by Christophe DUMEZ <chris@qbittorrent.org> - 2010
Redistribution and use in source and binary forms, with or without modification, Redistribution and use in source and binary forms, with or without modification,
are permitted provided that the following conditions are met: are permitted provided that the following conditions are met:
@ -138,7 +139,10 @@ class socksocket(socket.socket):
""" """
data = "" data = ""
while len(data) < bytes: while len(data) < bytes:
data = data + self.recv(bytes-len(data)) d = self.recv(bytes-len(data))
if not d:
raise GeneralProxyError("connection closed unexpectedly")
data = data + d
return data return data
def setproxy(self,proxytype=None,addr=None,port=None,rdns=True,username=None,password=None): def setproxy(self,proxytype=None,addr=None,port=None,rdns=True,username=None,password=None):
@ -233,15 +237,15 @@ class socksocket(socket.socket):
# Connection failed # Connection failed
self.close() self.close()
if ord(resp[1])<=8: if ord(resp[1])<=8:
raise Socks5Error(ord(resp[1]),_generalerrors[ord(resp[1])]) raise Socks5Error((ord(resp[1]),_generalerrors[ord(resp[1])]))
else: else:
raise Socks5Error(9,_generalerrors[9]) raise Socks5Error((9,_generalerrors[9]))
# Get the bound address/port # Get the bound address/port
elif resp[3] == "\x01": elif resp[3] == "\x01":
boundaddr = self.__recvall(4) boundaddr = self.__recvall(4)
elif resp[3] == "\x03": elif resp[3] == "\x03":
resp = resp + self.recv(1) resp = resp + self.recv(1)
boundaddr = self.__recvall(resp[4]) boundaddr = self.__recvall(ord(resp[4]))
else: else:
self.close() self.close()
raise GeneralProxyError((1,_generalerrors[1])) raise GeneralProxyError((1,_generalerrors[1]))