From c9c1eae32f41d024f0ef607c95558cd8ee789c2a Mon Sep 17 00:00:00 2001
From: jrandom <jrandom>
Date: Fri, 1 Apr 2005 13:29:26 +0000
Subject: [PATCH] 2005-04-01  jrandom     * Allow editing I2PTunnel server
 instances with five digit ports       (thanks nickless_head!)     * More
 NewsFetcher debugging for reported weirdness

---
 apps/i2ptunnel/jsp/editServer.jsp                  |  2 +-
 .../java/src/net/i2p/router/web/NewsFetcher.java   | 14 +++++++++++---
 history.txt                                        |  7 ++++++-
 router/java/src/net/i2p/router/RouterVersion.java  |  4 ++--
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/apps/i2ptunnel/jsp/editServer.jsp b/apps/i2ptunnel/jsp/editServer.jsp
index 5fdfae25c..60959dd5f 100644
--- a/apps/i2ptunnel/jsp/editServer.jsp
+++ b/apps/i2ptunnel/jsp/editServer.jsp
@@ -77,7 +77,7 @@ if (curTunnel >= 0) {
 </td>
 <td>
 Host: <input type="text" size="20" name="targetHost" value="<%=editBean.getTargetHost(curTunnel)%>" />
-Port: <input type="text" size="4" maxlength="4" name="targetPort" value="<%=editBean.getTargetPort(curTunnel)%>" />
+Port: <input type="text" size="6" maxlength="5" name="targetPort" value="<%=editBean.getTargetPort(curTunnel)%>" />
 </td>
 </tr>
 <% String curType = editBean.getInternalType(curTunnel);
diff --git a/apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java b/apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java
index e7bbd23d2..7f8d50305 100644
--- a/apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java
+++ b/apps/routerconsole/java/src/net/i2p/router/web/NewsFetcher.java
@@ -113,8 +113,9 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
     private static final String VERSION_STRING = "version=\"" + RouterVersion.VERSION + "\"";
     private static final String VERSION_PREFIX = "version=\"";
     private void checkForUpdates() {
+        _updateAvailable = false;
         File news = new File(NEWS_FILE);
-        if (!news.exists()) return;
+        if ( (!news.exists()) || (news.length() <= 0) ) return;
         FileInputStream in = null;
         try {
             in = new FileInputStream(news);
@@ -240,13 +241,20 @@ public class NewsFetcher implements Runnable, EepGet.StatusListener {
     }
     public void transferComplete(long alreadyTransferred, long bytesTransferred, long bytesRemaining, String url, String outputFile) {
         if (_log.shouldLog(Log.INFO))
-            _log.info("News fetched from " + url);
+            _log.info("News fetched from " + url + " with " + (alreadyTransferred+bytesTransferred));
         
         File temp = new File(TEMP_NEWS_FILE);
         if (temp.exists()) {
             boolean copied = FileUtil.copy(TEMP_NEWS_FILE, NEWS_FILE, true);
-            if (copied)
+            if (copied) {
                 temp.delete();
+            } else {
+                if (_log.shouldLog(Log.ERROR))
+                    _log.error("Failed to copy the news file!");
+            }
+        } else {
+            if (_log.shouldLog(Log.ERROR))
+                _log.error("Transfer complete, but no file?");
         }
         checkForUpdates();
     }
diff --git a/history.txt b/history.txt
index 9c2225b99..39d12f4d8 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,9 @@
-$Id: history.txt,v 1.183 2005/03/29 19:07:40 jrandom Exp $
+$Id: history.txt,v 1.184 2005/04/01 06:28:07 jrandom Exp $
+
+2005-04-01  jrandom
+    * Allow editing I2PTunnel server instances with five digit ports 
+      (thanks nickless_head!)
+    * More NewsFetcher debugging for reported weirdness
 
 2005-04-01  jrandom
     * Fix to check for missing news file (thanks smeghead!)
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 831e6591c..b74d7f740 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.176 $ $Date: 2005/03/29 19:07:39 $";
+    public final static String ID = "$Revision: 1.177 $ $Date: 2005/04/01 06:28:06 $";
     public final static String VERSION = "0.5.0.5";
-    public final static long BUILD = 1;
+    public final static long BUILD = 2;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION);
         System.out.println("Router ID: " + RouterVersion.ID);