From 276493da6523da27d196f1dbfb70abb933112019 Mon Sep 17 00:00:00 2001 From: jrandom Date: Thu, 30 Sep 2004 15:58:54 +0000 Subject: [PATCH] * 2004-09-30 0.4.1 released (not backwards compatible) 2004-09-30 jrandom * Bundle the configuration necessary to run an eepsite out of the box with Jetty - simply edit ./eepsite/docroot/index.html and give people the key listed on the I2PTunnel configuration page, and its up. * Router console cleanup, and some (off by default) tunnels - smtp.postman.i2p (port 7659), pop.postman.i2p (port 7660), and irc.baffled.i2p (port 7661) --- .../net/i2p/i2ptunnel/TunnelController.java | 7 ++++ apps/i2ptunnel/jsp/index.jsp | 1 + core/java/src/net/i2p/CoreVersion.java | 4 +- history.txt | 7 +++- installer/resources/i2ptunnel.config | 41 ++++++++++++++++++- .../src/net/i2p/router/RouterVersion.java | 6 +-- 6 files changed, 59 insertions(+), 7 deletions(-) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java index 15961e3ff..b486185c6 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java @@ -8,6 +8,7 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.Properties; +import java.util.Random; import net.i2p.I2PAppContext; import net.i2p.I2PException; @@ -375,10 +376,16 @@ public class TunnelController implements Logging { buf.append("Full destination: "); buf.append("\n"); + long val = new Random().nextLong(); + if (val < 0) val = 0 - val; + buf.append("
You can view"); + buf.append(" it in a browser (only when you're using the eepProxy)\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("You can also post it to Eepsite announcement forum
"); } } } diff --git a/apps/i2ptunnel/jsp/index.jsp b/apps/i2ptunnel/jsp/index.jsp index d0e0bc790..babfca1e3 100644 --- a/apps/i2ptunnel/jsp/index.jsp +++ b/apps/i2ptunnel/jsp/index.jsp @@ -7,6 +7,7 @@ +

Messages since last page load:

diff --git a/core/java/src/net/i2p/CoreVersion.java b/core/java/src/net/i2p/CoreVersion.java index 74a01ebe0..f04f22d9a 100644 --- a/core/java/src/net/i2p/CoreVersion.java +++ b/core/java/src/net/i2p/CoreVersion.java @@ -14,8 +14,8 @@ package net.i2p; * */ public class CoreVersion { - public final static String ID = "$Revision: 1.19 $ $Date: 2004/09/03 14:46:07 $"; - public final static String VERSION = "0.4.0.1"; + public final static String ID = "$Revision: 1.20 $ $Date: 2004/09/08 21:26:42 $"; + public final static String VERSION = "0.4.1"; public static void main(String args[]) { System.out.println("I2P Core version: " + VERSION); diff --git a/history.txt b/history.txt index 4a2fba9ee..8f326cfbc 100644 --- a/history.txt +++ b/history.txt @@ -1,9 +1,14 @@ -$Id: history.txt,v 1.22 2004/09/29 14:34:02 jrandom Exp $ +$Id: history.txt,v 1.23 2004/09/30 01:57:22 jrandom Exp $ + +* 2004-09-30 0.4.1 released (not backwards compatible) 2004-09-30 jrandom * Bundle the configuration necessary to run an eepsite out of the box with Jetty - simply edit ./eepsite/docroot/index.html and give people the key listed on the I2PTunnel configuration page, and its up. + * Router console cleanup, and some (off by default) tunnels - + smtp.postman.i2p (port 7659), pop.postman.i2p (port 7660), and + irc.baffled.i2p (port 7661) 2004-09-29 jrandom * Always wipe the Jetty work directory on startup, so that web updates diff --git a/installer/resources/i2ptunnel.config b/installer/resources/i2ptunnel.config index 86d624e91..74bc1a67f 100644 --- a/installer/resources/i2ptunnel.config +++ b/installer/resources/i2ptunnel.config @@ -48,4 +48,43 @@ tunnel.3.i2cpHost=localhost tunnel.3.i2cpPort=7654 tunnel.3.option.tunnels.depthInbound=2 tunnel.3.option.tunnels.numInbound=2 -tunnel.3.startOnLoad=true \ No newline at end of file +tunnel.3.startOnLoad=true + +# postman's SMTP server - see www.postman.i2p +tunnel.4.description=smtp server +tunnel.4.i2cpHost=localhost +tunnel.4.i2cpPort=7654 +tunnel.4.interface=127.0.0.1 +tunnel.4.listenPort=7659 +tunnel.4.name=smtp.postman.i2p +tunnel.4.option.tunnels.depthInbound=2 +tunnel.4.option.tunnels.numInbound=2 +tunnel.4.startOnLoad=false +tunnel.4.targetDestination=smtp.postman.i2p +tunnel.4.type=client + +# postman's POP3 server - see www.postman.i2p +tunnel.5.name=pop3.postman.i2p +tunnel.5.description=pop3 server +tunnel.5.i2cpHost=localhost +tunnel.5.i2cpPort=7654 +tunnel.5.interface=127.0.0.1 +tunnel.5.listenPort=7660 +tunnel.5.option.tunnels.depthInbound=2 +tunnel.5.option.tunnels.numInbound=2 +tunnel.5.startOnLoad=false +tunnel.5.targetDestination=pop.postman.i2p +tunnel.5.type=client + +# another irc server, linked with irc.duck.i2p and IIP +tunnel.6.description=irc.baffled.i2p +tunnel.6.i2cpHost=localhost +tunnel.6.i2cpPort=7654 +tunnel.6.interface=localhost +tunnel.6.listenPort=7661 +tunnel.6.name=irc.baffled.i2p +tunnel.6.option.tunnels.depthInbound=2 +tunnel.6.option.tunnels.numInbound=2 +tunnel.6.startOnLoad=false +tunnel.6.targetDestination=irc.baffled.i2p +tunnel.6.type=client diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 4f1475e92..2890abdce 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.32 $ $Date: 2004/09/21 19:10:26 $"; - public final static String VERSION = "0.4.0.1"; - public final static long BUILD = 4; + public final static String ID = "$Revision: 1.33 $ $Date: 2004/09/26 10:16:44 $"; + public final static String VERSION = "0.4.1"; + public final static long BUILD = 0; public static void main(String args[]) { System.out.println("I2P Router version: " + VERSION); System.out.println("Router ID: " + RouterVersion.ID);