[or-cvs] hack exerciseserver into something i just ran.

[Roger Dingledine]

Update of /home2/or/cvsroot/tor/contrib
In directory moria.mit.edu:/tmp/cvs-serv31293

Modified Files:
	ExerciseServer.py 
Log Message:
hack exerciseserver into something i just ran.


Index: ExerciseServer.py
===================================================================
RCS file: /home2/or/cvsroot/tor/contrib/ExerciseServer.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- ExerciseServer.py	31 Mar 2005 06:21:43 -0000	1.4
+++ ExerciseServer.py	31 Mar 2005 07:06:21 -0000	1.5
@@ -31,21 +31,30 @@
             s.close()
             return 1
 
-HOSTS_TO_TEST = [ "moria1", "ned", "tor26"]
+HOSTS_TO_TEST = [ "serifos", "chaoscomputerclub", "NetWorkXXIII", "caethaver2",
+                  "theoryorg", "samaire", "alrua", "ihopethisisunique",
+                  "xolotl", "cacophony", "ghettocluster", "torserverzillion",
+                  "ned", "richhomednsorg", "subzeronet"]
 EXITS_TO_TEST = [ "pvt", ]
+
+HOSTS_THAT_WORK = [ "serifos", "rodos", "moria2", "chaoscomputerclub"]
+EXITS_THAT_WORK = [ "serifos", "rodos"]
+
 TARGETS = [ ("belegost.mit.edu", "/"),
             ("seul.org", "/")]
-N_CIRCS_TO_TRY = 100
+
+N_CIRCS_TO_TRY = 5*len(HOSTS_TO_TEST)
 CIRCS_AT_A_TIME = 3
 CIRC_LEN = 3
 
-
 HOST_STATUS = {}
 N_CIRCS_DONE = 0
 def launchCirc(s):
-    htt = HOSTS_TO_TEST[:]
-    random.shuffle(htt)
-    path = htt[:CIRC_LEN-1]+[random.choice(EXITS_TO_TEST)]
+    htw = HOSTS_THAT_WORK[:]
+    random.shuffle(htw)
+    path = htw[:CIRC_LEN-2] + \
+           [random.choice(HOSTS_TO_TEST)] + \
+           [random.choice(EXITS_THAT_WORK)]
     circid = TorControl.extend_circuit(s, 0, path)
 
     for name in path: