[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[minion-cvs] Bump recommended openssl version to 0.9.8e. Fix a rand...



Update of /home/minion/cvsroot/src/minion/lib/mixminion
In directory moria:/tmp/cvs-serv20394/lib/mixminion

Modified Files:
	ClientDirectory.py 
Log Message:
Bump recommended openssl version to 0.9.8e.  Fix a randomly occurring bug in path generation.

Index: ClientDirectory.py
===================================================================
RCS file: /home/minion/cvsroot/src/minion/lib/mixminion/ClientDirectory.py,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- ClientDirectory.py	5 Dec 2005 17:15:52 -0000	1.51
+++ ClientDirectory.py	12 Sep 2007 20:49:09 -0000	1.52
@@ -1267,6 +1267,14 @@
             else:
                 n1 = len(p1)
 
+            # Make sure that we always have at least one server in each
+            # subpath that we use.  (Duh.)
+            if n1 == 0 and not pathSpec.isSURB:
+                n1 = 1
+                p.insert(0, None)
+            if n1 >= len(p) and not pathSpec.isReply:
+                p.insert(n1, None)
+
             result = self._getPath(p, startAt=startAt, endAt=endAt)
             r1,r2 = result[:n1], result[n1:]
             paths.append( (r1,r2) )