From 4e5a2e012c13183931861d4e4f9a5573cb4b32ad Mon Sep 17 00:00:00 2001 From: jrandom Date: Sun, 20 Jun 2004 00:50:38 +0000 Subject: [PATCH] update since bw limiter interface changed (but dont bother to use it anymore here) i wonder if i should remove the phttp transport now or keep it around in case it gets revived... --- .../java/src/net/i2p/router/transport/phttp/PHTTPSender.java | 2 +- .../src/net/i2p/router/transport/phttp/PHTTPTransport.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/router/java/src/net/i2p/router/transport/phttp/PHTTPSender.java b/router/java/src/net/i2p/router/transport/phttp/PHTTPSender.java index eba8e160c..5ced3675c 100644 --- a/router/java/src/net/i2p/router/transport/phttp/PHTTPSender.java +++ b/router/java/src/net/i2p/router/transport/phttp/PHTTPSender.java @@ -92,7 +92,7 @@ class PHTTPSender { } private boolean doSend(OutNetMessage msg) throws IOException { - long delay = _context.bandwidthLimiter().calculateDelayOutbound(msg.getTarget().getIdentity(), (int)msg.getMessageSize()); + long delay = 0; // _context.bandwidthLimiter().calculateDelayOutbound(msg.getTarget().getIdentity(), (int)msg.getMessageSize()); _log.debug("Delaying [" + delay + "ms]"); try { Thread.sleep(delay); } catch (InterruptedException ie) {} _log.debug("Continuing with sending"); diff --git a/router/java/src/net/i2p/router/transport/phttp/PHTTPTransport.java b/router/java/src/net/i2p/router/transport/phttp/PHTTPTransport.java index 33065f536..6c2f8bd4b 100644 --- a/router/java/src/net/i2p/router/transport/phttp/PHTTPTransport.java +++ b/router/java/src/net/i2p/router/transport/phttp/PHTTPTransport.java @@ -240,7 +240,7 @@ public class PHTTPTransport extends TransportImpl { if (_poller.shouldRejectMessages()) return null; // we're not using phttp - long latencyStartup = _context.bandwidthLimiter().calculateDelayOutbound(toAddress.getIdentity(), (int)dataSize); + long latencyStartup = 0; //_context.bandwidthLimiter().calculateDelayOutbound(toAddress.getIdentity(), (int)dataSize); latencyStartup += _pollFrequencyMs / 2; // average distance until the next poll long sendTime = (int)((dataSize)/(16*1024)); // 16K/sec ARBITRARY int bytes = (int)dataSize+1024; @@ -288,7 +288,7 @@ public class PHTTPTransport extends TransportImpl { } public String getName() { return "Push New PHTTP Message"; } public void runJob() { - long delay = _context.bandwidthLimiter().calculateDelayOutbound(_msg.getTarget().getIdentity(), (int)_msg.getMessageSize()); + long delay = 0; // _context.bandwidthLimiter().calculateDelayOutbound(_msg.getTarget().getIdentity(), (int)_msg.getMessageSize()); if (delay > 0) { getTiming().setStartAfter(delay + _context.clock().now()); PHTTPTransport.this._context.jobQueue().addJob(this);