From a85546534e32eaf5e0d8f32b8360f2b413cee6c3 Mon Sep 17 00:00:00 2001
From: zzz <zzz@mail.i2p>
Date: Sun, 5 Feb 2017 14:55:13 +0000
Subject: [PATCH] Streaming: Don't always send optional delay (ticket #1046)
javadocs
---
.../src/net/i2p/client/streaming/impl/Connection.java | 2 +-
.../src/net/i2p/client/streaming/impl/Packet.java | 11 +++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java
index 1e33c793b6..27a6777560 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/Connection.java
@@ -388,7 +388,7 @@ class Connection {
_log.debug("Requesting ack delay of " + delay + "ms for packet " + packet);
}
// WHY always set?
- packet.setFlag(Packet.FLAG_DELAY_REQUESTED);
+ //packet.setFlag(Packet.FLAG_DELAY_REQUESTED);
long timeout = _options.getRTO();
if (timeout > MAX_RESEND_DELAY)
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/impl/Packet.java b/apps/streaming/java/src/net/i2p/client/streaming/impl/Packet.java
index 65ebe4f1f4..f9e8cdecf8 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/impl/Packet.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/impl/Packet.java
@@ -333,6 +333,9 @@ class Packet {
*/
public Signature getOptionalSignature() { return _optionSignature; }
+ /**
+ * This also sets flag FLAG_SIGNATURE_INCLUDED
+ */
public void setOptionalSignature(Signature sig) {
setFlag(FLAG_SIGNATURE_INCLUDED, sig != null);
_optionSignature = sig;
@@ -346,6 +349,7 @@ class Packet {
/**
* This sets the from field in the packet to the Destination for the session
* provided in the constructor.
+ * This also sets flag FLAG_FROM_INCLUDED
*/
public void setOptionalFrom() {
setFlag(FLAG_FROM_INCLUDED, true);
@@ -360,6 +364,9 @@ class Packet {
*/
public int getOptionalDelay() { return _optionDelay; }
+ /**
+ * Caller must also call setFlag(FLAG_DELAY_REQUESTED)
+ */
public void setOptionalDelay(int delayMs) {
if (delayMs > MAX_DELAY_REQUEST)
_optionDelay = MAX_DELAY_REQUEST;
@@ -375,6 +382,10 @@ class Packet {
* @return Maximum payload size sender can receive (MRU)
*/
public int getOptionalMaxSize() { return _optionMaxSize; }
+
+ /**
+ * This also sets flag FLAG_MAX_PACKET_SIZE_INCLUDED
+ */
public void setOptionalMaxSize(int numBytes) {
setFlag(FLAG_MAX_PACKET_SIZE_INCLUDED, numBytes > 0);
_optionMaxSize = numBytes;
--
GitLab