[or-cvs] r18660: {torctl} Handle the case where the user requested an exit that disapp (torctl/trunk/python/TorCtl)

[mikeperry@xxxxxxxx]

Author: mikeperry
Date: 2009-02-20 19:28:23 -0500 (Fri, 20 Feb 2009)
New Revision: 18660

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

Handle the case where the user requested an exit that
disappears from the consensus. Somewhat of an ugly hack..



Modified: torctl/trunk/python/TorCtl/PathSupport.py
===================================================================
--- torctl/trunk/python/TorCtl/PathSupport.py	2009-02-20 20:03:57 UTC (rev 18659)
+++ torctl/trunk/python/TorCtl/PathSupport.py	2009-02-21 00:28:23 UTC (rev 18660)
@@ -48,6 +48,7 @@
 import Queue
 import time
 import TorUtil
+import traceback
 from TorUtil import *
 
 __all__ = ["NodeRestrictionList", "PathRestrictionList",
@@ -958,6 +959,9 @@
 
   def set_target(self, ip, port):
     "Called to update the ExitPolicyRestrictions with a new ip and port"
+    if self.exit_name[0:3] == "!up":
+      plog("WARN", "Requested target with non-up node: "+self.exit_name[4:])
+      raise NoNodesRemain()
     self.exit_rstr.del_restriction(ExitPolicyRestriction)
     self.exit_rstr.add_restriction(ExitPolicyRestriction(ip, port))
     if self.__ordered_exit_gen: self.__ordered_exit_gen.set_port(port)
@@ -979,6 +983,32 @@
     # Need to rebuild exit generator
     self.path_selector.exit_gen.rebuild()
 
+  def rebuild_gens(self, sorted_r, router_map, nick_map):
+    exit_cleared = False
+    exit_id = None
+    if self.exit_name:
+      if self.exit_name[0] == '$':
+        exit_id = self.exit_name[1:]
+      elif self.exit_name in nick_map:
+        exit_id = nick_map[exit_id][1:]
+      if not exit_id or exit_id not in router_map or router_map[exit_id].down:
+        plog("NOTICE", "Clearing restriction on downed exit "+self.exit_name)
+        exit_cleared = True
+        self.exit_name = None
+        self.reconfigure(sorted_r)
+    try:
+      self.path_selector.rebuild_gens(sorted_r)
+    except NoNodesRemain:
+      traceback.print_exc()
+      plog("WARN", "Punting + Performing reconfigure..")
+      self.reconfigure(sorted_r)
+    if exit_cleared: 
+      # FIXME: This is a pretty ugly hack.. Basically we are forcing
+      # another NoNodesRemain via set_target if the user doesn't request a 
+      # new exit by then...
+      self.exit_name = "!up-"+str(exit_id)
+      self.exit_rstr.add_restriction(NickRestriction(self.exit_name))
+
 class Circuit:
   "Class to describe a circuit"
   def __init__(self):
@@ -1357,11 +1387,11 @@
 
   def new_consensus_event(self, n):
     TorCtl.ConsensusTracker.new_consensus_event(self, n)
-    self.selmgr.path_selector.rebuild_gens(self.sorted_r)
+    self.selmgr.rebuild_gens(self.sorted_r, self.routers, self.name_to_key)
 
   def new_desc_event(self, d):
     if TorCtl.ConsensusTracker.new_desc_event(self, d):
-      self.selmgr.path_selector.rebuild_gens(self.sorted_r)
+      self.selmgr.rebuild_gens(self.sorted_r, self.routers, self.name_to_key)
 
   def bandwidth_event(self, b): pass # For heartbeat only..