From 018098b8ef2858febb9a7405e9f1ef51db8fd12f Mon Sep 17 00:00:00 2001
From: zab2 <zab2@mail.i2p>
Date: Thu, 18 Jul 2013 01:52:46 +0000
Subject: [PATCH] better loading from cache
---
.../i2p/client/streaming/ConnectionOptions.java | 14 ++++++++------
.../src/net/i2p/client/streaming/TCBShare.java | 6 +-----
2 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java
index 725a0c36b2..fcda7f3488 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/ConnectionOptions.java
@@ -572,21 +572,23 @@ class ConnectionOptions extends I2PSocketOptionsImpl {
/** used in TCB @since 0.9.8 */
int getRTTDev() { return _rttDev; }
- /** used in TCB @since 0.9.8 */
- void setRTTDev(int rttDev) { _rttDev = rttDev; }
+ private void setRTTDev(int rttDev) { _rttDev = rttDev; }
/**
- * mark these options as loaded from cache.
- * affects the calculation of RTO
+ * Loads options from TCB cache.
*/
- synchronized void loadedFromCache() {
+ synchronized void loadFromCache(int rtt, int rttDev, int wdw) {
_initState = AckInit.STEADY;
+ setRTT(rtt);
+ setRTTDev(rttDev);
+ setWindowSize(wdw);
+ computeRTO();
}
/**
* computes RTO based on formula in RFC
*/
- synchronized void computeRTO() {
+ private synchronized void computeRTO() {
switch(_initState) {
case INIT :
throw new IllegalStateException();
diff --git a/apps/streaming/java/src/net/i2p/client/streaming/TCBShare.java b/apps/streaming/java/src/net/i2p/client/streaming/TCBShare.java
index 74f38b10fa..b85cb89769 100644
--- a/apps/streaming/java/src/net/i2p/client/streaming/TCBShare.java
+++ b/apps/streaming/java/src/net/i2p/client/streaming/TCBShare.java
@@ -99,11 +99,7 @@ class TCBShare {
" RTTDev: "+ rttDev +
" wdw: " + wdw );
}
- opts.loadedFromCache();
- opts.setRTT(rtt);
- opts.setRTTDev(rttDev);
- opts.setWindowSize(wdw);
- opts.computeRTO();
+ opts.loadFromCache(rtt,rttDev,wdw);
}
/** store to cache */
--
GitLab