From bd57463d423f589096508451e59d6f7130f964a3 Mon Sep 17 00:00:00 2001 From: zzz <zzz@mail.i2p> Date: Tue, 18 Sep 2012 12:37:30 +0000 Subject: [PATCH] fix NTCP backlogged indication --- .../src/net/i2p/router/transport/ntcp/NTCPConnection.java | 6 +++--- .../src/net/i2p/router/transport/ntcp/NTCPTransport.java | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java index 4ad84d2592..33f4eb15d1 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPConnection.java @@ -119,7 +119,7 @@ class NTCPConnection implements FIFOBandwidthLimiter.CompleteListener { private final byte _meta[] = new byte[META_SIZE]; private boolean _sendingMeta; /** how many consecutive sends were failed due to (estimated) send queue time */ - private int _consecutiveBacklog; + //private int _consecutiveBacklog; private long _nextInfoTime; /* @@ -253,8 +253,6 @@ class NTCPConnection implements FIFOBandwidthLimiter.CompleteListener { /** @return milliseconds */ public long getTimeSinceCreated() { return System.currentTimeMillis()-_created; } - public int getConsecutiveBacklog() { return _consecutiveBacklog; } - /** * workaround for EventPumper * @since 0.8.12 @@ -367,6 +365,8 @@ class NTCPConnection implements FIFOBandwidthLimiter.CompleteListener { } ****/ + public boolean isBacklogged() { return _outbound.isBacklogged(); } + public boolean tooBacklogged() { //long queueTime = queueTime(); //if (queueTime <= 0) return false; diff --git a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java index d49642ad74..fde13148cf 100644 --- a/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java +++ b/router/java/src/net/i2p/router/transport/ntcp/NTCPTransport.java @@ -807,7 +807,7 @@ public class NTCPTransport extends TransportImpl { long outQueue = con.getOutboundQueueSize(); buf.append("</td><td class=\"cells\" align=\"center\">").append(outQueue); buf.append("</td><td class=\"cells\" align=\"center\">"); - if (con.getConsecutiveBacklog() > 0) + if (con.isBacklogged()) buf.append("✓"); else buf.append(" "); -- GitLab