[or-cvs] r19239: {torflow} Don't try to look up an exit node that doesn't exist. (torflow/trunk/NetworkScanners)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-04-08 00:42:48 -0400 (Wed, 08 Apr 2009)
New Revision: 19239

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

Don't try to look up an exit node that doesn't exist.



Modified: torflow/trunk/NetworkScanners/soat.py
===================================================================
--- torflow/trunk/NetworkScanners/soat.py	2009-04-08 03:41:05 UTC (rev 19238)
+++ torflow/trunk/NetworkScanners/soat.py	2009-04-08 04:42:48 UTC (rev 19239)
@@ -751,7 +751,7 @@
     exit_node = metacon.get_exit_node()
     if exit_node == 0 or exit_node == '0' or not exit_node:
       plog('NOTICE', 'We had no exit node to test, skipping to the next test.')
-      result = HttpTestResult(exit_node, self.node_map[exit_node[1:]].nickname, 
+      result = HttpTestResult("NoExit", "NotSupplied!", 
                               address, TEST_INCONCLUSIVE, INCONCLUSIVE_NOEXIT)
       if self.rescan_nodes: result.from_rescan = True
       self.results.append(result)
@@ -1482,7 +1482,7 @@
     exit_node = metacon.get_exit_node()
     if not exit_node or exit_node == '0':
       plog('NOTICE', 'We had no exit node to test, skipping to the next test.')
-      result = SSLTestResult(exit_node, self.node_map[exit_node[1:]].nickname, 
+      result = SSLTestResult("NoExit", "NotSupplied!", 
                               address, ssl_file_name, TEST_INCONCLUSIVE,
                               INCONCLUSIVE_NOEXIT)
       if self.rescan_nodes: result.from_rescan = True