* TunnelPool: Don't reuse peers for exploratory tunnels

This commit is contained in:
zzz
2013-07-06 13:18:19 +00:00
parent 614b8b4cdd
commit 3af766bd6e
3 changed files with 5 additions and 2 deletions

View File

@@ -1,3 +1,6 @@
2013-07-06 zzz
* TunnelPool: Don't reuse peers for exploratory tunnels
2013-07-04 zzz
* Streaming:
- Don't stop timers when session disconnects (tickets #644, #810)

View File

@@ -18,7 +18,7 @@ public class RouterVersion {
/** deprecated */
public final static String ID = "Monotone";
public final static String VERSION = CoreVersion.VERSION;
public final static long BUILD = 17;
public final static long BUILD = 18;
/** for example "-test" */
public final static String EXTRA = "-rc";

View File

@@ -1084,7 +1084,7 @@ public class TunnelPool {
int len = settings.getLengthOverride();
if (len < 0)
len = settings.getLength();
if (len > 0 && _context.random().nextBoolean()) {
if (len > 0 && (!settings.isExploratory()) && _context.random().nextBoolean()) {
// look for a tunnel to reuse, if the right length and expiring soon
// ignore variance for now.
len++; // us