diff --git a/router/java/src/net/i2p/data/i2np/VariableTunnelBuildMessage.java b/router/java/src/net/i2p/data/i2np/VariableTunnelBuildMessage.java index 0921cfd5c..6de19a786 100644 --- a/router/java/src/net/i2p/data/i2np/VariableTunnelBuildMessage.java +++ b/router/java/src/net/i2p/data/i2np/VariableTunnelBuildMessage.java @@ -7,7 +7,7 @@ import net.i2p.data.ByteArray; import net.i2p.data.DataHelper; /** - * @since 0.7.11 + * @since 0.7.12 */ public class VariableTunnelBuildMessage extends TunnelBuildMessage { public static final int MESSAGE_TYPE = 23; diff --git a/router/java/src/net/i2p/data/i2np/VariableTunnelBuildReplyMessage.java b/router/java/src/net/i2p/data/i2np/VariableTunnelBuildReplyMessage.java index a887c0a1e..1dc63078b 100644 --- a/router/java/src/net/i2p/data/i2np/VariableTunnelBuildReplyMessage.java +++ b/router/java/src/net/i2p/data/i2np/VariableTunnelBuildReplyMessage.java @@ -10,7 +10,7 @@ import net.i2p.data.DataHelper; * Transmitted from the new outbound endpoint to the creator through a * reply tunnel * - * @since 0.7.11 + * @since 0.7.12 */ public class VariableTunnelBuildReplyMessage extends TunnelBuildReplyMessage { public static final int MESSAGE_TYPE = 24; diff --git a/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java b/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java index 572d3f87a..870956281 100644 --- a/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java +++ b/router/java/src/net/i2p/router/tunnel/pool/BuildRequestor.java @@ -174,7 +174,9 @@ class BuildRequestor { + "ms and dispatched in " + (System.currentTimeMillis()-beforeDispatch)); } - private static final String MIN_VARIABLE_VERSION = "0.7.11"; + private static final String MIN_VARIABLE_VERSION = "0.7.12"; + /** change this to true in 0.7.13 if testing goes well */ + private static final boolean SEND_VARIABLE = false; /** 5 (~2600 bytes) fits nicely in 3 tunnel messages */ private static final int SHORT_RECORDS = 5; private static final int LONG_RECORDS = TunnelBuildMessage.MAX_RECORD_COUNT; @@ -204,7 +206,7 @@ class BuildRequestor { Log log = ctx.logManager().getLog(BuildRequestor.class); long replyTunnel = 0; Hash replyRouter = null; - boolean useVariable = cfg.getLength() <= SHORT_RECORDS; + boolean useVariable = SEND_VARIABLE && cfg.getLength() <= SHORT_RECORDS; if (cfg.isInbound()) { //replyTunnel = 0; // as above replyRouter = ctx.routerHash();