From 51285efbc3ec4f8b9e21c8020cb4b7cf7989bad3 Mon Sep 17 00:00:00 2001
From: jrandom <jrandom>
Date: Mon, 13 Sep 2004 03:08:16 +0000
Subject: [PATCH] 2004-09-13  jrandom     * Update for the SDK reconnection to
 deal with overflow.     * Web improvements (@ not # on the /logs.jsp [thanks
 ugha!] and fixed the       rounding on lifetime bandwidth used [thanks
 gott!]).

---
 .../java/src/net/i2p/router/web/SummaryHelper.java       | 9 +++++----
 apps/routerconsole/jsp/configlogging.jsp                 | 2 +-
 core/java/src/net/i2p/client/I2PSessionImpl.java         | 2 +-
 history.txt                                              | 7 ++++++-
 router/java/src/net/i2p/router/RouterVersion.java        | 4 ++--
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
index f6ffae3704..e55ff96834 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/SummaryHelper.java
@@ -297,26 +297,27 @@ public class SummaryHelper {
     }
     
     private static String getTransferred(long bytes) {
+        double val = bytes;
         int scale = 0;
         if (bytes > 1024*1024*1024) {
             // gigs transferred
             scale = 3; 
-            bytes /= (1024*1024*1024);
+            val /= (double)(1024*1024*1024);
         } else if (bytes > 1024*1024) {
             // megs transferred
             scale = 2;
-            bytes /= (1024*1024);
+            val /= (double)(1024*1024);
         } else if (bytes > 1024) {
             // kbytes transferred
             scale = 1;
-            bytes /= 1024;
+            val /= (double)1024;
         } else {
             scale = 0;
         }
         
         DecimalFormat fmt = new DecimalFormat("##0.00");
 
-        String str = fmt.format(bytes);
+        String str = fmt.format(val);
         switch (scale) {
             case 1: return str + "KB";
             case 2: return str + "MB";
diff --git a/apps/routerconsole/jsp/configlogging.jsp b/apps/routerconsole/jsp/configlogging.jsp
index aba7d34ca8..672c7e11d8 100644
--- a/apps/routerconsole/jsp/configlogging.jsp
+++ b/apps/routerconsole/jsp/configlogging.jsp
@@ -29,7 +29,7 @@
  <input type="hidden" name="action" value="blah" />
  <b>Logging filename:</b> 
     <input type="text" name="logfilename" size="40" value="<jsp:getProperty name="logginghelper" property="logFilePattern" />" /><br />
-    <i>(the symbol '#' will be replaced during log rotation)</i><br />
+    <i>(the symbol '@' will be replaced during log rotation)</i><br />
  <b>Log record format:</b>
     <input type="text" name="logformat" size="20" value="<jsp:getProperty name="logginghelper" property="recordPattern" />" /><br />
     <i>(use 'd' = date, 'c' = class, 't' = thread, 'p' = priority, 'm' = message)</i><br />
diff --git a/core/java/src/net/i2p/client/I2PSessionImpl.java b/core/java/src/net/i2p/client/I2PSessionImpl.java
index 9da1ed77fe..12abfe271a 100644
--- a/core/java/src/net/i2p/client/I2PSessionImpl.java
+++ b/core/java/src/net/i2p/client/I2PSessionImpl.java
@@ -580,7 +580,7 @@ abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2CPMessa
         while (true) {
             long delay = BASE_RECONNECT_DELAY << i;
             i++;
-            if (delay > MAX_RECONNECT_DELAY)
+            if ( (delay > MAX_RECONNECT_DELAY) || (delay <= 0) )
                 delay = MAX_RECONNECT_DELAY;
             try { Thread.sleep(delay); } catch (InterruptedException ie) {}
             
diff --git a/history.txt b/history.txt
index 8b95a4460f..7a1c666222 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,9 @@
-$Id: history.txt,v 1.15 2004/09/08 17:15:43 hypercubus Exp $
+$Id: history.txt,v 1.16 2004/09/08 21:26:43 jrandom Exp $
+
+2004-09-13  jrandom
+    * Update for the SDK reconnection to deal with overflow.
+    * Web improvements (@ not # on the /logs.jsp [thanks ugha!] and fixed the 
+      rounding on lifetime bandwidth used [thanks gott!]).
 
 * 2004-09-08  0.4.0.1 released
 
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 9d721f0051..ac4eb2adf8 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
  *
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.28 $ $Date: 2004/09/08 17:05:35 $";
+    public final static String ID = "$Revision: 1.29 $ $Date: 2004/09/08 21:26:43 $";
     public final static String VERSION = "0.4.0.1";
-    public final static long BUILD = 0;
+    public final static long BUILD = 1;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION);
         System.out.println("Router ID: " + RouterVersion.ID);