From 05cd3d736b5fa36c6990eb8a0639128e688f494d Mon Sep 17 00:00:00 2001 From: jrandom Date: Tue, 7 Sep 2004 09:49:02 +0000 Subject: [PATCH] 2004-09-07 jrandom * Disable the timestamper by default for all applications except the router (enable via -Dtime.disabled=false) * Simplify the retrieval of the full destination with text based browsers. * Bundle the updated wrapper.config and hosts.txt in the i2pupdate.tar.bz2 --- .../src/net/i2p/i2ptunnel/TunnelController.java | 13 +++++++------ build.xml | 2 ++ core/java/src/net/i2p/time/Timestamper.java | 2 +- history.txt | 8 +++++++- router/java/src/net/i2p/router/RouterContext.java | 15 ++++++++++++++- router/java/src/net/i2p/router/RouterVersion.java | 4 ++-- 6 files changed, 33 insertions(+), 11 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java index c2b091df9d..15961e3ff0 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java @@ -371,14 +371,15 @@ public class TunnelController implements Logging { Destination dest = session.getMyDestination(); if (dest != null) { buf.append("Destination hash: ").append(dest.calculateHash().toBase64()).append("
\n"); - buf.append("Full destination: "); - buf.append("\n"); if ("server".equals(getType())) { - buf.append(" Give that out to people so they can view your service."); - buf.append(" If you are going to share it on irc, be sure to split it on two lines"); + buf.append("Full destination: "); + buf.append("\n"); + buf.append("
If you are going to share this on IRC, you need to split it up:
\n"); + String str = dest.toBase64(); + buf.append(str.substring(0, str.length()/2)).append("
\n"); + buf.append(str.substring(str.length()/2)).append("
\n"); } - buf.append("
\n"); } } } diff --git a/build.xml b/build.xml index de32698f55..132ec80461 100644 --- a/build.xml +++ b/build.xml @@ -227,6 +227,8 @@ + + diff --git a/core/java/src/net/i2p/time/Timestamper.java b/core/java/src/net/i2p/time/Timestamper.java index 8dbf4e302f..1e87c4b9b0 100644 --- a/core/java/src/net/i2p/time/Timestamper.java +++ b/core/java/src/net/i2p/time/Timestamper.java @@ -25,7 +25,7 @@ public class Timestamper implements Runnable { private static final int DEFAULT_QUERY_FREQUENCY = 5*60*1000; private static final String DEFAULT_SERVER_LIST = "pool.ntp.org, pool.ntp.org"; - private static final boolean DEFAULT_DISABLED = false; + private static final boolean DEFAULT_DISABLED = true; public static final String PROP_QUERY_FREQUENCY = "time.queryFrequencyMs"; public static final String PROP_SERVER_LIST = "time.sntpServerList"; diff --git a/history.txt b/history.txt index a50e4f4790..9fed6dcdcb 100644 --- a/history.txt +++ b/history.txt @@ -1,4 +1,10 @@ -$Id: history.txt,v 1.9 2004/09/07 02:17:03 jrandom Exp $ +$Id: history.txt,v 1.10 2004/09/07 02:23:49 jrandom Exp $ + +2004-09-07 jrandom + * Disable the timestamper by default for all applications except the router + (enable via -Dtime.disabled=false) + * Simplify the retrieval of the full destination with text based browsers. + * Bundle the updated wrapper.config and hosts.txt in the i2pupdate.tar.bz2 2004-09-07 jrandom * Write the native libraries to the current directory when they are loaded diff --git a/router/java/src/net/i2p/router/RouterContext.java b/router/java/src/net/i2p/router/RouterContext.java index cdd05a3d20..5b290a731a 100644 --- a/router/java/src/net/i2p/router/RouterContext.java +++ b/router/java/src/net/i2p/router/RouterContext.java @@ -65,11 +65,24 @@ public class RouterContext extends I2PAppContext { public RouterContext(Router router) { this(router, null); } public RouterContext(Router router, Properties envProps) { - super(envProps); + super(filterProps(envProps)); _router = router; initAll(); _contexts.add(this); } + /** + * Unless we are explicitly disabling the timestamper, we want to use it. + * We need this now as the new timestamper default is disabled (so we don't + * have each I2PAppContext creating their own SNTP queries all the time) + * + */ + static final Properties filterProps(Properties envProps) { + if (envProps == null) + envProps = new Properties(); + if (envProps.getProperty("time.disabled") == null) + envProps.setProperty("time.disabled", "false"); + return envProps; + } private void initAll() { _adminManager = new AdminManager(this); _clientManagerFacade = new ClientManagerFacadeImpl(this); diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 1ee15f19d3..d0d3025d52 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.24 $ $Date: 2004/09/06 00:21:26 $"; + public final static String ID = "$Revision: 1.25 $ $Date: 2004/09/07 02:17:03 $"; public final static String VERSION = "0.4"; - public final static long BUILD = 7; + public final static long BUILD = 8; public static void main(String args[]) { System.out.println("I2P Router version: " + VERSION); System.out.println("Router ID: " + RouterVersion.ID);