[or-cvs] r18517: {torflow} Update readme and change how we display false positives. (torflow/trunk/NetworkScanners)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-02-12 23:21:35 -0500 (Thu, 12 Feb 2009)
New Revision: 18517

Modified:
   torflow/trunk/NetworkScanners/README.ExitScanning
   torflow/trunk/NetworkScanners/libsoat.py
Log:

Update readme and change how we display false positives.



Modified: torflow/trunk/NetworkScanners/README.ExitScanning
===================================================================
--- torflow/trunk/NetworkScanners/README.ExitScanning	2009-02-13 04:11:14 UTC (rev 18516)
+++ torflow/trunk/NetworkScanners/README.ExitScanning	2009-02-13 04:21:35 UTC (rev 18517)
@@ -15,7 +15,7 @@
 II. Prerequisites
 
 Python 2.4+
-Custom patched Tor 0.2.1
+Tor 0.2.1.13 (r18516 or later)
 Super Secret SoaT Sauce
 py-openssl/pyOpenSSL
 Bonus: 500M of disk space
@@ -50,8 +50,9 @@
 
 A. Compiling Tor
 
-To run SoaT you will need to compile a custom Tor binary due to bug XXX.
-The patch to fix this bug is present in ../tordiffs/XXX.
+To run SoaT you will need Tor 0.2.1.13. SVN r18516 contains a timeout
+fix that is essential to scanning the network in any reasonable amount
+of time.
 
 It is also strongly recommended that you have a custom Tor instance that
 is devoted only to exit scanning, and is not performing any other

Modified: torflow/trunk/NetworkScanners/libsoat.py
===================================================================
--- torflow/trunk/NetworkScanners/libsoat.py	2009-02-13 04:11:14 UTC (rev 18516)
+++ torflow/trunk/NetworkScanners/libsoat.py	2009-02-13 04:21:35 UTC (rev 18517)
@@ -112,12 +112,12 @@
     ret += " "+str(RESULT_STRINGS[self.status])
     if self.reason:
       ret += " Reason: "+self.reason
-    if self.false_positive:
-      ret += " (False positive: "+self.false_positive_reason+")"
     if self.extra_info:
       ret += "\n Extra info: "+self.extra_info 
+    if self.false_positive:
+      ret += "\n Removed as False Positive: "+self.false_positive_reason
     if self.from_rescan:
-      ret += "\nFrom rescan: "+str(self.from_rescan)
+      ret += "\n From rescan: "+str(self.from_rescan)
     ret += "\n"
     return ret