[or-cvs] [torflow/master 27/92] Notify and exit if requested exit node does not exist

[mikeperry at torproject.org]

Author: John M. Schanck <john at anomos.info>
Date: Tue, 20 Jul 2010 16:05:56 -0400
Subject: Notify and exit if requested exit node does not exist
Commit: 8fa73ca58bc82cba83d08e35a87ce2779d68f44a

---
 NetworkScanners/ExitAuthority/soat.py |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/NetworkScanners/ExitAuthority/soat.py b/NetworkScanners/ExitAuthority/soat.py
index b2dfa0a..16dbc58 100755
--- a/NetworkScanners/ExitAuthority/soat.py
+++ b/NetworkScanners/ExitAuthority/soat.py
@@ -2953,8 +2953,11 @@ def main(argv):
       test.rewind()
 
   if scan_exit:
-    plog("NOTICE", "Scanning only "+scan_exit)
     scanhdlr.set_exit_node(scan_exit)
+    if scanhdlr.selmgr.bad_restrictions:
+      plog("NOTICE", "Requested exit node, %s, is not available. Exiting." % scan_exit)
+      return
+    plog("NOTICE", "Scanning only "+scan_exit)
     scanhdlr.new_exit()
 
     while 1:
-- 
1.7.1