[or-cvs] r18289: {torflow} Fix socksipy to handle SOCKS5 exceptions properly. (torflow/trunk/NetworkScanners/libs/SocksiPy)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-01-28 04:27:52 -0500 (Wed, 28 Jan 2009)
New Revision: 18289

Modified:
   torflow/trunk/NetworkScanners/libs/SocksiPy/socks.py
Log:

Fix socksipy to handle SOCKS5 exceptions properly.



Modified: torflow/trunk/NetworkScanners/libs/SocksiPy/socks.py
===================================================================
--- torflow/trunk/NetworkScanners/libs/SocksiPy/socks.py	2009-01-28 07:16:22 UTC (rev 18288)
+++ torflow/trunk/NetworkScanners/libs/SocksiPy/socks.py	2009-01-28 09:27:52 UTC (rev 18289)
@@ -233,9 +233,9 @@
 			# Connection failed
 			self.close()
 			if ord(resp[1])<=8:
-				raise Socks5Error(ord(resp[1]),_generalerrors[ord(resp[1])])
+				raise Socks5Error((ord(resp[1]),_socks5errors[ord(resp[1])]))
 			else:
-				raise Socks5Error(9,_generalerrors[9])
+				raise Socks5Error((9,_socks5errors[9]))
 		# Get the bound address/port
 		elif resp[3] == "\x01":
 			boundaddr = self.__recvall(4)