[or-cvs] r18085: {torctl} Doh. Used the wrong variable.. Should have ran pychecker. (torctl/trunk/python/TorCtl)

[mikeperry at seul.org]

Author: mikeperry
Date: 2009-01-12 00:29:26 -0500 (Mon, 12 Jan 2009)
New Revision: 18085

Modified:
   torctl/trunk/python/TorCtl/PathSupport.py
Log:

Doh. Used the wrong variable.. Should have ran pychecker.



Modified: torctl/trunk/python/TorCtl/PathSupport.py
===================================================================
--- torctl/trunk/python/TorCtl/PathSupport.py	2009-01-12 04:48:16 UTC (rev 18084)
+++ torctl/trunk/python/TorCtl/PathSupport.py	2009-01-12 05:29:26 UTC (rev 18085)
@@ -192,15 +192,15 @@
 #  - NodeRestrictions:
 #    - Uptime/LongLivedPorts (Does/should hibernation count?)
 #    - Published/Updated
+#    - Add a /8 restriction for ExitPolicy?
 #  - PathRestrictions:
-#    - Family
+#    - NodeFamily
 #    - GeoIP:
-#      - OceanPhobicRestrictor (avoids Pacific Ocean or two atlantic crossings)
-#        or ContinentRestrictor (avoids doing more than N continent crossings)
-#        - Mathematical/empirical study of predecessor expectation
-#          - If middle node on the same continent as exit, exit learns nothing
-#          - else, exit has a bias on the continent of origin of user
-#            - Language and browser accept string determine this anyway
+#      - Mathematical/empirical study of predecessor expectation
+#        - If middle node on the same continent as exit, exit learns nothing
+#        - else, exit has a bias on the continent of origin of user
+#          - Language and browser accept string determine this anyway
+#      - ContinentRestrictor (avoids doing more than N continent crossings)
 #      - EchelonPhobicRestrictor
 #        - Does not cross international boundaries for client->Entry or
 #          Exit->destination hops
@@ -1033,7 +1033,7 @@
     for ns in nslist:
       if not "Running" in ns.flags:
         if ns.idhex in self.routers:
-          plog("DEBUG", "Expiring non-running router "+r.idhex)
+          plog("DEBUG", "Expiring non-running router "+ns.idhex)
           self.sorted_r.remove(elf.routers[ns.idhex])
           del self.routers[ns.idhex]