[or-cvs] r19168: {torflow} Hrmm, all these Tor network errors are causing soat scans to (torflow/trunk/NetworkScanners)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-03-27 20:53:50 -0400 (Fri, 27 Mar 2009)
New Revision: 19168

Modified:
   torflow/trunk/NetworkScanners/soat.py
Log:

Hrmm, all these Tor network errors are causing soat scans to
never really finish.  Make them count as full failures.



Modified: torflow/trunk/NetworkScanners/soat.py
===================================================================
--- torflow/trunk/NetworkScanners/soat.py	2009-03-27 19:55:43 UTC (rev 19167)
+++ torflow/trunk/NetworkScanners/soat.py	2009-03-28 00:53:50 UTC (rev 19168)
@@ -146,14 +146,14 @@
     plog('NOTICE', "HTTP Error during request of "+address+": "+str(e))
     traceback.print_exc()
     return (e.code, [], "", e.__class__.__name__+str(e)) 
-  except (ValueError, urllib2.URLError):
+  except (ValueError, urllib2.URLError), e:
     plog('WARN', 'The http-request address ' + address + ' is malformed')
     traceback.print_exc()
-    return (0, [], "", "")
+    return (666, [], "", e.__class__.__name__+str(e))
   except socks.Socks5Error, e:
     if e.value[0] == 6: #  or e.value[0] == 1: # Timeout or 'general'
       plog('NOTICE', 'An error occured while negotiating socks5 with Tor: '+str(e))
-      return (0, [], "", "")
+      return (888, [], "", e.__class__.__name__+str(e))
     else:
       plog('WARN', 'An unknown SOCKS5 error occured for '+address+": "+str(e))
       return (777, [], "", e.__class__.__name__+str(e))