[or-cvs] r18518: {torflow} Fix pickle problem for the HTTPTest and update README with c (torflow/trunk/NetworkScanners)

[mikeperry@xxxxxxxx]

Author: mikeperry
Date: 2009-02-12 23:46:09 -0500 (Thu, 12 Feb 2009)
New Revision: 18518

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

Fix pickle problem for the HTTPTest and update README with
control port password info.



Modified: torflow/trunk/NetworkScanners/README.ExitScanning
===================================================================
--- torflow/trunk/NetworkScanners/README.ExitScanning	2009-02-13 04:21:35 UTC (rev 18517)
+++ torflow/trunk/NetworkScanners/README.ExitScanning	2009-02-13 04:46:09 UTC (rev 18518)
@@ -117,7 +117,12 @@
 # ./soat.py --ssl --html --http --dnsrebind >& soat.log &
 
 
+If your machine is shared, you probably want to set a control port 
+password. The location for this for metatroller and SoaT is the 
+control_pass variable at the top of torflow-trunk/TorCtl/TorUtil.py.
+Of course you also have to set it in the custom torrc as well.
 
+
 V. Monitoring and Results
 
 A. Watching for Captcha Problems

Modified: torflow/trunk/NetworkScanners/soat.py
===================================================================
--- torflow/trunk/NetworkScanners/soat.py	2009-02-13 04:21:35 UTC (rev 18517)
+++ torflow/trunk/NetworkScanners/soat.py	2009-02-13 04:46:09 UTC (rev 18518)
@@ -514,6 +514,10 @@
     result = self.check_cookies()
     if result > ret_result:
       ret_result = result
+
+    # Cookie jars contain locks and can't be pickled. Clear them away.
+    self.tor_cookie_jar = None
+    self.cookie_jar = None
     return ret_result
 
   def remove_target(self, address, reason):