[or-cvs] r19892: {torflow} Add a soat comment and a libsoat depickle fix. (torflow/trunk/NetworkScanners)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-07-01 16:52:48 -0400 (Wed, 01 Jul 2009)
New Revision: 19892

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

Add a soat comment and a libsoat depickle fix.



Modified: torflow/trunk/NetworkScanners/libsoat.py
===================================================================
--- torflow/trunk/NetworkScanners/libsoat.py	2009-07-01 20:08:37 UTC (rev 19891)
+++ torflow/trunk/NetworkScanners/libsoat.py	2009-07-01 20:52:48 UTC (rev 19892)
@@ -100,7 +100,7 @@
     else:
       self.exit_node = "[No Exit Used]"
       self.exit_name = ""
-      self.exit_ip = ""
+      self.exit_ip = 0
       self.contact = "[No Exit Used]"
     self.exit_obj = exit_obj
     self.site = site
@@ -113,7 +113,7 @@
     self.verbose=0
     self.from_rescan = False
     self.filename=None
-    self._pickle_revision = 4
+    self._pickle_revision = 5
 
   def depickle_upgrade(self):
     if not "_pickle_revision" in self.__dict__: # upgrade to v0
@@ -130,7 +130,11 @@
     if self._pickle_revision < 4:
       self._pickle_revision = 4
       self.contact = None
+    if self._pickle_revision < 5:
+      self._pickle_revision = 5
+      if type(self.exit_ip) == str or not self.exit_ip: self.exit_ip = 0
 
+
   def _rebase(self, filename, new_data_root):
     if not filename: return filename
     filename = os.path.normpath(filename)

Modified: torflow/trunk/NetworkScanners/soat.py
===================================================================
--- torflow/trunk/NetworkScanners/soat.py	2009-07-01 20:08:37 UTC (rev 19891)
+++ torflow/trunk/NetworkScanners/soat.py	2009-07-01 20:52:48 UTC (rev 19892)
@@ -249,6 +249,8 @@
       if r.site == target:
         kill_results.append(r)
     for r in kill_results:
+      # XXX: Need to re-add this node to our test set 
+      # (If it is still up)
       if r.status == TEST_FAILURE:
         # Save this new result file in false positive dir 
         # and remove old one