* Update versions, package release

to branch 'i2p.i2p' (head efebdaa0f53b9bc0234d18a7a934cc0f4fa6231e)

LICENSE.txt

@@ -0,0 +1,183 @@
+This product includes both public domain code and licensed code as described below.
+For all code, unless otherwise stated in the appropriate license, the following applies:
+
+
+			    NO WARRANTY
+
+  BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+
+
+LICENSES
+--------
+
+Core:
+Public domain except as listed below:
+
+   ElGamal and DSA code:
+   Copyright (c) 2003, TheCrypto
+   See licenses/LICENSE-ElGamalDSA.txt
+
+   SHA256 and HMAC-SHA256:
+   Copyright (c) 2000 - 2004 The Legion Of The Bouncy Castle
+   See licenses/LICENSE-SHA256.txt
+
+   AES code:
+   Under the Cryptix (MIT) license, written by the Cryptix team
+   (That's what our website says but all our AES code looks like it is public domain)
+
+   Crypto filters:
+   From the xlattice app - http://xlattice.sourceforge.net/
+   See licenses/LICENSE-BSD.txt
+
+   SNTP code:
+   Copyright (c) 2004, Adam Buckley
+   See licenses/LICENSE-SNTP.txt
+
+   PRNG:
+   Copyright (C) 2001, 2002, Free Software Foundation, Inc.
+   See licenses/LICENSE-LGPLv2.1.txt
+
+   GMP 4.1.3:
+   Copyright 1991, 1996, 1999, 2000 Free Software Foundation, Inc.
+   See licenses/LICENSE-LGPLv2.1.txt
+
+   HashCash code:
+   Copyright 2006 Gregory Rubin grrubin@gmail.com
+   See licenses/LICENSE-HashCash.txt
+
+
+
+Router:
+Public domain
+
+
+
+Installer:
+   Launch4j:
+   Copyright (C) 2005 Grzegorz Kowal
+   See licenses/LICENSE-GPLv2.txt
+
+   Izpack:
+   See licenses/LICENSE-Apache1.1.txt
+
+
+
+Wrapper:
+Copyright (c) 1999, 2004 Tanuki Software
+See licenses/LICENSE-Wrapper.txt
+
+
+
+Applications:
+
+   Addressbook:
+   Copyright (c) 2004 Ragnarok
+   See licenses/LICENSE-Addressbook.txt
+
+   BOB:
+   Copyright (C) sponge
+   DWTFYWTPL
+
+   I2PSnark:
+   Copyright (C) 2003 Mark J. Wielaard
+   See licenses/LICENSE-GPLv2.txt
+
+   I2PTunnel:
+   (c) 2003 - 2004 mihi
+   GPLv2 with exception.
+   See licenses/LICENSE-I2PTunnel.txt
+   See licenses/LICENSE-GPLv2.txt
+
+   I2PTunnel SOCKS Proxy:
+   Copyright (c) 2004 by human
+   GPLv2 with exception.
+   See licenses/LICENSE-I2PTunnel.txt
+   See licenses/LICENSE-GPLv2.txt
+
+   I2PTunnel UDP and Streamr:
+   By welterde.
+   See licenses/LICENSE-GPLv2.txt
+
+   Jetty 5.1.12:
+   Copyright 2000-2004 Mort Bay Consulting Pty. Ltd.
+   See licenses/LICENSE-Apache1.1.txt
+   See licenses/LICENSE-Apache2.0.txt
+   See licenses/NOTICE-Ant.txt
+   See licenses/NOTICE-Commons-Logging.txt
+
+   JRobin 1.4.0:
+   See licenses/LICENSE-LGPLv2.1.txt
+
+   Ministreaming Lib:
+   By mihi.
+   See licenses/LICENSE-BSD.txt
+
+   Proxyscript:
+   By Cervantes.
+   Public domain.
+
+   Router console:
+   Public domain.
+
+   SAM:
+   Public domain.
+
+   Streaming Lib:
+   Public domain.
+
+   SusiDNS:
+   Copyright (C) 2005 <susi23@mail.i2p>
+   See licenses/LICENSE-GPLv2.txt
+
+   SusiMail:
+   Copyright (C) 2004-2005  <susi23@mail.i2p>
+   See licenses/LICENSE-GPLv2.txt
+
+   Systray:
+   Public domain.
+      Bundles systray4j code:
+      See licenses/LICENSE-GPLv2.txt
+
+
+
+Other Applications and Libraries
+--------------------------------
+The following applications and libraries are not used or bundled in
+binary packages, therefore the licenses are not included in binary
+distributions. See the source package for the additional license information.
+
+   Atalk:
+   Public domain
+
+   SAM C Library:
+   Copyright (c) 2004, Matthew P. Cashdollar <mpc@innographx.com>
+   See apps/sam/c/doc/license.txt
+
+   SAM C# Library:
+   Public domain.
+   See apps/sam/csharp/README
+
+   SAM Perl Library:
+   See licenses/LICENSE-GPLv2.txt
+
+   SAM Python Library:
+   Public domain.

README.txt

@@ -0,0 +1,29 @@
+Prerequisites to build from source:
+	Java SDK (preferably Sun) 1.5.0 or higher (1.6 recommended)
+	Apache Ant 1.7.0 or higher
+
+To build:
+	ant pkg
+	Run 'ant' with no arguments to see other build options.
+	See http://www.i2p2.de/download.html for installation instructions.
+
+Documentation:
+	http://www.i2p2.de/
+	API: run 'ant javadoc' then start at build/javadoc/index.html
+
+Latest release:
+	http://www.i2p2.de/download.html
+
+To get development branch from source control:
+	http://www.i2p2.de/newdevelopers.html
+
+FAQ:
+	http://www.i2p2.de/faq.html
+
+Need help?
+	IRC irc.freenode.net #i2p
+	http://forum.i2p2.de/
+
+Licenses:
+	See LICENSE.txt
+

Slackware/README

@@ -0,0 +1,30 @@
+ou will need atleast monotone > = 0.41 to get the most recent build source
+and connect it to an already running i2p router.
+
+OR:
+
+You may download the actual "stable" source from
+http://code.google.com/p/i2p/downloads/list
+
+You will need to follwing tools to build the i2p and i2p-base packages:
+
+bash >= 3.1.017
+requiredbuilder >= 0.16.3 ( http://www.stabellini.net/requiredbuilder.html )
+jre >= 6u11
+jdk >= 6u11
+apache-ant >= 1.7.1
+perl >= 5.10.0
+python >= 2.5.2
+
+Reccomended:
+monotone >= 0.41 ( http://pkgs.dr.ea.ms )
+
+See also:
+
+i2p/readme.txt
+
+AND
+
+i2p-base/readme.txt
+
+for information and handy tips.

Slackware/i2p-base/build.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project basedir="." default="slackpkg">
+    <target name="slackpkg">
+        <echo message="Building Slackware package." />
+        <exec executable="./i2p-base.SlackBuild">
+        </exec>
+    </target>
+</project>

Slackware/i2p-base/doinst.sh

@@ -0,0 +1,45 @@
+#!/bin/sh
+touch /etc/rc.d/rc.local
+touch /etc/rc.d/rc.local_shutdown
+
+I2PRCA=`grep -c /etc/rc.d/rc.local -e i2p`
+I2PRCB=`grep -c /etc/rc.d/rc.local_shutdown -e i2p`
+
+echo
+
+if [ $I2PRCA -eq 0 ] ; then
+	echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local
+	echo "        sh /etc/rc.d/rc.i2p start" >> /etc/rc.d/rc.local
+	echo "fi" >> /etc/rc.d/rc.local
+	echo "/etc/rc.d/rc.local modified."
+else
+	echo "/etc/rc.d/rc.local looks OK"
+fi
+
+if [ $I2PRCB -eq 0 ] ; then
+	echo "if [ -x /etc/rc.d/rc.i2p ] ; then" >> /etc/rc.d/rc.local_shutdown
+	echo "        sh /etc/rc.d/rc.i2p stop" >> /etc/rc.d/rc.local_shutdown
+	echo "fi" >> /etc/rc.d/rc.local_shutdown
+	echo "/etc/rc.d/rc.local_shutdown modified."
+else
+	echo "/etc/rc.d/rc.local_shutdown looks OK"
+fi
+
+if [ -f /etc/rc.d/rc.i2p ] ; then
+	if [ -x /etc/rc.d/rc.i2p ] ; then
+		chmod +x /etc/rc.d/rc.i2p.new
+	fi
+	echo
+	echo "It apears that you already have /etc/rc.d/rc.i2p"
+	echo "You may wish to replace it with /etc/rc.d/rc.i2p.new"
+	echo 
+else
+	mv /etc/rc.d/rc.i2p.new /etc/rc.d/rc.i2p
+	echo
+	echo "Installation finished. The i2p start/stop script has been"
+	echo "installed on /etc/rc.d directory. You should chmod +x"
+	echo '/etc/rc.d/rc.i2p to start it on boot.'
+	echo
+fi
+
+exit

Slackware/i2p-base/i2p-base.SlackBuild

@@ -0,0 +1,42 @@
+#!/bin/sh
+# Heavily based on the Slackware 12.1 SlackBuild
+# Slackware build script for i2p
+
+# PLEASE READ THIS:
+# Probably you will never have to update i2p packages with upgradepkg,
+# just because i2p have an auto-update function.
+# How to start i2p:
+# After installpkg command, doinst.sh will execute a postinstallation script
+# needed by i2p. After that you have to chmod +x /etc/rc.d/rc.i2p and start
+# i2p service with /etc/rc.d/rc.i2p start.
+# Now tell your browser to user this proxy: localhost on port 4444 and open
+# this page: http://localhost:7657/index.jsp
+# Here you can configure i2p, watch network status and navigate anonimously.
+# It's suggested to subscribe to various dns host, like i2host.i2p
+# For any additional information, visit i2host.i2p and forum.i2p
+
+CWD=$(pwd)
+TMP=/tmp
+PKG=/$TMP/package-base-i2p
+rm -rf $PKG
+mkdir -p $PKG
+# put here installation dir, without first and last /
+# es: usr/local
+NAME=i2p-base
+VERSION=0.0.1
+BUILD=1sim
+ARCH=noarch
+INSTALL_DIR=opt
+cd $PKG
+chown -R root:root .
+
+mkdir -p $PKG/etc/rc.d
+mkdir -p $PKG/install
+sed "s|directory|/$INSTALL_DIR/i2p/i2prouter|g" $CWD/rc.i2p_def > $PKG/etc/rc.d/rc.i2p.new
+chmod 644 $PKG/etc/rc.d/rc.i2p.new
+sed "s|directory|/$INSTALL_DIR/i2p/|g" $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+
+cd $PKG
+requiredbuilder -v -y -s $CWD $PKG
+makepkg -l y -c n $CWD/${NAME}-$VERSION-$ARCH-$BUILD.tgz

Slackware/i2p-base/rc.i2p_def

@@ -0,0 +1,27 @@
+#!/bin/sh
+# Start/stop i2p service.
+
+i2p_start() {
+ /bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory start )"
+}
+
+i2p_stop() {
+ /bin/su - -c "( export PATH=\"$PATH:/usr/lib/java/bin:/usr/lib/java/jre/bin\"; directory stop )"
+}
+
+case "$1" in
+'start')
+  i2p_start
+  ;;
+'stop')
+  i2p_stop
+  ;;
+'restart')
+  i2p_stop
+  i2p_start
+  ;;
+*)
+  echo "usage $0 start|stop|restart"
+  ;;
+esac
+

Slackware/i2p-base/readme.txt

@@ -0,0 +1,10 @@
+An rc file called rc.i2p has been placed into the /etc/rc.d directory.
+If you want to change installation dir, change the variable INSTALL_DIR
+on base-i2p.SlackBuild and rebuild the package. You also will need to do the
+same for the i2p package.
+
+The install script will insert everything needed into /etc/rc.d/rc.local and
+into /etc/rc.d/rc.local_shutdown automatically.
+
+If you want to start I2P at boot you have to chmod +x /etc/rc.d/rc.i2p
+

Slackware/i2p-base/slack-desc

@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
+
+        |-----handy-ruler------------------------------------------------------|
+base-i2p: base-i2p (I2P anonymizing network base config files)
+base-i2p:
+base-i2p: I2P is an anonymizing network, offering a simple layer that
+base-i2p: identity-sensitive applications can use to securely communicate. All
+base-i2p: data is wrapped with several layers of encryption, and the network is
+base-i2p: both distributed and dynamic, with no trusted parties.
+base-i2p: Many applications are available that interface with I2P, including 
+base-i2p: mail, peer-peer file sharing, IRC chat, and others.
+base-i2p:
+base-i2p: This package provides the startup files.
+base-i2p:

Slackware/i2p-base/slack-required

@@ -0,0 +1 @@
+bash >= 3.1.017

Slackware/i2p/build.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<project basedir="." default="slackpkg">
+    <target name="slackpkg">
+        <echo message="Building Slackware package." />
+        <exec executable="./i2p.SlackBuild">
+        </exec>
+    </target>
+</project>

Slackware/i2p/doinst.sh

@@ -0,0 +1,67 @@
+#!/bin/sh
+
+INST_DIR=directory
+
+( cd install
+
+echo
+for i in *.config ; {
+	if [ -f $INST_DIR/$i ] ; then
+		echo "Please check ${INST_DIR}${i}, as there is a new version."
+		cp $i $INST_DIR/$i.new
+	else
+		cp $i $INST_DIR/$i
+	fi
+}
+
+)
+
+( cd $INST_DIR
+	if [ -f blocklist.txt ] ; then
+		echo "Please check ${INST_DIR}blocklist.txt, as there is a new version."
+	else
+		mv blocklist.txt.new blocklist.txt
+	fi
+)
+
+( cd $INST_DIR/eepsite
+	if [ -f jetty.xml ] ; then
+		rm jetty.xml.new
+	else
+		mv jetty.xml.new jetty.xml
+	fi
+)
+
+( cd $INST_DIR/eepsite/docroot
+	if [ -f index.html ] ; then
+		rm index.html.new
+	else
+		mv index.html.new index.html
+	fi
+	if [ -f favicon.ico ] ; then
+		rm favicon.ico.new
+	else
+		mv favicon.ico.new favicon.ico
+	fi
+)
+
+echo
+echo "FINISHING I2P INSTALLATION. PLEASE WAIT."
+
+cd $INST_DIR
+sh postinstall.sh || (
+  echo "ERROR: failed execution of postinstall.sh. Please"
+  echo "cd into i2p installation directory and run "
+  echo "postinstall.sh manually with ./postinstall.sh"
+  exit 1
+)
+
+sleep 10
+
+sh i2prouter stop || exit 1
+
+echo
+echo "Installation finished."
+echo
+
+exit

Slackware/i2p/i2p.SlackBuild

@@ -0,0 +1,88 @@
+#!/bin/sh
+# Heavily based on the Slackware 12.1 SlackBuild
+# Slackware build script for i2p
+
+# PLEASE READ THIS:
+# Probably you will never have to update i2p packages with upgradepkg,
+# just because i2p have an auto-update function.
+# How to start i2p:
+# After installpkg command, doinst.sh will execute a postinstallation script
+# needed by i2p. After that you have to chmod +x /etc/rc.d/rc.i2p and start
+# i2p service with /etc/rc.d/rc.i2p start.
+# Now tell your browser to user this proxy: localhost on port 4444 and open
+# this page: http://localhost:7657/index.jsp
+# Here you can configure i2p, watch network status and navigate anonimously.
+# It's suggested to subscribe to various dns host, like i2host.i2p
+# For any additional information, visit i2host.i2p and forum.i2p
+
+BUILD=1sim
+
+# put here installation dir, without first and last /
+# es: usr/local
+INSTALL_DIR=opt
+NAME=i2p
+ARCH=noarch
+
+
+#
+# This mess is here due to the totally moronic way i2p does versioning.
+# We correct it here.
+#
+ROUTER=$(echo -ne "_")$(cat ../../router/java/src/net/i2p/router/RouterVersion.java | grep -e "public final static long BUILD" | cut -f2 -d"=" | cut -f1 -d";" | sed -re "s/ //g")
+if [ "$ROUTER" == "_" ] ;  then
+	ROUTER="_0"
+fi
+
+#
+# That was the easy one, now for the tough one.
+#
+
+CORE=$(cat ../../core/java/src/net/i2p/CoreVersion.java | grep -e "public final static String VERSION" | cut -f2 -d'"' | sed -re "s/ //g")
+CORE1=$(echo -n $CORE.x.x | sed -re "s/(.*)\.(.*)\.(.*)\.(.*)/\1/")
+CORE2=$(echo -n $CORE.x | sed -re "s/(.*)\.(.*)\.(.*)\.(.*)/\1/")
+
+if [ "$CORE.x.x" == "$CORE1" ] ; then
+	CORE=$(echo -ne $CORE".0.0")
+fi
+if [ "$CORE.x" == "$CORE2" ] ; then
+	CORE=$(echo -ne $CORE".0")
+fi
+
+VERSION=$(echo $CORE$ROUTER)
+#
+# Whew!
+# OK, let's build i2p
+#
+
+CWD=$(pwd)
+TMP=/tmp
+
+PKG=$TMP/package-i2p
+rm -rf $PKG
+mkdir -p $PKG
+
+cd $CWD/../../
+
+ant distclean
+ant dist
+
+
+tar xjvf i2p.tar.bz2 -C $TMP
+
+cd $TMP/i2p
+chown -R root:root .
+
+mkdir -p $PKG/$INSTALL_DIR/
+cp -a ../i2p $PKG/$INSTALL_DIR/
+
+mkdir -p $PKG/install
+mv $PKG/$INSTALL_DIR/i2p/*.config $PKG/install
+mv $PKG/$INSTALL_DIR/i2p/blocklist.txt $PKG/$INSTALL_DIR/i2p/blocklist.txt.new
+mv $PKG/$INSTALL_DIR/i2p/eepsite/jetty.xml $PKG/$INSTALL_DIR/i2p/eepsite/jetty.xml.new
+mv $PKG/$INSTALL_DIR/i2p/eepsite/docroot/index.html $PKG/$INSTALL_DIR/i2p/eepsite/docroot/index.html.new
+mv $PKG/$INSTALL_DIR/i2p/eepsite/docroot/favicon.ico $PKG/$INSTALL_DIR/i2p/eepsite/docroot/favicon.ico.new
+sed "s|directory|/$INSTALL_DIR/i2p/|g" $CWD/doinst.sh > $PKG/install/doinst.sh
+cat $CWD/slack-desc > $PKG/install/slack-desc
+cd $PKG
+requiredbuilder -v -y -s $CWD $PKG
+makepkg -l y -c n $CWD/${NAME}-$VERSION-$ARCH-$BUILD.tgz

Slackware/i2p/readme.txt

@@ -0,0 +1,47 @@
+Building:
+The i2p package will be installed in /opt/i2p 
+
+If you want to change installation dir, change the variable INSTALL_DIR
+on i2p.SlackBuild and rebuild the package. You will also need to do the same
+in the base-i2p package.
+
+Installation and Upgrade:
+Probably you will never have to update i2p packages. However if you do,
+be sure to installpkg first, then removepkg or custom config files can
+be lost with upgradepkg. I2P has an auto-update function. However using
+installpkg then removepkg lowers the demand on the I2P network as a 
+whole, and is by far faster.
+
+After installpkg command, doinst.sh will execute a postinstallation script
+needed by I2P.  Be sure to also install the base-i2p package.
+
+Optional:
+
+chmod +x /etc/rc.d/rc.i2p only if you want it to start on boot and stop on
+shutdown.
+
+How to start I2P:
+
+Start I2P service with-
+sh /etc/rc.d/rc.i2p start
+
+Now tell your browser to user this proxy: localhost on port 4444 and open
+this page: http://localhost:7657/index.jsp
+Here you can configure I2P, watch network status and navigate anonimously.
+It's suggested to subscribe to various addressbook hosts so that you can
+get to the many available eepsites and other service on I2P. These are not
+set up by default for security reasons. 
+
+Please see the faqs on http://www.i2p2.i2p/ or http://www.i2p2.de/ on how
+to subscribe to the various addressbook services.
+
+To stop I2P:
+ /etc/rc.d/rc.i2p stop
+
+
+For any additional information:
+
+Within I2P- http://www.i2p2.i2p/, http://forum.i2p/, http://zzz.i2p
+
+Internet (not reccomended!) - http://www.i2p2.de/, http://forum.i2p2.de/
+

Slackware/i2p/slack-desc

@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|' on
+# the right side marks the last column you can put a character in.  You must make
+# exactly 11 lines for the formatting to be correct.  It's also customary to
+# leave one space after the ':'.
+
+   |-----handy-ruler----------------------------------------------------------|
+i2p: i2p (an anonymizing network)
+i2p:
+i2p: I2P is an anonymizing network, offering a simple layer that
+i2p: identity-sensitive applications can use to securely communicate. All
+i2p: data is wrapped with several layers of encryption, and the network is
+i2p: both distributed and dynamic, with no trusted parties.
+i2p: Many applications are available that interface with I2P, including 
+i2p: mail, peer-peer file sharing, IRC chat, and others.
+i2p: WARNING: To upgrade installpkg FIRST _THEN_ removepkg.
+i2p: For more information, see:  http://www.i2p2.de/
+i2p:

Slackware/i2p/slack-required

@@ -0,0 +1,2 @@
+glibc >= 2.7-i486-17 | glibc-solibs >= 2.7-i486-17
+perl >= 5.10.0-i486-1

apps/BOB/src/net/i2p/BOB/BOB.java

@@ -34,7 +34,6 @@ import java.util.Properties;
 import net.i2p.client.I2PClient;
 import net.i2p.client.streaming.RetransmissionTimer;
 import net.i2p.util.Log;
-import net.i2p.util.SimpleTimer;
 /**
  * <span style="font-size:8px;font-family:courier;color:#EEEEEE;background-color:#000000">
  * ################################################################################<br>
@@ -162,7 +161,7 @@ public class BOB {
 		String configLocation = System.getProperty(PROP_CONFIG_LOCATION, "bob.config");
 
 		// This is here just to ensure there is no interference with our threadgroups.
-		SimpleTimer Y = RetransmissionTimer.getInstance();
+		RetransmissionTimer Y = RetransmissionTimer.getInstance();
 		i = Y.hashCode();
 		{
 			try {
@@ -217,6 +216,7 @@ public class BOB {
 			}
 		}
 
+		i = 0;
 		try {
 			info("BOB is now running.");
 			ServerSocket listener = new ServerSocket(Integer.parseInt(props.getProperty(PROP_BOB_PORT)), 10, InetAddress.getByName(props.getProperty(PROP_BOB_HOST)));

apps/BOB/src/net/i2p/BOB/DoCMDS.java

@@ -46,7 +46,7 @@ public class DoCMDS implements Runnable {
 
 	// FIX ME
 	// I need a better way to do versioning, but this will do for now.
-	public static final String BMAJ = "00",  BMIN = "00",  BREV = "03",  BEXT = "";
+	public static final String BMAJ = "00",  BMIN = "00",  BREV = "04",  BEXT = "";
 	public static final String BOBversion = BMAJ + "." + BMIN + "." + BREV + BEXT;
 	private Socket server;
 	private Properties props;

apps/BOB/src/net/i2p/BOB/I2Plistener.java

@@ -70,7 +70,7 @@ public class I2Plistener implements Runnable {
 		boolean g = false;
 		I2PSocket sessSocket = null;
 
-		serverSocket.setSoTimeout(100);
+		serverSocket.setSoTimeout(50);
 		database.getReadLock();
 		info.getReadLock();
 		if(info.exists("INPORT")) {

apps/BOB/src/net/i2p/BOB/MUXlisten.java

@@ -173,7 +173,7 @@ die:                            {
 					boolean spin = true;
 					while(spin) {
 						try {
-							Thread.sleep(1000); //sleep for 1000 ms (One second)
+							Thread.sleep(200); //sleep for 200 ms (Two thenths second)
 						} catch(InterruptedException e) {
 							// nop
 						}
@@ -213,14 +213,21 @@ die:                            {
 					}
 				} // die
 
+				try {
+					Thread.sleep(500); //sleep for 500 ms (One half second)
+				} catch(InterruptedException ex) {
+					// nop
+				}
 				// wait for child threads and thread groups to die
 				// System.out.println("MUXlisten: waiting for children");
-				while(tg.activeCount() + tg.activeGroupCount() != 0) {
+				if(tg.activeCount() + tg.activeGroupCount() != 0) {
 					tg.interrupt(); // unwedge any blocking threads.
-					try {
-						Thread.sleep(100); //sleep for 100 ms (One tenth second)
-					} catch(InterruptedException ex) {
-						// nop
+					while(tg.activeCount() + tg.activeGroupCount() != 0) {
+						try {
+							Thread.sleep(100); //sleep for 100 ms (One tenth second)
+						} catch(InterruptedException ex) {
+							// nop
+						}
 					}
 				}
 				tg.destroy();
@@ -260,17 +267,33 @@ die:                            {
 		}
 		// This is here to catch when something fucks up REALLY bad.
 		if(tg != null) {
-			while(tg.activeCount() + tg.activeGroupCount() != 0) {
+			if(tg.activeCount() + tg.activeGroupCount() != 0) {
 					tg.interrupt(); // unwedge any blocking threads.
+				while(tg.activeCount() + tg.activeGroupCount() != 0) {
 					try {
 						Thread.sleep(100); //sleep for 100 ms (One tenth second)
 					} catch(InterruptedException ex) {
 						// nop
 					}
+				}
 			}
 			tg.destroy();
 			// Zap reference to the ThreadGroup so the JVM can GC it.
 			tg = null;
 		}
+
+		// Lastly try to close things again.
+		if(this.come_in) {
+			try {
+				listener.close();
+			} catch(IOException e) {
+			}
+		}
+		try {
+			socketManager.destroySocketManager();
+		} catch(Exception e) {
+			// nop
+		}
+
 	}
 }

apps/BOB/src/net/i2p/BOB/Main.java

@@ -24,7 +24,6 @@
 package net.i2p.BOB;
 
 import net.i2p.client.streaming.RetransmissionTimer;
-import net.i2p.util.SimpleTimer;
 
 /**
  * Start from command line
@@ -39,8 +38,8 @@ public class Main {
 	 */
 	public static void main(String[] args) {
 		// THINK THINK THINK THINK THINK THINK
-		SimpleTimer Y = RetransmissionTimer.getInstance();
+		RetransmissionTimer Y = RetransmissionTimer.getInstance();
 		BOB.main(args);
-		Y.removeSimpleTimer();
+		Y.stop();
 	}
 }

apps/BOB/src/net/i2p/BOB/TCPio.java

@@ -56,9 +56,28 @@ public class TCPio implements Runnable {
 	 * Copy from source to destination...
 	 * and yes, we are totally OK to block here on writes,
 	 * The OS has buffers, and I intend to use them.
+	 * We send an interrupt signal to the threadgroup to
+	 * unwedge any pending writes.
 	 *
 	 */
 	public void run() {
+		/*
+		 * NOTE:
+		 * The write method of OutputStream calls the write method of
+		 * one argument on each of the bytes to be written out.
+		 * Subclasses are encouraged to override this method and provide
+		 * a more efficient implementation.
+		 *
+		 * So, is this really a performance problem?
+		 * Should we expand to several bytes?
+		 * I don't believe there would be any gain, since read method
+		 * has the same reccomendations. If anyone has a better way to
+		 * do this, I'm interested in performance improvements.
+		 *
+		 * --Sponge
+		 *
+		 */
+
 		int b;
 		byte a[] = new byte[1];
 		boolean spin = true;

apps/BOB/src/net/i2p/BOB/TCPlistener.java

@@ -77,7 +77,7 @@ public class TCPlistener implements Runnable {
 		}
 		try {
 			Socket server = new Socket();
-			listener.setSoTimeout(1000);
+			listener.setSoTimeout(50); // Half of the expected time from MUXlisten
 			info.releaseReadLock();
 			database.releaseReadLock();
 			while(spin) {

apps/i2psnark/java/src/org/klomp/snark/ConnectionAcceptor.java

@@ -152,6 +152,7 @@ public class ConnectionAcceptor implements Runnable
             _util.debug("Error while accepting: " + ioe, Snark.ERROR);
             stop = true;
           }
+        // catch oom?
       }
 
     try

apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java

@@ -23,7 +23,9 @@ import net.i2p.data.DataFormatException;
 import net.i2p.data.Destination;
 import net.i2p.data.Hash;
 import net.i2p.util.EepGet;
+import net.i2p.util.FileUtil;
 import net.i2p.util.Log;
+import net.i2p.util.SimpleScheduler;
 import net.i2p.util.SimpleTimer;
 
 /**
@@ -48,6 +50,7 @@ public class I2PSnarkUtil {
     private int _maxUploaders;
     private int _maxUpBW;
     private int _maxConnections;
+    private File _tmpDir;
     
     public static final String PROP_USE_OPENTRACKERS = "i2psnark.useOpentrackers";
     public static final boolean DEFAULT_USE_OPENTRACKERS = true;
@@ -67,6 +70,12 @@ public class I2PSnarkUtil {
         _maxUploaders = Snark.MAX_TOTAL_UPLOADERS;
         _maxUpBW = DEFAULT_MAX_UP_BW;
         _maxConnections = MAX_CONNECTIONS;
+        // This is used for both announce replies and .torrent file downloads,
+        // so it must be available even if not connected to I2CP.
+        // so much for multiple instances
+        _tmpDir = new File("tmp", "i2psnark");
+        FileUtil.rmdir(_tmpDir, false);
+        _tmpDir.mkdirs();
     }
     
     /**
@@ -94,6 +103,7 @@ public class I2PSnarkUtil {
             _i2cpHost = i2cpHost;
         if (i2cpPort > 0)
             _i2cpPort = i2cpPort;
+        // can't remove any options this way...
         if (opts != null)
             _opts.putAll(opts);
         _configured = true;
@@ -166,6 +176,10 @@ public class I2PSnarkUtil {
         _manager = null;
         _shitlist.clear();
         mgr.destroySocketManager();
+        // this will delete a .torrent file d/l in progress so don't do that...
+        FileUtil.rmdir(_tmpDir, false);
+        // in case the user will d/l a .torrent file next...
+        _tmpDir.mkdirs();
     }
     
     /** connect to the given destination */
@@ -183,7 +197,7 @@ public class I2PSnarkUtil {
             synchronized (_shitlist) {
                 _shitlist.add(dest);
             }
-            SimpleTimer.getInstance().addEvent(new Unshitlist(dest), 10*60*1000);
+            SimpleScheduler.getInstance().addEvent(new Unshitlist(dest), 10*60*1000);
             throw new IOException("Unable to reach the peer " + peer + ": " + ie.getMessage());
         }
     }
@@ -204,7 +218,8 @@ public class I2PSnarkUtil {
         _log.debug("Fetching [" + url + "] proxy=" + _proxyHost + ":" + _proxyPort + ": " + _shouldProxy);
         File out = null;
         try {
-            out = File.createTempFile("i2psnark", "url", new File("."));
+            // we could use the system tmp dir but deleteOnExit() doesn't seem to work on all platforms...
+            out = File.createTempFile("i2psnark", null, _tmpDir);
         } catch (IOException ioe) {
             ioe.printStackTrace();
             if (out != null)

apps/i2psnark/java/src/org/klomp/snark/PeerConnectionOut.java

@@ -28,6 +28,7 @@ import java.util.List;
 
 import net.i2p.util.I2PAppThread;
 import net.i2p.util.Log;
+import net.i2p.util.SimpleScheduler;
 import net.i2p.util.SimpleTimer;
 
 class PeerConnectionOut implements Runnable
@@ -215,7 +216,7 @@ class PeerConnectionOut implements Runnable
   private void addMessage(Message m)
   {
     if (m.type == Message.PIECE)
-      SimpleTimer.getInstance().addEvent(new RemoveTooSlow(m), SEND_TIMEOUT);
+      SimpleScheduler.getInstance().addEvent(new RemoveTooSlow(m), SEND_TIMEOUT);
     synchronized(sendQueue)
       {
         sendQueue.add(m);

apps/i2psnark/java/src/org/klomp/snark/PeerState.java

@@ -60,7 +60,7 @@ class PeerState
   // If we have te resend outstanding requests (true after we got choked).
   private boolean resend = false;
 
-  private final static int MAX_PIPELINE = 2;               // this is for outbound requests
+  private final static int MAX_PIPELINE = 3;               // this is for outbound requests
   private final static int MAX_PIPELINE_BYTES = 128*1024;  // this is for inbound requests
   public final static int PARTSIZE = 32*1024; // Snark was 16K, i2p-bt uses 64KB
   private final static int MAX_PARTSIZE = 64*1024; // Don't let anybody request more than this

apps/i2psnark/java/src/org/klomp/snark/Snark.java

@@ -232,7 +232,7 @@ public class Snark
           }
         
         // Explicit shutdown.
-        Runtime.getRuntime().removeShutdownHook(snarkhook);
+        //Runtime.getRuntime().removeShutdownHook(snarkhook);
         snarkhook.start();
       }
   }

apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java

@@ -81,8 +81,7 @@ public class SnarkManager implements Snark.CompleteListener {
         I2PAppThread monitor = new I2PAppThread(new DirMonitor(), "Snark DirMonitor");
         monitor.setDaemon(true);
         monitor.start();
-        if (_context instanceof RouterContext)
-            ((RouterContext)_context).router().addShutdownTask(new SnarkManagerShutdown());
+        _context.addShutdownTask(new SnarkManagerShutdown());
     }
     
     /** hook to I2PSnarkUtil for the servlet */
@@ -141,7 +140,7 @@ public class SnarkManager implements Snark.CompleteListener {
         if (!_config.containsKey(PROP_I2CP_PORT))
             _config.setProperty(PROP_I2CP_PORT, "7654");
         if (!_config.containsKey(PROP_I2CP_OPTS))
-            _config.setProperty(PROP_I2CP_OPTS, "inbound.length=2 inbound.lengthVariance=0 outbound.length=2 outbound.lengthVariance=0");
+            _config.setProperty(PROP_I2CP_OPTS, "inbound.length=2 inbound.lengthVariance=0 outbound.length=2 outbound.lengthVariance=0 inbound.quantity=3 outbound.quantity=3");
         if (!_config.containsKey(PROP_EEP_HOST))
             _config.setProperty(PROP_EEP_HOST, "localhost");
         if (!_config.containsKey(PROP_EEP_PORT))
@@ -539,7 +538,7 @@ public class SnarkManager implements Snark.CompleteListener {
         String announce = info.getAnnounce();
         // basic validation of url
         if ((!announce.startsWith("http://")) ||
-            (announce.indexOf(".i2p/") < 0))
+            (announce.indexOf(".i2p/") < 0)) // need to do better than this
             return "Non-i2p tracker in " + info.getName() + ", deleting it";
         List files = info.getFiles();
         if ( (files != null) && (files.size() > MAX_FILES_PER_TORRENT) ) {

apps/i2psnark/java/src/org/klomp/snark/web/I2PSnarkServlet.java

@@ -63,7 +63,7 @@ public class I2PSnarkServlet extends HttpServlet {
         req.setCharacterEncoding("UTF-8");
         resp.setCharacterEncoding("UTF-8");
         resp.setContentType("text/html; charset=UTF-8");
-        long stats[] = {0,0,0,0};
+        long stats[] = {0,0,0,0,0};
         
         String nonce = req.getParameter("nonce");
         if ( (nonce != null) && (nonce.equals(String.valueOf(_nonce))) )
@@ -143,8 +143,10 @@ public class I2PSnarkServlet extends HttpServlet {
         if (snarks.size() <= 0) {
             out.write(TABLE_EMPTY);
         } else if (snarks.size() > 1) {
-            out.write(TABLE_TOTAL);
-            out.write("    <th align=\"right\" valign=\"top\">" + formatSize(stats[0]) + "</th>\n" +
+            out.write("<tfoot><tr>\n" +
+                      "    <th align=\"left\" valign=\"top\" colspan=\"2\">Totals (" + snarks.size() + " torrents, " + stats[4] + " connected peers)</th>\n" +
+                      "    <th>&nbsp;</th>\n" +
+                      "    <th align=\"right\" valign=\"top\">" + formatSize(stats[0]) + "</th>\n" +
                       "    <th align=\"right\" valign=\"top\">" + formatSize(stats[1]) + "</th>\n" +
                       "    <th align=\"right\" valign=\"top\">" + formatSize(stats[2]) + "ps</th>\n" +
                       "    <th align=\"right\" valign=\"top\">" + formatSize(stats[3]) + "ps</th>\n" +
@@ -200,10 +202,14 @@ public class I2PSnarkServlet extends HttpServlet {
                 } catch (IOException ioe) {
                     _log.warn("hrm: " + local, ioe);
                 }
-            } else if ( (newURL != null) && (newURL.trim().length() > "http://.i2p/".length()) ) {
-                _manager.addMessage("Fetching " + newURL);
-                I2PAppThread fetch = new I2PAppThread(new FetchAndAdd(_manager, newURL), "Fetch and add");
-                fetch.start();
+            } else if (newURL != null) {
+                if (newURL.startsWith("http://")) {
+                    _manager.addMessage("Fetching " + newURL);
+                    I2PAppThread fetch = new I2PAppThread(new FetchAndAdd(_manager, newURL), "Fetch and add");
+                    fetch.start();
+                } else {
+                    _manager.addMessage("Invalid URL - must start with http://");
+                }
             } else {
                 // no file or URL specified
             }
@@ -439,6 +445,7 @@ public class I2PSnarkServlet extends HttpServlet {
         if (snark.coordinator != null) {
             err = snark.coordinator.trackerProblems;
             curPeers = snark.coordinator.getPeerCount();
+            stats[4] += curPeers;
             knownPeers = snark.coordinator.trackerSeenPeers;
         }
         
@@ -577,10 +584,10 @@ public class I2PSnarkServlet extends HttpServlet {
                     client = "Azureus";
                 else if ("CwsL".equals(ch))
                     client = "I2PSnarkXL";
-                else if ("AUZV".equals(ch) || "AkZV".equals(ch) || "A0ZV".equals(ch))
+                else if ("ZV".equals(ch.substring(2,4)))
                     client = "Robert";
                 else
-                    client = "Unknown";
+                    client = "Unknown (" + ch + ')';
                 out.write("<font size=-1>" + client + "</font>&nbsp;&nbsp;<tt>" + peer.toString().substring(5, 9) + "</tt>");
                 if (showDebug)
                     out.write(" inactive " + (peer.getInactiveTime() / 1000) + "s");
@@ -641,7 +648,7 @@ public class I2PSnarkServlet extends HttpServlet {
     private void writeAddForm(PrintWriter out, HttpServletRequest req) throws IOException {
         String uri = req.getRequestURI();
         String newURL = req.getParameter("newURL");
-        if ( (newURL == null) || (newURL.trim().length() <= 0) ) newURL = "http://";
+        if ( (newURL == null) || (newURL.trim().length() <= 0) ) newURL = "";
         String newFile = req.getParameter("newFile");
         if ( (newFile == null) || (newFile.trim().length() <= 0) ) newFile = "";
         
@@ -769,7 +776,7 @@ public class I2PSnarkServlet extends HttpServlet {
             return bytes + "B";
         else if (bytes < 5*1024*1024)
             return ((bytes + 512)/1024) + "KB";
-        else if (bytes < 5*1024*1024*1024l)
+        else if (bytes < 10*1024*1024*1024l)
             return ((bytes + 512*1024)/(1024*1024)) + "MB";
         else
             return ((bytes + 512*1024*1024)/(1024*1024*1024)) + "GB";
@@ -858,11 +865,6 @@ public class I2PSnarkServlet extends HttpServlet {
                                                "    <th align=\"right\" valign=\"top\">Down Rate</th>\n" +
                                                "    <th align=\"right\" valign=\"top\">Up Rate</th>\n";
     
-    private static final String TABLE_TOTAL =  "<tfoot>\n" +
-                                               "<tr><th align=\"left\" valign=\"top\">Totals</th>\n" +
-                                               "    <th>&nbsp;</th>\n" +
-                                               "    <th>&nbsp;</th>\n";
-    
    private static final String TABLE_EMPTY  = "<tr class=\"snarkTorrentEven\">" +
                                               "<td class=\"snarkTorrentEven\" align=\"left\"" +
                                               "    valign=\"top\" colspan=\"8\">No torrents</td></tr>\n";

apps/i2ptunnel/java/build.xml

@@ -42,7 +42,7 @@
     </target>
     <target name="war" depends="precompilejsp"> 
         <war destfile="build/i2ptunnel.war" webxml="../jsp/web-out.xml"
-             basedir="../jsp/" excludes="web.xml, *.java, *.jsp">
+             basedir="../jsp/" excludes="web.xml, **/*.java, *.jsp">
         </war>
     </target>
     <target name="precompilejsp" unless="precompilejsp.uptodate">

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java

@@ -62,6 +62,8 @@ import net.i2p.data.DataFormatException;
 import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
 import net.i2p.i2ptunnel.socks.I2PSOCKSTunnel;
+import net.i2p.i2ptunnel.streamr.StreamrConsumer;
+import net.i2p.i2ptunnel.streamr.StreamrProducer;
 import net.i2p.util.EventDispatcher;
 import net.i2p.util.EventDispatcherImpl;
 import net.i2p.util.Log;
@@ -234,6 +236,8 @@ public class I2PTunnel implements Logging, EventDispatcher {
             runServer(args, l);
         } else if ("httpserver".equals(cmdname)) {
             runHttpServer(args, l);
+        } else if ("ircserver".equals(cmdname)) {
+            runIrcServer(args, l);
         } else if ("textserver".equals(cmdname)) {
             runTextServer(args, l);
         } else if ("client".equals(cmdname)) {
@@ -244,6 +248,12 @@ public class I2PTunnel implements Logging, EventDispatcher {
             runIrcClient(args, l);
         } else if ("sockstunnel".equals(cmdname)) {
             runSOCKSTunnel(args, l);
+        } else if ("connectclient".equals(cmdname)) {
+            runConnectClient(args, l);
+        } else if ("streamrclient".equals(cmdname)) {
+            runStreamrClient(args, l);
+        } else if ("streamrserver".equals(cmdname)) {
+            runStreamrServer(args, l);
         } else if ("config".equals(cmdname)) {
             runConfig(args, l);
         } else if ("listen_on".equals(cmdname)) {
@@ -296,6 +306,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
         l.log("client <port> <pubkey>[,<pubkey,...]|file:<pubkeyfile> [<sharedClient>]");
         l.log("ircclient <port> <pubkey>[,<pubkey,...]|file:<pubkeyfile> [<sharedClient>]");
         l.log("httpclient <port> [<sharedClient>] [<proxy>]");
+        l.log("connectclient <port> [<sharedClient>] [<proxy>]");
         l.log("lookup <name>");
         l.log("quit");
         l.log("close [forced] <jobnumber>|all");
@@ -380,6 +391,53 @@ public class I2PTunnel implements Logging, EventDispatcher {
         }
     }
 
+    /**
+     * Same args as runServer
+     * (we should stop duplicating all this code...)
+     */
+    public void runIrcServer(String args[], Logging l) {
+        if (args.length == 3) {
+            InetAddress serverHost = null;
+            int portNum = -1;
+            File privKeyFile = null;
+            try {
+                serverHost = InetAddress.getByName(args[0]);
+            } catch (UnknownHostException uhe) {
+                l.log("unknown host");
+                _log.error(getPrefix() + "Error resolving " + args[0], uhe);
+                notifyEvent("serverTaskId", Integer.valueOf(-1));
+                return;
+            }
+
+            try {
+                portNum = Integer.parseInt(args[1]);
+            } catch (NumberFormatException nfe) {
+                l.log("invalid port");
+                _log.error(getPrefix() + "Port specified is not valid: " + args[1], nfe);
+                notifyEvent("serverTaskId", Integer.valueOf(-1));
+                return;
+            }
+
+            privKeyFile = new File(args[2]);
+            if (!privKeyFile.canRead()) {
+                l.log("private key file does not exist");
+                _log.error(getPrefix() + "Private key file does not exist or is not readable: " + args[2]);
+                notifyEvent("serverTaskId", Integer.valueOf(-1));
+                return;
+            }
+            I2PTunnelServer serv = new I2PTunnelIRCServer(serverHost, portNum, privKeyFile, args[2], l, (EventDispatcher) this, this);
+            serv.setReadTimeout(readTimeout);
+            serv.startRunning();
+            addtask(serv);
+            notifyEvent("serverTaskId", Integer.valueOf(serv.getId()));
+            return;
+        } else {
+            l.log("server <host> <port> <privkeyfile>");
+            l.log("  creates a server that sends all incoming data\n" + "  of its destination to host:port.");
+            notifyEvent("serverTaskId", Integer.valueOf(-1));
+        }
+    }
+
     /**
      * Run the HTTP server pointing at the host and port specified using the private i2p
      * destination loaded from the specified file, replacing the HTTP headers
@@ -494,14 +552,14 @@ public class I2PTunnel implements Logging, EventDispatcher {
      * Integer port number if the client is listening
      * sharedClient parameter is a String "true" or "false"
      *
-     * @param args {portNumber, destinationBase64 or "file:filename"[, sharedClient]}
+     * @param args {portNumber, destinationBase64 or "file:filename"[, sharedClient [, privKeyFile]]}
      * @param l logger to receive events and output
      */
     public void runClient(String args[], Logging l) {
         boolean isShared = true;
-        if (args.length == 3)
+        if (args.length >= 3)
             isShared = Boolean.valueOf(args[2].trim()).booleanValue();
-        if ( (args.length == 2) || (args.length == 3) ) {
+        if (args.length >= 2) {
             int portNum = -1;
             try {
                 portNum = Integer.parseInt(args[0]);
@@ -514,7 +572,10 @@ public class I2PTunnel implements Logging, EventDispatcher {
             I2PTunnelTask task;
             ownDest = !isShared;
             try {
-                task = new I2PTunnelClient(portNum, args[1], l, ownDest, (EventDispatcher) this, this);
+                String privateKeyFile = null;
+                if (args.length >= 4)
+                    privateKeyFile = args[3];
+                task = new I2PTunnelClient(portNum, args[1], l, ownDest, (EventDispatcher) this, this, privateKeyFile);
                 addtask(task);
                 notifyEvent("clientTaskId", Integer.valueOf(task.getId()));
             } catch (IllegalArgumentException iae) {
@@ -523,7 +584,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 notifyEvent("clientTaskId", Integer.valueOf(-1));
             }
         } else {
-            l.log("client <port> <pubkey>[,<pubkey>]|file:<pubkeyfile>[ <sharedClient>]");
+            l.log("client <port> <pubkey>[,<pubkey>]|file:<pubkeyfile>[ <sharedClient>] [<privKeyFile>]");
             l.log("  creates a client that forwards port to the pubkey.\n"
                   + "  use 0 as port to get a free port assigned.  If you specify\n"
                   + "  a comma delimited list of pubkeys, it will rotate among them\n"
@@ -555,7 +616,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 return;
             }
             
-            String proxy = "squid.i2p";
+            String proxy = "";
             boolean isShared = true;
             if (args.length > 1) {
                 if ("true".equalsIgnoreCase(args[1].trim())) {
@@ -595,11 +656,66 @@ public class I2PTunnel implements Logging, EventDispatcher {
             l.log("  <sharedClient> (optional) indicates if this client shares tunnels with other clients (true of false)");
             l.log("  <proxy> (optional) indicates a proxy server to be used");
             l.log("  when trying to access an address out of the .i2p domain");
-            l.log("  (the default proxy is squid.i2p).");
             notifyEvent("httpclientTaskId", Integer.valueOf(-1));
         }
     }
 
+    /**
+     * Run a CONNECT client on the given port number 
+     *
+     * @param args {portNumber[, sharedClient][, proxy to be used for the WWW]}
+     * @param l logger to receive events and output
+     */
+    public void runConnectClient(String args[], Logging l) {
+        if (args.length >= 1 && args.length <= 3) {
+            int port = -1;
+            try {
+                port = Integer.parseInt(args[0]);
+            } catch (NumberFormatException nfe) {
+                _log.error(getPrefix() + "Port specified is not valid: " + args[0], nfe);
+                return;
+            }
+            
+            String proxy = "";
+            boolean isShared = true;
+            if (args.length > 1) {
+                if ("true".equalsIgnoreCase(args[1].trim())) {
+                    isShared = true;
+                    if (args.length == 3)
+                        proxy = args[2];
+                } else if ("false".equalsIgnoreCase(args[1].trim())) {
+                    _log.warn("args[1] == [" + args[1] + "] and rejected explicitly");
+                    isShared = false;
+                    if (args.length == 3)
+                        proxy = args[2];
+                } else if (args.length == 3) {
+                    isShared = false; // not "true"
+                    proxy = args[2];
+                    _log.warn("args[1] == [" + args[1] + "] but rejected");
+                } else {
+                    // isShared not specified, default to true
+                    isShared = true;
+                    proxy = args[1];
+                }
+            }
+
+            I2PTunnelTask task;
+            ownDest = !isShared;
+            try {
+                task = new I2PTunnelConnectClient(port, l, ownDest, proxy, (EventDispatcher) this, this);
+                addtask(task);
+            } catch (IllegalArgumentException iae) {
+                _log.error(getPrefix() + "Invalid I2PTunnel config to create an httpclient [" + host + ":"+ port + "]", iae);
+            }
+        } else {
+            l.log("connectclient <port> [<sharedClient>] [<proxy>]");
+            l.log("  creates a client that for SSL/HTTPS requests.");
+            l.log("  <sharedClient> (optional) indicates if this client shares tunnels with other clients (true of false)");
+            l.log("  <proxy> (optional) indicates a proxy server to be used");
+            l.log("  when trying to access an address out of the .i2p domain");
+        }
+    }
+
     /**
      * Run an IRC client on the given port number 
      *
@@ -607,11 +723,11 @@ public class I2PTunnel implements Logging, EventDispatcher {
      * Also sets "ircclientStatus" = "ok" or "error" after the client tunnel has started.
      * parameter sharedClient is a String, either "true" or "false"
      *
-     * @param args {portNumber,destinationBase64 or "file:filename" [, sharedClient]}
+     * @param args {portNumber,destinationBase64 or "file:filename" [, sharedClient [, privKeyFile]]}
      * @param l logger to receive events and output
      */
     public void runIrcClient(String args[], Logging l) {
-        if (args.length >= 2 && args.length <= 3) {
+        if (args.length >= 2) {
             int port = -1;
             try {
                 port = Integer.parseInt(args[0]);
@@ -638,7 +754,10 @@ public class I2PTunnel implements Logging, EventDispatcher {
             I2PTunnelTask task;
             ownDest = !isShared;
             try {
-                task = new I2PTunnelIRCClient(port, args[1],l, ownDest, (EventDispatcher) this, this);
+                String privateKeyFile = null;
+                if (args.length >= 4)
+                    privateKeyFile = args[3];
+                task = new I2PTunnelIRCClient(port, args[1], l, ownDest, (EventDispatcher) this, this, privateKeyFile);
                 addtask(task);
                 notifyEvent("ircclientTaskId", Integer.valueOf(task.getId()));
             } catch (IllegalArgumentException iae) {
@@ -647,7 +766,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 notifyEvent("ircclientTaskId", Integer.valueOf(-1));
             }
         } else {
-            l.log("ircclient <port> [<sharedClient>]");
+            l.log("ircclient <port> [<sharedClient> [<privKeyFile>]]");
             l.log("  creates a client that filter IRC protocol.");
             l.log("  <sharedClient> (optional) indicates if this client shares tunnels with other clients (true of false)");
             notifyEvent("ircclientTaskId", Integer.valueOf(-1));
@@ -662,7 +781,7 @@ public class I2PTunnel implements Logging, EventDispatcher {
      * "openSOCKSTunnelResult" = "ok" or "error" after the client tunnel has
      * started.
      *
-     * @param args {portNumber}
+     * @param args {portNumber [, sharedClient]}
      * @param l logger to receive events and output
      */
     public void runSOCKSTunnel(String args[], Logging l) {
@@ -677,6 +796,11 @@ public class I2PTunnel implements Logging, EventDispatcher {
                 return;
             }
 
+            boolean isShared = false;
+            if (args.length > 1)
+                isShared = "true".equalsIgnoreCase(args[1].trim());
+
+            ownDest = !isShared;
             I2PTunnelTask task;
             task = new I2PSOCKSTunnel(port, l, ownDest, (EventDispatcher) this, this);
             addtask(task);
@@ -688,6 +812,82 @@ public class I2PTunnel implements Logging, EventDispatcher {
         }
     }
 
+    /**
+     * Streamr client
+     *
+     * @param args {targethost, targetport, destinationString}
+     * @param l logger to receive events and output
+     */
+    public void runStreamrClient(String args[], Logging l) {
+        if (args.length == 3) {
+            InetAddress host;
+            try {
+                host = InetAddress.getByName(args[0]);
+            } catch (UnknownHostException uhe) {
+                l.log("unknown host");
+                _log.error(getPrefix() + "Error resolving " + args[0], uhe);
+                notifyEvent("streamrtunnelTaskId", Integer.valueOf(-1));
+                return;
+            }
+
+            int port = -1;
+            try {
+                port = Integer.parseInt(args[1]);
+            } catch (NumberFormatException nfe) {
+                l.log("invalid port");
+                _log.error(getPrefix() + "Port specified is not valid: " + args[0], nfe);
+                notifyEvent("streamrtunnelTaskId", Integer.valueOf(-1));
+                return;
+            }
+
+            StreamrConsumer task = new StreamrConsumer(host, port, args[2], l, (EventDispatcher) this, this);
+            task.startRunning();
+            addtask(task);
+            notifyEvent("streamrtunnelTaskId", Integer.valueOf(task.getId()));
+        } else {
+            l.log("streamrclient <host> <port> <destination>");
+            l.log("  creates a tunnel that receives streaming data.");
+            notifyEvent("streamrtunnelTaskId", Integer.valueOf(-1));
+        }
+    }
+
+    /**
+     * Streamr server
+     *
+     * @param args {port, privkeyfile}
+     * @param l logger to receive events and output
+     */
+    public void runStreamrServer(String args[], Logging l) {
+        if (args.length == 2) {
+            int port = -1;
+            try {
+                port = Integer.parseInt(args[0]);
+            } catch (NumberFormatException nfe) {
+                l.log("invalid port");
+                _log.error(getPrefix() + "Port specified is not valid: " + args[0], nfe);
+                notifyEvent("streamrtunnelTaskId", Integer.valueOf(-1));
+                return;
+            }
+
+            File privKeyFile = new File(args[1]);
+            if (!privKeyFile.canRead()) {
+                l.log("private key file does not exist");
+                _log.error(getPrefix() + "Private key file does not exist or is not readable: " + args[3]);
+                notifyEvent("serverTaskId", Integer.valueOf(-1));
+                return;
+            }
+
+            StreamrProducer task = new StreamrProducer(port, privKeyFile, args[1], l, (EventDispatcher) this, this);
+            task.startRunning();
+            addtask(task);
+            notifyEvent("streamrtunnelTaskId", Integer.valueOf(task.getId()));
+        } else {
+            l.log("streamrserver <port> <privkeyfile>");
+            l.log("  creates a tunnel that sends streaming data.");
+            notifyEvent("streamrtunnelTaskId", Integer.valueOf(-1));
+        }
+    }
+
     /**
      * Specify the i2cp host and port 
      *

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClient.java

@@ -31,8 +31,8 @@ public class I2PTunnelClient extends I2PTunnelClientBase {
      */
     public I2PTunnelClient(int localPort, String destinations, Logging l, 
                            boolean ownDest, EventDispatcher notifyThis, 
-                           I2PTunnel tunnel) throws IllegalArgumentException {
-        super(localPort, ownDest, l, notifyThis, "SynSender", tunnel);
+                           I2PTunnel tunnel, String pkf) throws IllegalArgumentException {
+        super(localPort, ownDest, l, notifyThis, "SynSender", tunnel, pkf);
 
         if (waitEventValue("openBaseClientResult").equals("error")) {
             notifyEvent("openClientResult", "error");

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java

@@ -3,6 +3,7 @@
  */
 package net.i2p.i2ptunnel;
 
+import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.net.ConnectException;
@@ -27,6 +28,7 @@ import net.i2p.data.Destination;
 import net.i2p.util.EventDispatcher;
 import net.i2p.util.I2PThread;
 import net.i2p.util.Log;
+import net.i2p.util.SimpleScheduler;
 import net.i2p.util.SimpleTimer;
 
 public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runnable {
@@ -58,6 +60,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
     private byte[] pubkey;
 
     private String handlerName;
+    private String privKeyFile;
 
     private Object conLock = new Object();
     
@@ -90,18 +93,28 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
     //    I2PTunnelClientBase(localPort, ownDest, l, (EventDispatcher)null);
     //}
 
+    public I2PTunnelClientBase(int localPort, boolean ownDest, Logging l, 
+                               EventDispatcher notifyThis, String handlerName, 
+                               I2PTunnel tunnel) throws IllegalArgumentException {
+        this(localPort, ownDest, l, notifyThis, handlerName, tunnel, null);
+    }
+
     /**
+     * @param privKeyFile null to generate a transient key
+     *
      * @throws IllegalArgumentException if the I2CP configuration is b0rked so
      *                                  badly that we cant create a socketManager
      */
     public I2PTunnelClientBase(int localPort, boolean ownDest, Logging l, 
                                EventDispatcher notifyThis, String handlerName, 
-                               I2PTunnel tunnel) throws IllegalArgumentException{
+                               I2PTunnel tunnel, String pkf) throws IllegalArgumentException{
         super(localPort + " (uninitialized)", notifyThis, tunnel);
         _clientId = ++__clientId;
         this.localPort = localPort;
         this.l = l;
         this.handlerName = handlerName + _clientId;
+        this.privKeyFile = pkf;
+
 
         _context = tunnel.getContext();
         _context.statManager().createRateStat("i2ptunnel.client.closeBacklog", "How many pending sockets remain when we close one due to backlog?", "I2PTunnel", new long[] { 60*1000, 10*60*1000, 60*60*1000 });
@@ -113,26 +126,28 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
         // be looked up
         tunnel.getClientOptions().setProperty("i2cp.dontPublishLeaseSet", "true");
         
-        while (sockMgr == null) {
-            synchronized (sockLock) {
-                if (ownDest) {
-                    sockMgr = buildSocketManager();
-                } else {
-                    sockMgr = getSocketManager();
+        boolean openNow = !Boolean.valueOf(tunnel.getClientOptions().getProperty("i2cp.delayOpen")).booleanValue();
+        if (openNow) {
+            while (sockMgr == null) {
+                synchronized (sockLock) {
+                    if (ownDest) {
+                        sockMgr = buildSocketManager();
+                    } else {
+                        sockMgr = getSocketManager();
+                    }
+                }
+                if (sockMgr == null) {
+                    _log.log(Log.CRIT, "Unable to create socket manager (our own? " + ownDest + ")");
+                    try { Thread.sleep(10*1000); } catch (InterruptedException ie) {}
                 }
             }
             if (sockMgr == null) {
-                _log.log(Log.CRIT, "Unable to create socket manager (our own? " + ownDest + ")");
-                try { Thread.sleep(10*1000); } catch (InterruptedException ie) {}
+                l.log("Invalid I2CP configuration");
+                throw new IllegalArgumentException("Socket manager could not be created");
             }
-        }
-        if (sockMgr == null) {
-            l.log("Invalid I2CP configuration");
-            throw new IllegalArgumentException("Socket manager could not be created");
-        }
-        l.log("I2P session created");
+            l.log("I2P session created");
 
-        getTunnel().addSession(sockMgr.getSession());
+        } // else delay creating session until createI2PSocket() is called
         
         Thread t = new I2PThread(this);
         t.setName("Client " + _clientId);
@@ -152,7 +167,10 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
         configurePool(tunnel);
         
         if (open && listenerReady) {
-            l.log("Ready! Port " + getLocalPort());
+            if (openNow)
+                l.log("Ready! Port " + getLocalPort());
+            else
+                l.log("Listening on port " + getLocalPort() + ", delaying tunnel open until required");
             notifyEvent("openBaseClientResult", "ok");
         } else {
             l.log("Error listening - please see the logs!");
@@ -194,28 +212,36 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
     private static I2PSocketManager socketManager;
 
     protected synchronized I2PSocketManager getSocketManager() {
-        return getSocketManager(getTunnel());
+        return getSocketManager(getTunnel(), this.privKeyFile);
     }
     protected static synchronized I2PSocketManager getSocketManager(I2PTunnel tunnel) {
+        return getSocketManager(tunnel, null);
+    }
+    protected static synchronized I2PSocketManager getSocketManager(I2PTunnel tunnel, String pkf) {
         if (socketManager != null) {
             I2PSession s = socketManager.getSession();
             if ( (s == null) || (s.isClosed()) ) {
                 _log.info("Building a new socket manager since the old one closed [s=" + s + "]");
-                socketManager = buildSocketManager(tunnel);
+                if (s != null)
+                    tunnel.removeSession(s);
+                socketManager = buildSocketManager(tunnel, pkf);
             } else {
                 _log.info("Not building a new socket manager since the old one is open [s=" + s + "]");
             }
         } else {
             _log.info("Building a new socket manager since there is no other one");
-            socketManager = buildSocketManager(tunnel);
+            socketManager = buildSocketManager(tunnel, pkf);
         }
         return socketManager;
     }
 
     protected I2PSocketManager buildSocketManager() {
-        return buildSocketManager(getTunnel());
+        return buildSocketManager(getTunnel(), this.privKeyFile);
     }
     protected static I2PSocketManager buildSocketManager(I2PTunnel tunnel) {
+        return buildSocketManager(tunnel, null);
+    }
+    protected static I2PSocketManager buildSocketManager(I2PTunnel tunnel, String pkf) {
         Properties props = new Properties();
         props.putAll(tunnel.getClientOptions());
         int portNum = 7654;
@@ -229,7 +255,22 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
         
         I2PSocketManager sockManager = null;
         while (sockManager == null) {
-            sockManager = I2PSocketManagerFactory.createManager(tunnel.host, portNum, props);
+            if (pkf != null) {
+                // Persistent client dest
+                FileInputStream fis = null;
+                try {
+                    fis = new FileInputStream(pkf);
+                    sockManager = I2PSocketManagerFactory.createManager(fis, tunnel.host, portNum, props);
+                } catch (IOException ioe) {
+                    _log.error("Error opening key file", ioe);
+                    // this is going to loop but if we break we'll get a NPE
+                } finally {
+                    if (fis != null)
+                        try { fis.close(); } catch (IOException ioe) {}
+                }
+            } else {
+                sockManager = I2PSocketManagerFactory.createManager(tunnel.host, portNum, props);
+            }
             
             if (sockManager == null) {
                 _log.log(Log.CRIT, "Unable to create socket manager");
@@ -301,6 +342,10 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
      * @return a new I2PSocket
      */
     public I2PSocket createI2PSocket(Destination dest) throws I2PException, ConnectException, NoRouteToHostException, InterruptedIOException {
+        if (sockMgr == null) {
+            // we need this before getDefaultOptions()
+            sockMgr = getSocketManager();
+        }
         return createI2PSocket(dest, getDefaultOptions());
     }
 
@@ -321,6 +366,19 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
     public I2PSocket createI2PSocket(Destination dest, I2PSocketOptions opt) throws I2PException, ConnectException, NoRouteToHostException, InterruptedIOException {
         I2PSocket i2ps;
 
+        if (sockMgr == null) {
+            // delayed open - call get instead of build because the locking is up there
+            sockMgr = getSocketManager();
+        } else if (Boolean.valueOf(getTunnel().getClientOptions().getProperty("i2cp.newDestOnResume")).booleanValue()) {
+            synchronized(sockMgr) {
+                I2PSocketManager oldSockMgr = sockMgr;
+                // This will build a new socket manager and a new dest if the session is closed.
+                sockMgr = getSocketManager();
+                if (oldSockMgr != sockMgr) {
+                    _log.warn("Built a new destination on resume");
+                }
+            }
+        }  // else the old socket manager will reconnect the old session if necessary
         i2ps = sockMgr.connect(dest, opt);
         synchronized (sockLock) {
             mySockets.add(i2ps);
@@ -373,8 +431,10 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
                 _context.statManager().addRateData("i2ptunnel.client.manageTime", total, total);
             }
         } catch (IOException ex) {
-            _log.error("Error listening for connections on " + localPort, ex);
-            notifyEvent("openBaseClientResult", "error");
+            if (open) {
+                _log.error("Error listening for connections on " + localPort, ex);
+                notifyEvent("openBaseClientResult", "error");
+            }
             synchronized (sockLock) {
                 mySockets.clear();
             }
@@ -401,7 +461,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
         }
         
         if (_maxWaitTime > 0)
-            SimpleTimer.getInstance().addEvent(new CloseEvent(s), _maxWaitTime);
+            SimpleScheduler.getInstance().addEvent(new CloseEvent(s), _maxWaitTime);
 
         synchronized (_waitingSockets) {
             _waitingSockets.add(s);
@@ -455,20 +515,23 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
         // might risk to create an orphan socket. Would be better
         // to return with an error in that situation quickly.
         synchronized (sockLock) {
-            mySockets.retainAll(sockMgr.listSockets());
-            if (!forced && mySockets.size() != 0) {
-                l.log("There are still active connections!");
-                _log.debug("can't close: there are still active connections!");
-                for (Iterator it = mySockets.iterator(); it.hasNext();) {
-                    l.log("->" + it.next());
+            if (sockMgr != null) {
+                mySockets.retainAll(sockMgr.listSockets());
+                if (!forced && mySockets.size() != 0) {
+                    l.log("There are still active connections!");
+                    _log.debug("can't close: there are still active connections!");
+                    for (Iterator it = mySockets.iterator(); it.hasNext();) {
+                        l.log("->" + it.next());
+                    }
+                    return false;
+                }
+                I2PSession session = sockMgr.getSession();
+                if (session != null) {
+                    getTunnel().removeSession(session);
                 }
-                return false;
-            }
-            I2PSession session = sockMgr.getSession();
-            if (session != null) {
-                getTunnel().removeSession(session);
             }
             l.log("Closing client " + toString());
+            open = false;
             try {
                 if (ss != null) ss.close();
             } catch (IOException ex) {
@@ -476,7 +539,6 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna
                 return false;
             }
             l.log("Client closed.");
-            open = false;
         }
         
         synchronized (_waitingSockets) { _waitingSockets.notifyAll(); }

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelConnectClient.java

@@ -0,0 +1,369 @@
+/* I2PTunnel is GPL'ed (with the exception mentioned in I2PTunnel.java)
+ * (c) 2003 - 2004 mihi
+ */
+package net.i2p.i2ptunnel;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.net.SocketException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Properties;
+import java.util.StringTokenizer;
+
+import net.i2p.I2PAppContext;
+import net.i2p.I2PException;
+import net.i2p.client.streaming.I2PSocket;
+import net.i2p.client.streaming.I2PSocketOptions;
+import net.i2p.data.DataFormatException;
+import net.i2p.data.DataHelper;
+import net.i2p.data.Destination;
+import net.i2p.util.EventDispatcher;
+import net.i2p.util.FileUtil;
+import net.i2p.util.Log;
+
+/**
+ * Supports the following:
+ *   (where protocol is generally HTTP/1.1 but is ignored)
+ *   (where host is one of:
+ *      example.i2p
+ *      52chars.b32.i2p
+ *      516+charsbase64
+ *      example.com (sent to one of the configured proxies)
+ *   )
+ *
+ *   (port and protocol are ignored for i2p destinations)
+ *   CONNECT host
+ *   CONNECT host protocol
+ *   CONNECT host:port
+ *   CONNECT host:port protocol (this is the standard)
+ *
+ * Additional lines after the CONNECT line but before the blank line are ignored and stripped.
+ * The CONNECT line is removed for .i2p accesses
+ * but passed along for outproxy accesses.
+ *
+ * Ref:
+ *  INTERNET-DRAFT                                              Ari Luotonen
+ *  Expires: September 26, 1997          Netscape Communications Corporation
+ *  <draft-luotonen-ssl-tunneling-03.txt>                     March 26, 1997
+ *                     Tunneling SSL Through a WWW Proxy
+ *
+ * @author zzz a stripped-down I2PTunnelHTTPClient
+ */
+public class I2PTunnelConnectClient extends I2PTunnelClientBase implements Runnable {
+    private static final Log _log = new Log(I2PTunnelConnectClient.class);
+
+    private List<String> _proxyList;
+
+    private final static byte[] ERR_DESTINATION_UNKNOWN =
+        ("HTTP/1.1 503 Service Unavailable\r\n"+
+         "Content-Type: text/html; charset=iso-8859-1\r\n"+
+         "Cache-control: no-cache\r\n"+
+         "\r\n"+
+         "<html><body><H1>I2P ERROR: DESTINATION NOT FOUND</H1>"+
+         "That I2P Destination was not found. "+
+         "The host (or the outproxy, if you're using one) could also "+
+	 "be temporarily offline.  You may want to <b>retry</b>.  "+
+         "Could not find the following Destination:<BR><BR><div>")
+        .getBytes();
+    
+    private final static byte[] ERR_NO_OUTPROXY =
+        ("HTTP/1.1 503 Service Unavailable\r\n"+
+         "Content-Type: text/html; charset=iso-8859-1\r\n"+
+         "Cache-control: no-cache\r\n"+
+         "\r\n"+
+         "<html><body><H1>I2P ERROR: No outproxy found</H1>"+
+         "Your request was for a site outside of I2P, but you have no "+
+         "HTTP outproxy configured.  Please configure an outproxy in I2PTunnel")
+         .getBytes();
+    
+    private final static byte[] ERR_BAD_PROTOCOL =
+        ("HTTP/1.1 405 Bad Method\r\n"+
+         "Content-Type: text/html; charset=iso-8859-1\r\n"+
+         "Cache-control: no-cache\r\n"+
+         "\r\n"+
+         "<html><body><H1>I2P ERROR: METHOD NOT ALLOWED</H1>"+
+         "The request uses a bad protocol. "+
+         "The Connect Proxy supports CONNECT requests ONLY. Other methods such as GET are not allowed - Maybe you wanted the HTTP Proxy?.<BR>")
+        .getBytes();
+    
+    private final static byte[] ERR_LOCALHOST =
+        ("HTTP/1.1 403 Access Denied\r\n"+
+         "Content-Type: text/html; charset=iso-8859-1\r\n"+
+         "Cache-control: no-cache\r\n"+
+         "\r\n"+
+         "<html><body><H1>I2P ERROR: REQUEST DENIED</H1>"+
+         "Your browser is misconfigured. Do not use the proxy to access the router console or other localhost destinations.<BR>")
+        .getBytes();
+    
+    private final static byte[] SUCCESS_RESPONSE =
+        ("HTTP/1.1 200 Connection Established\r\n"+
+         "Proxy-agent: I2P\r\n"+
+         "\r\n")
+        .getBytes();
+    
+    /** used to assign unique IDs to the threads / clients.  no logic or functionality */
+    private static volatile long __clientId = 0;
+
+    /**
+     * @throws IllegalArgumentException if the I2PTunnel does not contain
+     *                                  valid config to contact the router
+     */
+    public I2PTunnelConnectClient(int localPort, Logging l, boolean ownDest, 
+                               String wwwProxy, EventDispatcher notifyThis, 
+                               I2PTunnel tunnel) throws IllegalArgumentException {
+        super(localPort, ownDest, l, notifyThis, "HTTPHandler " + (++__clientId), tunnel);
+
+        if (waitEventValue("openBaseClientResult").equals("error")) {
+            notifyEvent("openConnectClientResult", "error");
+            return;
+        }
+
+        _proxyList = new ArrayList();
+        if (wwwProxy != null) {
+            StringTokenizer tok = new StringTokenizer(wwwProxy, ",");
+            while (tok.hasMoreTokens())
+                _proxyList.add(tok.nextToken().trim());
+        }
+
+        setName(getLocalPort() + " -> ConnectClient [Outproxy list: " + wwwProxy + "]");
+
+        startRunning();
+    }
+
+    private String getPrefix(long requestId) { return "Client[" + _clientId + "/" + requestId + "]: "; }
+    
+    private String selectProxy() {
+        synchronized (_proxyList) {
+            int size = _proxyList.size();
+            if (size <= 0)
+                return null;
+            int index = I2PAppContext.getGlobalContext().random().nextInt(size);
+            return _proxyList.get(index);
+        }
+    }
+
+    private static final int DEFAULT_READ_TIMEOUT = 60*1000;
+    
+    /** 
+     * create the default options (using the default timeout, etc)
+     *
+     */
+    protected I2PSocketOptions getDefaultOptions() {
+        Properties defaultOpts = getTunnel().getClientOptions();
+        if (!defaultOpts.contains(I2PSocketOptions.PROP_READ_TIMEOUT))
+            defaultOpts.setProperty(I2PSocketOptions.PROP_READ_TIMEOUT, ""+DEFAULT_READ_TIMEOUT);
+        if (!defaultOpts.contains("i2p.streaming.inactivityTimeout"))
+            defaultOpts.setProperty("i2p.streaming.inactivityTimeout", ""+DEFAULT_READ_TIMEOUT);
+        I2PSocketOptions opts = sockMgr.buildOptions(defaultOpts);
+        if (!defaultOpts.containsKey(I2PSocketOptions.PROP_CONNECT_TIMEOUT))
+            opts.setConnectTimeout(DEFAULT_CONNECT_TIMEOUT);
+        return opts;
+    }
+    
+    private static long __requestId = 0;
+    protected void clientConnectionRun(Socket s) {
+        InputStream in = null;
+        OutputStream out = null;
+        String targetRequest = null;
+        boolean usingWWWProxy = false;
+        String currentProxy = null;
+        long requestId = ++__requestId;
+        try {
+            out = s.getOutputStream();
+            in = s.getInputStream();
+            String line, method = null, host = null, destination = null, restofline = null;
+            StringBuffer newRequest = new StringBuffer();
+            int ahelper = 0;
+            while (true) {
+                // Use this rather than BufferedReader because we can't have readahead,
+                // since we are passing the stream on to I2PTunnelRunner
+                line = DataHelper.readLine(in);
+                line = line.trim();
+                if (_log.shouldLog(Log.DEBUG))
+                    _log.debug(getPrefix(requestId) + "Line=[" + line + "]");
+                
+                if (method == null) { // first line CONNECT blah.i2p:80 HTTP/1.1
+                    int pos = line.indexOf(" ");
+                    if (pos == -1) break;    // empty first line
+                    method = line.substring(0, pos);
+                    String request = line.substring(pos + 1);
+
+                    pos = request.indexOf(":");
+                    if (pos == -1)
+                       pos = request.indexOf(" ");
+                    if (pos == -1) {
+                        host = request;
+                        restofline = "";
+                    } else {
+                        host = request.substring(0, pos);
+                        restofline = request.substring(pos); // ":80 HTTP/1.1" or " HTTP/1.1"
+                    }
+
+                    if (host.toLowerCase().endsWith(".i2p")) {
+                        // Destination gets the host name
+                        destination = host;
+                    } else if (host.indexOf(".") != -1) {
+                        // The request must be forwarded to a outproxy
+                        currentProxy = selectProxy();
+                        if (currentProxy == null) {
+                            if (_log.shouldLog(Log.WARN))
+                                _log.warn(getPrefix(requestId) + "Host wants to be outproxied, but we dont have any!");
+                            writeErrorMessage(ERR_NO_OUTPROXY, out);
+                            s.close();
+                            return;
+                        }
+                        destination = currentProxy;
+                        usingWWWProxy = true;
+                        newRequest.append("CONNECT ").append(host).append(restofline).append("\r\n\r\n"); // HTTP spec
+                    } else if (host.toLowerCase().equals("localhost")) {
+                        writeErrorMessage(ERR_LOCALHOST, out);
+                        s.close();
+                        return;
+                    } else {  // full b64 address (hopefully)
+                        destination = host;
+                    }
+                    targetRequest = host;
+
+                    if (_log.shouldLog(Log.DEBUG)) {
+                        _log.debug(getPrefix(requestId) + "METHOD:" + method + ":");
+                        _log.debug(getPrefix(requestId) + "HOST  :" + host + ":");
+                        _log.debug(getPrefix(requestId) + "REST  :" + restofline + ":");
+                        _log.debug(getPrefix(requestId) + "DEST  :" + destination + ":");
+                    }
+                    
+                } else if (line.length() > 0) {
+                    // Additional lines - shouldn't be too many. Firefox sends:
+                    // User-Agent: blabla
+                    // Proxy-Connection: keep-alive
+                    // Host: blabla.i2p
+                    //
+                    // We could send these (filtered like in HTTPClient) on to the outproxy,
+                    // but for now just chomp them all.
+                    line = null;
+                } else {
+                    // do it
+                    break;
+                }
+            }
+
+            if (destination == null || !"CONNECT".equalsIgnoreCase(method)) {
+                writeErrorMessage(ERR_BAD_PROTOCOL, out);
+                s.close();
+                return;
+            }
+            
+            Destination dest = I2PTunnel.destFromName(destination);
+            if (dest == null) {
+                String str;
+                byte[] header;
+                if (usingWWWProxy)
+                    str = FileUtil.readTextFile("docs/dnfp-header.ht", 100, true);
+                else
+                    str = FileUtil.readTextFile("docs/dnfh-header.ht", 100, true);
+                if (str != null)
+                    header = str.getBytes();
+                else
+                    header = ERR_DESTINATION_UNKNOWN;
+                writeErrorMessage(header, out, targetRequest, usingWWWProxy, destination);
+                s.close();
+                return;
+            }
+
+            I2PSocket i2ps = createI2PSocket(dest, getDefaultOptions());
+            byte[] data = null;
+            byte[] response = null;
+            if (usingWWWProxy)
+                data = newRequest.toString().getBytes("ISO-8859-1");
+            else
+                response = SUCCESS_RESPONSE;
+            Runnable onTimeout = new OnTimeout(s, s.getOutputStream(), targetRequest, usingWWWProxy, currentProxy, requestId);
+            I2PTunnelRunner runner = new I2PTunnelRunner(s, i2ps, sockLock, data, response, mySockets, onTimeout);
+        } catch (SocketException ex) {
+            _log.info(getPrefix(requestId) + "Error trying to connect", ex);
+            handleConnectClientException(ex, out, targetRequest, usingWWWProxy, currentProxy, requestId);
+            closeSocket(s);
+        } catch (IOException ex) {
+            _log.info(getPrefix(requestId) + "Error trying to connect", ex);
+            handleConnectClientException(ex, out, targetRequest, usingWWWProxy, currentProxy, requestId);
+            closeSocket(s);
+        } catch (I2PException ex) {
+            _log.info("getPrefix(requestId) + Error trying to connect", ex);
+            handleConnectClientException(ex, out, targetRequest, usingWWWProxy, currentProxy, requestId);
+            closeSocket(s);
+        } catch (OutOfMemoryError oom) {
+            IOException ex = new IOException("OOM");
+            _log.info("getPrefix(requestId) + Error trying to connect", ex);
+            handleConnectClientException(ex, out, targetRequest, usingWWWProxy, currentProxy, requestId);
+            closeSocket(s);
+        }
+    }
+
+    private static class OnTimeout implements Runnable {
+        private Socket _socket;
+        private OutputStream _out;
+        private String _target;
+        private boolean _usingProxy;
+        private String _wwwProxy;
+        private long _requestId;
+        public OnTimeout(Socket s, OutputStream out, String target, boolean usingProxy, String wwwProxy, long id) {
+            _socket = s;
+            _out = out;
+            _target = target;
+            _usingProxy = usingProxy;
+            _wwwProxy = wwwProxy;
+            _requestId = id;
+        }
+        public void run() {
+            if (_log.shouldLog(Log.DEBUG))
+                _log.debug("Timeout occured requesting " + _target);
+            handleConnectClientException(new RuntimeException("Timeout"), _out, 
+                                      _target, _usingProxy, _wwwProxy, _requestId);
+            closeSocket(_socket);
+        }
+    }
+    
+    private static void writeErrorMessage(byte[] errMessage, OutputStream out) throws IOException {
+        if (out == null)
+            return;
+        out.write(errMessage);
+        out.write("\n</body></html>\n".getBytes());
+        out.flush();
+    }
+
+    private static void writeErrorMessage(byte[] errMessage, OutputStream out, String targetRequest,
+                                          boolean usingWWWProxy, String wwwProxy) throws IOException {
+        if (out != null) {
+            out.write(errMessage);
+            if (targetRequest != null) {
+                out.write(targetRequest.getBytes());
+                if (usingWWWProxy)
+                    out.write(("<br>WWW proxy: " + wwwProxy).getBytes());
+            }
+            out.write("</div>".getBytes());
+            out.write("\n</body></html>\n".getBytes());
+            out.flush();
+        }
+    }
+
+    private static void handleConnectClientException(Exception ex, OutputStream out, String targetRequest,
+                                                  boolean usingWWWProxy, String wwwProxy, long requestId) {
+        if (out == null)
+            return;
+        try {
+            String str;
+            byte[] header;
+            if (usingWWWProxy)
+                str = FileUtil.readTextFile("docs/dnfp-header.ht", 100, true);
+            else
+                str = FileUtil.readTextFile("docs/dnf-header.ht", 100, true);
+            if (str != null)
+                header = str.getBytes();
+            else
+                header = ERR_DESTINATION_UNKNOWN;
+            writeErrorMessage(header, out, targetRequest, usingWWWProxy, wwwProxy);
+        } catch (IOException ioe) {}
+    }
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPClient.java

@@ -5,6 +5,7 @@ package net.i2p.i2ptunnel;
 
 import java.io.BufferedReader;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.InputStreamReader;
 import java.io.OutputStream;
 import java.net.Socket;
@@ -21,6 +22,7 @@ import net.i2p.I2PException;
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.client.streaming.I2PSocketOptions;
 import net.i2p.data.DataFormatException;
+import net.i2p.data.DataHelper;
 import net.i2p.data.Destination;
 import net.i2p.util.EventDispatcher;
 import net.i2p.util.FileUtil;
@@ -131,16 +133,6 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
          "Your browser is misconfigured. Do not use the proxy to access the router console or other localhost destinations.<BR>")
         .getBytes();
     
-    private final static int MAX_POSTBYTES = 20*1024*1024; // arbitrary but huge -  all in memory, no temp file
-    private final static byte[] ERR_MAXPOST =
-        ("HTTP/1.1 503 Bad POST\r\n"+
-         "Content-Type: text/html; charset=iso-8859-1\r\n"+
-         "Cache-control: no-cache\r\n"+
-         "\r\n"+
-         "<html><body><H1>I2P ERROR: REQUEST DENIED</H1>"+
-         "The maximum POST size is " + MAX_POSTBYTES + " bytes.<BR>")
-        .getBytes();
-    
     /** used to assign unique IDs to the threads / clients.  no logic or functionality */
     private static volatile long __clientId = 0;
 
@@ -193,7 +185,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
     
     /** 
      * create the default options (using the default timeout, etc)
-     *
+     * unused?
      */
     protected I2PSocketOptions getDefaultOptions() {
         Properties defaultOpts = getTunnel().getClientOptions();
@@ -218,6 +210,9 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
             defaultOpts.setProperty(I2PSocketOptions.PROP_READ_TIMEOUT, ""+DEFAULT_READ_TIMEOUT);
         if (!defaultOpts.contains("i2p.streaming.inactivityTimeout"))
             defaultOpts.setProperty("i2p.streaming.inactivityTimeout", ""+DEFAULT_READ_TIMEOUT);
+        // delayed start
+        if (sockMgr == null)
+            sockMgr = getSocketManager();
         I2PSocketOptions opts = sockMgr.buildOptions(defaultOpts);
         if (!defaultOpts.containsKey(I2PSocketOptions.PROP_CONNECT_TIMEOUT))
             opts.setConnectTimeout(DEFAULT_CONNECT_TIMEOUT);
@@ -232,6 +227,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
     
     private static long __requestId = 0;
     protected void clientConnectionRun(Socket s) {
+        InputStream in = null;
         OutputStream out = null;
         String targetRequest = null;
         boolean usingWWWProxy = false;
@@ -239,11 +235,12 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
         long requestId = ++__requestId;
         try {
             out = s.getOutputStream();
-            BufferedReader br = new BufferedReader(new InputStreamReader(s.getInputStream(), "ISO-8859-1"));
+            InputReader reader = new InputReader(s.getInputStream());
             String line, method = null, protocol = null, host = null, destination = null;
             StringBuffer newRequest = new StringBuffer();
             int ahelper = 0;
-            while ((line = br.readLine()) != null) {
+            while ((line = reader.readLine(method)) != null) {
+                line = line.trim();
                 if (_log.shouldLog(Log.DEBUG))
                     _log.debug(getPrefix(requestId) + "Line=[" + line + "]");
                 
@@ -257,7 +254,6 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
                     if (_log.shouldLog(Log.DEBUG))
                         _log.debug(getPrefix(requestId) + "Method is null for [" + line + "]");
                     
-                    line = line.trim();
                     int pos = line.indexOf(" ");
                     if (pos == -1) break;
                     method = line.substring(0, pos);
@@ -514,30 +510,11 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
                     newRequest.append("Connection: close\r\n\r\n");
                     break;
                 } else {
-                    newRequest.append(line.trim()).append("\r\n"); // HTTP spec
+                    newRequest.append(line).append("\r\n"); // HTTP spec
                 }
             }
             if (_log.shouldLog(Log.DEBUG))
                 _log.debug(getPrefix(requestId) + "NewRequest header: [" + newRequest.toString() + "]");
-            
-            int postbytes = 0;
-            while (br.ready()) { // empty the buffer (POST requests)
-                int i = br.read();
-                if (i != -1) {
-                    newRequest.append((char) i);
-                    if (++postbytes > MAX_POSTBYTES) {
-                        if (out != null) {
-                            out.write(ERR_MAXPOST);
-                            out.write("<p /><i>Generated on: ".getBytes());
-                            out.write(new Date().toString().getBytes());
-                            out.write("</i></body></html>\n".getBytes());
-                            out.flush();
-                        }
-                        s.close();
-                        return;
-                    }
-                }
-            }
 
             if (method == null || destination == null) {
                 l.log("No HTTP method found in the request.");
@@ -560,7 +537,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
             
             Destination dest = I2PTunnel.destFromName(destination);
             if (dest == null) {
-                l.log("Could not resolve " + destination + ".");
+                //l.log("Could not resolve " + destination + ".");
                 if (_log.shouldLog(Log.WARN))
                     _log.warn("Unable to resolve " + destination + " (proxy? " + usingWWWProxy + ", request: " + targetRequest);
                 String str;
@@ -570,6 +547,8 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
                     str = FileUtil.readTextFile("docs/dnfp-header.ht", 100, true);
                 else if(ahelper != 0)
                     str = FileUtil.readTextFile("docs/dnfb-header.ht", 100, true);
+                else if (destination.length() == 60 && destination.endsWith(".b32.i2p"))
+                    str = FileUtil.readTextFile("docs/dnf-header.ht", 100, true);
                 else {
                     str = FileUtil.readTextFile("docs/dnfh-header.ht", 100, true);
                     showAddrHelper = true;
@@ -608,8 +587,8 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
             l.log(ex.getMessage());
             handleHTTPClientException(ex, out, targetRequest, usingWWWProxy, currentProxy, requestId);
             closeSocket(s);
-        } catch (OutOfMemoryError oom) {  // mainly for huge POSTs
-            IOException ex = new IOException("OOM (in POST?)");
+        } catch (OutOfMemoryError oom) {
+            IOException ex = new IOException("OOM");
             _log.info("getPrefix(requestId) + Error trying to connect", ex);
             l.log(ex.getMessage());
             handleHTTPClientException(ex, out, targetRequest, usingWWWProxy, currentProxy, requestId);
@@ -617,6 +596,29 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
         }
     }
 
+    /**
+     *  Read the first line unbuffered.
+     *  After that, switch to a BufferedReader, unless the method is "POST".
+     *  We can't use BufferedReader for POST because we can't have readahead,
+     *  since we are passing the stream on to I2PTunnelRunner for the POST data.
+     *
+     */
+    private static class InputReader {
+        BufferedReader _br;
+        InputStream _s;
+        public InputReader(InputStream s) {
+            _br = null;
+            _s = s;
+        }
+        String readLine(String method) throws IOException {
+             if (method == null || "POST".equals(method))
+                 return DataHelper.readLine(_s);
+             if (_br == null)
+                 _br = new BufferedReader(new InputStreamReader(_s, "ISO-8859-1"));
+             return _br.readLine();
+        }
+    }
+
     private final static String getHostName(String host) {
         if (host == null) return null;
         try {
@@ -628,7 +630,7 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
         }
     }
 
-    private class OnTimeout implements Runnable {
+    private static class OnTimeout implements Runnable {
         private Socket _socket;
         private OutputStream _out;
         private String _target;
@@ -706,11 +708,12 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
         }
     }
 
-    private void handleHTTPClientException(Exception ex, OutputStream out, String targetRequest,
+    private static void handleHTTPClientException(Exception ex, OutputStream out, String targetRequest,
                                                   boolean usingWWWProxy, String wwwProxy, long requestId) {
                                                       
-        if (_log.shouldLog(Log.WARN))
-            _log.warn(getPrefix(requestId) + "Error sending to " + wwwProxy + " (proxy? " + usingWWWProxy + ", request: " + targetRequest, ex);
+        // static
+        //if (_log.shouldLog(Log.WARN))
+        //    _log.warn(getPrefix(requestId) + "Error sending to " + wwwProxy + " (proxy? " + usingWWWProxy + ", request: " + targetRequest, ex);
         if (out != null) {
             try {
                 String str;
@@ -725,16 +728,18 @@ public class I2PTunnelHTTPClient extends I2PTunnelClientBase implements Runnable
                     header = ERR_DESTINATION_UNKNOWN;
                 writeErrorMessage(header, out, targetRequest, usingWWWProxy, wwwProxy, false);
             } catch (IOException ioe) {
-                _log.warn(getPrefix(requestId) + "Error writing out the 'destination was unknown' " + "message", ioe);
+                // static
+                //_log.warn(getPrefix(requestId) + "Error writing out the 'destination was unknown' " + "message", ioe);
             }
         } else {
-            _log.warn(getPrefix(requestId) + "Client disconnected before we could say that destination " + "was unknown", ex);
+            // static
+            //_log.warn(getPrefix(requestId) + "Client disconnected before we could say that destination " + "was unknown", ex);
         }
     }
 
     private final static String SUPPORTED_HOSTS[] = { "i2p", "www.i2p.com", "i2p."};
 
-    private boolean isSupportedAddress(String host, String protocol) {
+    private static boolean isSupportedAddress(String host, String protocol) {
         if ((host == null) || (protocol == null)) return false;
         boolean found = false;
         String lcHost = host.toLowerCase();

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelHTTPServer.java

@@ -124,8 +124,17 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
                     _log.error("Error while closing the received i2p con", ex);
             }
         } catch (IOException ex) {
+            try {
+                socket.close();
+            } catch (IOException ioe) {}
             if (_log.shouldLog(Log.WARN))
                 _log.warn("Error while receiving the new HTTP request", ex);
+        } catch (OutOfMemoryError oom) {
+            try {
+                socket.close();
+            } catch (IOException ioe) {}
+            if (_log.shouldLog(Log.ERROR))
+                _log.error("OOM in HTTP server", oom);
         }
 
         long afterHandle = getTunnel().getContext().clock().now();
@@ -162,7 +171,24 @@ public class I2PTunnelHTTPServer extends I2PTunnelServer {
                 sender.start();
                 
                 browserout = _browser.getOutputStream();
-                serverin = _webserver.getInputStream(); 
+                // NPE seen here in 0.7-7, caused by addition of socket.close() in the
+                // catch (IOException ioe) block above in blockingHandle() ???
+                // CRIT  [ad-130280.hc] net.i2p.util.I2PThread        : Killing thread Thread-130280.hc
+                // java.lang.NullPointerException
+                //     at java.io.FileInputStream.<init>(FileInputStream.java:131)
+                //     at java.net.SocketInputStream.<init>(SocketInputStream.java:44)
+                //     at java.net.PlainSocketImpl.getInputStream(PlainSocketImpl.java:401)
+                //     at java.net.Socket$2.run(Socket.java:779)
+                //     at java.security.AccessController.doPrivileged(Native Method)
+                //     at java.net.Socket.getInputStream(Socket.java:776)
+                //     at net.i2p.i2ptunnel.I2PTunnelHTTPServer$CompressedRequestor.run(I2PTunnelHTTPServer.java:174)
+                //     at java.lang.Thread.run(Thread.java:619)
+                //     at net.i2p.util.I2PThread.run(I2PThread.java:71)
+                try {
+                    serverin = _webserver.getInputStream(); 
+                } catch (NullPointerException npe) {
+                    throw new IOException("getInputStream NPE");
+                }
                 CompressedResponseOutputStream compressedOut = new CompressedResponseOutputStream(browserout);
                 Sender s = new Sender(compressedOut, serverin, "server: server to browser");
                 if (_log.shouldLog(Log.INFO))

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCClient.java

@@ -39,12 +39,12 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
                               Logging l, 
                               boolean ownDest,
                               EventDispatcher notifyThis,
-                              I2PTunnel tunnel) throws IllegalArgumentException {
+                              I2PTunnel tunnel, String pkf) throws IllegalArgumentException {
         super(localPort, 
               ownDest, 
               l, 
               notifyThis, 
-              "IRCHandler " + (++__clientId), tunnel);
+              "IRCHandler " + (++__clientId), tunnel, pkf);
         
         StringTokenizer tok = new StringTokenizer(destinations, ",");
         dests = new ArrayList(1);
@@ -83,9 +83,9 @@ public class I2PTunnelIRCClient extends I2PTunnelClientBase implements Runnable
             i2ps = createI2PSocket(dest);
             i2ps.setReadTimeout(readTimeout);
             StringBuffer expectedPong = new StringBuffer();
-            Thread in = new I2PThread(new IrcInboundFilter(s,i2ps, expectedPong));
+            Thread in = new I2PThread(new IrcInboundFilter(s,i2ps, expectedPong), "IRC Client " + __clientId + " in");
             in.start();
-            Thread out = new I2PThread(new IrcOutboundFilter(s,i2ps, expectedPong));
+            Thread out = new I2PThread(new IrcOutboundFilter(s,i2ps, expectedPong), "IRC Client " + __clientId + " out");
             out.start();
         } catch (Exception ex) {
             if (_log.shouldLog(Log.ERROR))

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCServer.java

@@ -0,0 +1,191 @@
+package net.i2p.i2ptunnel;
+
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.SocketException;
+import java.util.Properties;
+
+import net.i2p.I2PAppContext;
+import net.i2p.client.streaming.I2PSocket;
+import net.i2p.crypto.SHA256Generator;
+import net.i2p.data.DataFormatException;
+import net.i2p.data.DataHelper;
+import net.i2p.data.Destination;
+import net.i2p.data.Hash;
+import net.i2p.data.Base32;
+import net.i2p.util.EventDispatcher;
+import net.i2p.util.I2PThread;
+import net.i2p.util.Log;
+
+/**
+ * Simple extension to the I2PTunnelServer that filters the registration
+ * sequence to pass the destination hash of the client through as the hostname,
+ * so an IRC Server may track users across nick changes.
+ *
+ * Of course, this requires the ircd actually use the hostname sent by
+ * the client rather than the IP. It is common for ircds to ignore the
+ * hostname in the USER message (unless it's coming from another server)
+ * since it is easily spoofed. So you have to fix or, if you are lucky,
+ * configure your ircd first. At least in unrealircd and ngircd this is
+ * not configurable.
+ *
+ * There are three options for mangling the desthash. Put the option in the
+ * "custom options" section of i2ptunnel.
+ *   - ircserver.cloakKey unset:          Cloak with a random value that is persistent for
+ *                                        the life of this tunnel. This is the default.
+ *   - ircserver.cloakKey=somepassphrase: Cloak with the hash of the passphrase. Use this to
+ *                                        have consistent mangling across restarts, or to
+ *                                        have multiple IRC servers cloak consistently to
+ *                                        be able to track users even when they switch servers.
+ *                                        Note: don't quote or put spaces in the passphrase,
+ *                                        the i2ptunnel gui can't handle it.
+ *   - ircserver.fakeHostname=%f.b32.i2p: Set the fake hostname sent by I2PTunnel,
+ *                                        %f is the full B32 destination hash
+ *                                        %c is the cloaked hash.
+ *
+ * There is no outbound filtering.
+ *
+ * @author zzz
+ */
+public class I2PTunnelIRCServer extends I2PTunnelServer implements Runnable {
+    public static final String PROP_CLOAK="ircserver.cloakKey";
+    public static final String PROP_HOSTNAME="ircserver.fakeHostname";
+    public static final String PROP_HOSTNAME_DEFAULT="%f.b32.i2p";
+    
+    private static final Log _log = new Log(I2PTunnelIRCServer.class);
+    
+    
+    /**
+     * @throws IllegalArgumentException if the I2PTunnel does not contain
+     *                                  valid config to contact the router
+     */
+
+    public I2PTunnelIRCServer(InetAddress host, int port, File privkey, String privkeyname, Logging l, EventDispatcher notifyThis, I2PTunnel tunnel) {
+        super(host, port, privkey, privkeyname, l, notifyThis, tunnel);
+        initCloak(tunnel);
+    }
+
+    /** generate a random 32 bytes, or the hash of the passphrase */
+    private void initCloak(I2PTunnel tunnel) {
+        Properties opts = tunnel.getClientOptions();
+        String passphrase = opts.getProperty(PROP_CLOAK);
+        if (passphrase == null) {
+            this.cloakKey = new byte[Hash.HASH_LENGTH];
+            tunnel.getContext().random().nextBytes(this.cloakKey);
+        } else {
+            this.cloakKey = SHA256Generator.getInstance().calculateHash(passphrase.trim().getBytes()).getData();
+        }
+        
+        this.hostname = opts.getProperty(PROP_HOSTNAME, PROP_HOSTNAME_DEFAULT);
+    }
+    
+    protected void blockingHandle(I2PSocket socket) {
+        try {
+            // give them 15 seconds to send in the request
+            socket.setReadTimeout(15*1000);
+            InputStream in = socket.getInputStream();
+            String modifiedRegistration = filterRegistration(in, cloakDest(socket.getPeerDestination()));
+            socket.setReadTimeout(readTimeout);
+            Socket s = new Socket(remoteHost, remotePort);
+            new I2PTunnelRunner(s, socket, slock, null, modifiedRegistration.getBytes(), null);
+        } catch (SocketException ex) {
+            try {
+                socket.close();
+            } catch (IOException ioe) {
+                if (_log.shouldLog(Log.ERROR))
+                    _log.error("Error while closing the received i2p con", ex);
+            }
+        } catch (IOException ex) {
+            try {
+                socket.close();
+            } catch (IOException ioe) {}
+            if (_log.shouldLog(Log.WARN))
+                _log.warn("Error while receiving the new IRC Connection", ex);
+        } catch (OutOfMemoryError oom) {
+            try {
+                socket.close();
+            } catch (IOException ioe) {}
+            if (_log.shouldLog(Log.ERROR))
+                _log.error("OOM in IRC server", oom);
+        }
+    }
+
+    /**
+     * (Optionally) append 32 bytes of crap to the destination then return
+     * the first few characters of the hash of the whole thing, + ".i2p".
+     * Or do we want the full hash if the ircd is going to use this for
+     * nickserv auto-login? Or even Base32 if it will be used in a
+     * case-insensitive manner?
+     *
+     */
+    String cloakDest(Destination d) {
+        String hf;
+        String hc;
+        
+        byte[] b = new byte[d.size() + this.cloakKey.length];
+        System.arraycopy(b, 0, d.toByteArray(), 0, d.size());
+        System.arraycopy(b, d.size(), this.cloakKey, 0, this.cloakKey.length);
+        hc = Base32.encode(SHA256Generator.getInstance().calculateHash(b).getData());
+        
+        hf = Base32.encode(d.calculateHash().getData());
+        
+        return this.hostname.replace("%f", hf).replace("%c", hc);
+    }
+
+    /** keep reading until we see USER or SERVER */
+    private String filterRegistration(InputStream in, String newHostname) throws IOException {
+        StringBuffer buf = new StringBuffer(128);
+        int lineCount = 0;
+        
+        while (true) {
+            String s = DataHelper.readLine(in);
+            if (s == null)
+                throw new IOException("EOF reached before the end of the headers [" + buf.toString() + "]");
+            if (++lineCount > 10)
+                throw new IOException("Too many lines before USER or SERVER, giving up");
+            s = s.trim();
+            if (_log.shouldLog(Log.DEBUG))
+                _log.debug("Got line: " + s);
+
+            String field[]=s.split(" ",5);
+            String command;
+            int idx=0;
+        
+            if(field[0].charAt(0)==':')
+                idx++;
+
+            try {
+                command = field[idx++];
+            } catch (IndexOutOfBoundsException ioobe) {
+                // wtf, server sent borked command?
+               throw new IOException("Dropping defective message: index out of bounds while extracting command.");
+            }
+
+            if ("USER".equalsIgnoreCase(command)) {
+                if (field.length < idx + 4)
+                    throw new IOException("Too few parameters in USER message: " + s);
+                // USER zzz1 hostname localhost :zzz
+                //  =>
+                // USER zzz1 abcd1234.i2p localhost :zzz
+                // this whole class is for these two lines...
+                buf.append("USER ").append(field[idx]).append(' ').append(newHostname);
+                buf.append(' ');
+                buf.append(field[idx+2]).append(' ').append(field[idx+3]).append("\r\n");
+                break;
+            }
+            buf.append(s).append("\r\n");
+            if ("SERVER".equalsIgnoreCase(command))
+                break;
+        }
+        if (_log.shouldLog(Log.DEBUG))
+            _log.debug("All done, sending: " + buf.toString());
+        return buf.toString();
+    }
+    
+    private byte[] cloakKey; // 32 bytes of stuff to scramble the dest with
+    private String hostname;
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java

@@ -58,7 +58,7 @@ public class TunnelController implements Logging {
         setConfig(config, prefix);
         _messages = new ArrayList(4);
         _running = false;
-        if (createKey && ("server".equals(getType()) || "httpserver".equals(getType())) )
+        if (createKey && (getType().endsWith("server") || getPersistentClientKey()))
             createPrivateKey();
         _starting = getStartOnLoad();
     }
@@ -73,7 +73,7 @@ public class TunnelController implements Logging {
         
         File keyFile = new File(getPrivKeyFile());
         if (keyFile.exists()) {
-            log("Not overwriting existing private keys in " + keyFile.getAbsolutePath());
+            //log("Not overwriting existing private keys in " + keyFile.getAbsolutePath());
             return;
         } else {
             File parent = keyFile.getParentFile();
@@ -87,6 +87,7 @@ public class TunnelController implements Logging {
             String destStr = dest.toBase64();
             log("Private key created and saved in " + keyFile.getAbsolutePath());
             log("New destination: " + destStr);
+            log("Base32: " + Base32.encode(dest.calculateHash().getData()) + ".b32.i2p");
         } catch (I2PException ie) {
             if (_log.shouldLog(Log.ERROR))
                 _log.error("Error creating new destination", ie);
@@ -133,25 +134,38 @@ public class TunnelController implements Logging {
                 _log.warn("Cannot start the tunnel - no type specified");
             return;
         }
+        setI2CPOptions();
+        setSessionOptions();
         if ("httpclient".equals(type)) {
             startHttpClient();
-        }else if("ircclient".equals(type)) {
+        } else if("ircclient".equals(type)) {
             startIrcClient();
+        } else if("sockstunnel".equals(type)) {
+            startSocksClient();
+        } else if("connectclient".equals(type)) {
+            startConnectClient();
         } else if ("client".equals(type)) {
             startClient();
+        } else if ("streamrclient".equals(type)) {
+            startStreamrClient();
         } else if ("server".equals(type)) {
             startServer();
         } else if ("httpserver".equals(type)) {
             startHttpServer();
+        } else if ("ircserver".equals(type)) {
+            startIrcServer();
+        } else if ("streamrserver".equals(type)) {
+            startStreamrServer();
         } else {
             if (_log.shouldLog(Log.ERROR))
                 _log.error("Cannot start tunnel - unknown type [" + type + "]");
+            return;
         }
+        acquire();
+        _running = true;
     }
     
     private void startHttpClient() {
-        setI2CPOptions();
-        setSessionOptions();
         setListenOn();
         String listenPort = getListenPort();
         String proxyList = getProxyList();
@@ -160,20 +174,62 @@ public class TunnelController implements Logging {
             _tunnel.runHttpClient(new String[] { listenPort, sharedClient }, this);
         else
             _tunnel.runHttpClient(new String[] { listenPort, sharedClient, proxyList }, this);
-        acquire();
-        _running = true;
+    }
+    
+    private void startConnectClient() {
+        setListenOn();
+        String listenPort = getListenPort();
+        String proxyList = getProxyList();
+        String sharedClient = getSharedClient();
+        if (proxyList == null)
+            _tunnel.runConnectClient(new String[] { listenPort, sharedClient }, this);
+        else
+            _tunnel.runConnectClient(new String[] { listenPort, sharedClient, proxyList }, this);
     }
     
     private void startIrcClient() {
-        setI2CPOptions();
-        setSessionOptions();
         setListenOn();
         String listenPort = getListenPort();
         String dest = getTargetDestination();
         String sharedClient = getSharedClient();
-        _tunnel.runIrcClient(new String[] { listenPort, dest, sharedClient }, this);
-        acquire();
-        _running = true;
+        if (getPersistentClientKey()) {
+            String privKeyFile = getPrivKeyFile(); 
+            _tunnel.runIrcClient(new String[] { listenPort, dest, sharedClient, privKeyFile }, this);
+        } else {
+            _tunnel.runIrcClient(new String[] { listenPort, dest, sharedClient }, this);
+        }
+    }
+    
+    private void startSocksClient() {
+        setListenOn();
+        String listenPort = getListenPort();
+        String sharedClient = getSharedClient();
+        _tunnel.runSOCKSTunnel(new String[] { listenPort, sharedClient }, this);
+    }
+    
+    /*
+     *  Streamr client is a UDP server, use the listenPort field for targetPort
+     *  and the listenOnInterface field for the targetHost
+     */
+    private void startStreamrClient() {
+        String targetHost = getListenOnInterface();
+        String targetPort = getListenPort();
+        String dest = getTargetDestination();
+        _tunnel.runStreamrClient(new String[] { targetHost, targetPort, dest }, this);
+    }
+    
+    /**
+     *  Streamr server is a UDP client, use the targetPort field for listenPort
+     *  and the targetHost field for the listenOnInterface
+     */
+    private void startStreamrServer() {
+        String listenOn = getTargetHost();
+        if ( (listenOn != null) && (listenOn.length() > 0) ) {
+            _tunnel.runListenOn(new String[] { listenOn }, this);
+        }
+        String listenPort = getTargetPort();
+        String privKeyFile = getPrivKeyFile(); 
+        _tunnel.runStreamrServer(new String[] { listenPort, privKeyFile }, this);
     }
     
     /** 
@@ -209,38 +265,38 @@ public class TunnelController implements Logging {
     }
     
     private void startClient() {
-        setI2CPOptions();
-        setSessionOptions();
         setListenOn();
         String listenPort = getListenPort(); 
         String dest = getTargetDestination();
         String sharedClient = getSharedClient();
-        _tunnel.runClient(new String[] { listenPort, dest, sharedClient }, this);
-        acquire();
-        _running = true;
+        if (getPersistentClientKey()) {
+            String privKeyFile = getPrivKeyFile(); 
+            _tunnel.runClient(new String[] { listenPort, dest, sharedClient, privKeyFile }, this);
+        } else {
+            _tunnel.runClient(new String[] { listenPort, dest, sharedClient }, this);
+        }
     }
 
     private void startServer() {
-        setI2CPOptions();
-        setSessionOptions();
         String targetHost = getTargetHost(); 
         String targetPort = getTargetPort(); 
         String privKeyFile = getPrivKeyFile(); 
         _tunnel.runServer(new String[] { targetHost, targetPort, privKeyFile }, this);
-        acquire();
-        _running = true;
     }
     
     private void startHttpServer() {
-        setI2CPOptions();
-        setSessionOptions();
         String targetHost = getTargetHost(); 
         String targetPort = getTargetPort(); 
         String spoofedHost = getSpoofedHost(); 
         String privKeyFile = getPrivKeyFile(); 
         _tunnel.runHttpServer(new String[] { targetHost, targetPort, spoofedHost, privKeyFile }, this);
-        acquire();
-        _running = true;
+    }
+    
+    private void startIrcServer() {
+        String targetHost = getTargetHost(); 
+        String targetPort = getTargetPort(); 
+        String privKeyFile = getPrivKeyFile(); 
+        _tunnel.runIrcServer(new String[] { targetHost, targetPort, privKeyFile }, this);
     }
     
     private void setListenOn() {
@@ -349,6 +405,7 @@ public class TunnelController implements Logging {
     public String getProxyList() { return _config.getProperty("proxyList"); }
     public String getSharedClient() { return _config.getProperty("sharedClient", "true"); }
     public boolean getStartOnLoad() { return "true".equalsIgnoreCase(_config.getProperty("startOnLoad", "true")); }
+    public boolean getPersistentClientKey() { return Boolean.valueOf(_config.getProperty("option.persistentClientKey")).booleanValue(); }
     public String getMyDestination() {
         if (_tunnel != null) {
             List sessions = _tunnel.getSessions();

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/I2PSOCKSTunnel.java

@@ -7,6 +7,12 @@
 package net.i2p.i2ptunnel.socks;
 
 import java.net.Socket;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.StringTokenizer;
 
 import net.i2p.client.streaming.I2PSocket;
 import net.i2p.data.Destination;
@@ -20,7 +26,7 @@ import net.i2p.util.Log;
 public class I2PSOCKSTunnel extends I2PTunnelClientBase {
 
     private static final Log _log = new Log(I2PSOCKSTunnel.class);
-
+    private HashMap<String, List<String>> proxies = null;  // port# + "" or "default" -> hostname list
     protected Destination outProxyDest = null;
 
     //public I2PSOCKSTunnel(int localPort, Logging l, boolean ownDest) {
@@ -36,7 +42,7 @@ public class I2PSOCKSTunnel extends I2PTunnelClientBase {
         }
 
         setName(getLocalPort() + " -> SOCKSTunnel");
-
+        parseOptions();
         startRunning();
 
         notifyEvent("openSOCKSTunnelResult", "ok");
@@ -46,11 +52,49 @@ public class I2PSOCKSTunnel extends I2PTunnelClientBase {
         try {
             SOCKSServer serv = SOCKSServerFactory.createSOCKSServer(s);
             Socket clientSock = serv.getClientSocket();
-            I2PSocket destSock = serv.getDestinationI2PSocket();
+            I2PSocket destSock = serv.getDestinationI2PSocket(this);
             new I2PTunnelRunner(clientSock, destSock, sockLock, null, mySockets);
         } catch (SOCKSException e) {
             _log.error("Error from SOCKS connection: " + e.getMessage());
             closeSocket(s);
         }
     }
-}
+
+    private static final String PROP_PROXY = "i2ptunnel.socks.proxy.";
+    private void parseOptions() {
+        Properties opts = getTunnel().getClientOptions();
+        proxies = new HashMap(0);
+        for (Map.Entry e : opts.entrySet()) {
+           String prop = (String)e.getKey();
+           if ((!prop.startsWith(PROP_PROXY)) || prop.length() <= PROP_PROXY.length())
+              continue;
+           String port = prop.substring(PROP_PROXY.length());
+           List proxyList = new ArrayList(1);
+           StringTokenizer tok = new StringTokenizer((String)e.getValue(), ", \t");
+           while (tok.hasMoreTokens()) {
+               String proxy = tok.nextToken().trim();
+               if (proxy.endsWith(".i2p"))
+                   proxyList.add(proxy);
+               else
+                   _log.error("Non-i2p SOCKS outproxy: " + proxy);
+           }
+           proxies.put(port, proxyList);
+        }
+    }
+
+    public HashMap<String, List<String>> getProxyMap() {
+        return proxies;
+    }
+
+    public List<String> getProxies(int port) {
+        List<String> rv = proxies.get(port + "");
+        if (rv == null)
+            rv = getDefaultProxies();
+        return rv;
+    }
+
+    public List<String> getDefaultProxies() {
+        return proxies.get("default");
+    }
+
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/MultiSink.java

@@ -0,0 +1,35 @@
+package net.i2p.i2ptunnel.socks;
+
+import java.util.Map;
+
+import net.i2p.data.Destination;
+import net.i2p.i2ptunnel.udp.*;
+import net.i2p.util.Log;
+
+/**
+ * Sends to one of many Sinks
+ * @author zzz modded from streamr/MultiSource
+ */
+public class MultiSink implements Source, Sink {
+    private static final Log _log = new Log(MultiSink.class);
+
+    public MultiSink(Map cache) {
+        this.cache = cache;
+    }
+    
+    /** Don't use this - put sinks in the cache */
+    public void setSink(Sink sink) {}
+
+    public void start() {}
+
+    public void send(Destination from, byte[] data) {
+        Sink s = this.cache.get(from);
+        if (s == null) {
+            _log.error("No where to go for " + from.calculateHash().toBase64().substring(0, 6));
+            return;
+        }
+        s.send(from, data);
+    }
+    
+    private Map<Destination, Sink> cache;
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/ReplyTracker.java

@@ -0,0 +1,36 @@
+package net.i2p.i2ptunnel.socks;
+
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.Map;
+
+import net.i2p.data.Destination;
+import net.i2p.i2ptunnel.udp.*;
+import net.i2p.util.Log;
+
+/**
+ * Track who the reply goes to
+ * @author zzz
+ */
+public class ReplyTracker implements Source, Sink {
+    private static final Log _log = new Log(MultiSink.class);
+
+    public ReplyTracker(Sink reply, Map cache) {
+        this.reply = reply;
+        this.cache = cache;
+    }
+    
+    public void setSink(Sink sink) {
+        this.sink = sink;
+    }
+
+    public void start() {}
+
+    public void send(Destination to, byte[] data) {
+        this.cache.put(to, this.reply);
+        this.sink.send(to, data);
+    }
+    
+    private Sink reply;
+    private Map<Destination, Sink> cache;
+    private Sink sink;
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS4aServer.java

@@ -0,0 +1,284 @@
+/* I2PSOCKSTunnel is released under the terms of the GNU GPL,
+ * with an additional exception.  For further details, see the
+ * licensing terms in I2PTunnel.java.
+ *
+ * Copyright (c) 2004 by human
+ */
+package net.i2p.i2ptunnel.socks;
+
+import java.io.ByteArrayOutputStream;
+import java.io.DataInputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.SocketException;
+import java.util.List;
+
+import net.i2p.I2PAppContext;
+import net.i2p.I2PException;
+import net.i2p.client.streaming.I2PSocket;
+import net.i2p.data.DataFormatException;
+import net.i2p.i2ptunnel.I2PTunnel;
+import net.i2p.util.HexDump;
+import net.i2p.util.Log;
+
+/*
+ * Class that manages SOCKS 4/4a connections, and forwards them to
+ * destination hosts or (eventually) some outproxy.
+ *
+ * @author zzz modded from SOCKS5Server
+ */
+public class SOCKS4aServer extends SOCKSServer {
+    private static final Log _log = new Log(SOCKS4aServer.class);
+
+    private Socket clientSock = null;
+    private boolean setupCompleted = false;
+
+    /**
+     * Create a SOCKS4a server that communicates with the client using
+     * the specified socket.  This method should not be invoked
+     * directly: new SOCKS4aServer objects should be created by using
+     * SOCKSServerFactory.createSOCSKServer().  It is assumed that the
+     * SOCKS VER field has been stripped from the input stream of the
+     * client socket.
+     *
+     * @param clientSock client socket
+     */
+    public SOCKS4aServer(Socket clientSock) {
+        this.clientSock = clientSock;
+    }
+
+    public Socket getClientSocket() throws SOCKSException {
+        setupServer();
+
+        return clientSock;
+    }
+
+    protected void setupServer() throws SOCKSException {
+        if (setupCompleted) { return; }
+
+        DataInputStream in;
+        DataOutputStream out;
+        try {
+            in = new DataInputStream(clientSock.getInputStream());
+            out = new DataOutputStream(clientSock.getOutputStream());
+
+            manageRequest(in, out);
+        } catch (IOException e) {
+            throw new SOCKSException("Connection error (" + e.getMessage() + ")");
+        }
+
+        setupCompleted = true;
+    }
+
+    /**
+     * SOCKS4a request management.  This method assumes that all the
+     * stuff preceding or enveloping the actual request
+     * has been stripped out of the input/output streams.
+     */
+    private void manageRequest(DataInputStream in, DataOutputStream out) throws IOException, SOCKSException {
+
+        int command = in.readByte() & 0xff;
+        switch (command) {
+        case Command.CONNECT:
+            break;
+        case Command.BIND:
+            _log.debug("BIND command is not supported!");
+            sendRequestReply(Reply.CONNECTION_REFUSED, InetAddress.getByName("127.0.0.1"), 0, out);
+            throw new SOCKSException("BIND command not supported");
+        default:
+            _log.debug("unknown command in request (" + Integer.toHexString(command) + ")");
+            sendRequestReply(Reply.CONNECTION_REFUSED, InetAddress.getByName("127.0.0.1"), 0, out);
+            throw new SOCKSException("Invalid command in request");
+        }
+
+        connPort = in.readUnsignedShort();
+        if (connPort == 0) {
+            _log.debug("trying to connect to TCP port 0?  Dropping!");
+            sendRequestReply(Reply.CONNECTION_REFUSED, InetAddress.getByName("127.0.0.1"), 0, out);
+            throw new SOCKSException("Invalid port number in request");
+        }
+
+        connHostName = new String("");
+        boolean alreadyWarned = false;
+        for (int i = 0; i < 4; ++i) {
+            int octet = in.readByte() & 0xff;
+            connHostName += Integer.toString(octet);
+            if (i != 3) {
+                connHostName += ".";
+                if (octet != 0 && !alreadyWarned) {
+                    _log.warn("IPV4 address type in request: " + connHostName + ". Is your client secure?");
+                    alreadyWarned = true;
+                }
+            }
+        }
+
+        // discard user name
+        readString(in);
+
+        // SOCKS 4a
+        if (connHostName.startsWith("0.0.0.") && !connHostName.equals("0.0.0.0"))
+            connHostName = readString(in);
+    }
+
+    private String readString(DataInputStream in) throws IOException {
+        StringBuffer sb = new StringBuffer(16);
+        char c;
+        while ((c = (char) (in.readByte() & 0xff)) != 0)
+            sb.append(c);
+        return sb.toString();
+    }
+
+    protected void confirmConnection() throws SOCKSException {
+        DataInputStream in;
+        DataOutputStream out;
+        try {
+            out = new DataOutputStream(clientSock.getOutputStream());
+
+            sendRequestReply(Reply.SUCCEEDED, InetAddress.getByName("127.0.0.1"), 1, out);
+        } catch (IOException e) {
+            throw new SOCKSException("Connection error (" + e.getMessage() + ")");
+        }
+    }
+
+    /**
+     * Send the specified reply to a request of the client.  Either
+     * one of inetAddr or domainName can be null, depending on
+     * addressType.
+     */
+    private void sendRequestReply(int replyCode, InetAddress inetAddr,
+                                  int bindPort, DataOutputStream out) throws IOException {
+        ByteArrayOutputStream reps = new ByteArrayOutputStream();
+        DataOutputStream dreps = new DataOutputStream(reps);
+
+        // Reserved byte, should be 0x00
+        dreps.write(0x00);
+        dreps.write(replyCode);
+        dreps.writeShort(bindPort);
+        dreps.write(inetAddr.getAddress());
+
+        byte[] reply = reps.toByteArray();
+
+        if (_log.shouldLog(Log.DEBUG)) {
+            _log.debug("Sending request reply:\n" + HexDump.dump(reply));
+        }
+
+        out.write(reply);
+    }
+
+    /**
+     * Get an I2PSocket that can be used to send/receive 8-bit clean data
+     * to/from the destination of the SOCKS connection.
+     *
+     * @return an I2PSocket connected with the destination
+     */
+    public I2PSocket getDestinationI2PSocket(I2PSOCKSTunnel t) throws SOCKSException {
+        setupServer();
+
+        if (connHostName == null) {
+            _log.error("BUG: destination host name has not been initialized!");
+            throw new SOCKSException("BUG! See the logs!");
+        }
+        if (connPort == 0) {
+            _log.error("BUG: destination port has not been initialized!");
+            throw new SOCKSException("BUG! See the logs!");
+        }
+
+        DataOutputStream out; // for errors
+        try {
+            out = new DataOutputStream(clientSock.getOutputStream());
+        } catch (IOException e) {
+            throw new SOCKSException("Connection error (" + e.getMessage() + ")");
+        }
+
+        // FIXME: here we should read our config file, select an
+        // outproxy, and instantiate the proper socket class that
+        // handles the outproxy itself (SOCKS4a, SOCKS4a, HTTP CONNECT...).
+        I2PSocket destSock;
+
+        try {
+            if (connHostName.toLowerCase().endsWith(".i2p") ||
+                connHostName.toLowerCase().endsWith(".onion")) {
+                _log.debug("connecting to " + connHostName + "...");
+                // Let's not due a new Dest for every request, huh?
+                //I2PSocketManager sm = I2PSocketManagerFactory.createManager();
+                //destSock = sm.connect(I2PTunnel.destFromName(connHostName), null);
+                destSock = t.createI2PSocket(I2PTunnel.destFromName(connHostName));
+            } else if ("localhost".equals(connHostName) || "127.0.0.1".equals(connHostName)) {
+                String err = "No localhost accesses allowed through the Socks Proxy";
+                _log.error(err);
+                try {
+                    sendRequestReply(Reply.CONNECTION_REFUSED, InetAddress.getByName("127.0.0.1"), 0, out);
+                } catch (IOException ioe) {}
+                throw new SOCKSException(err);
+            } else if (connPort == 80) {
+                // rewrite GET line to include hostname??? or add Host: line???
+                // or forward to local eepProxy (but that's a Socket not an I2PSocket)
+                // use eepProxy configured outproxies?
+                String err = "No handler for HTTP outproxy implemented - to: " + connHostName;
+                _log.error(err);
+                try {
+                    sendRequestReply(Reply.CONNECTION_REFUSED, InetAddress.getByName("127.0.0.1"), 0, out);
+                } catch (IOException ioe) {}
+                throw new SOCKSException(err);
+            } else {
+                List<String> proxies = t.getProxies(connPort);
+                if (proxies == null || proxies.size() <= 0) {
+                    String err = "No outproxy configured for port " + connPort + " and no default configured either - host: " + connHostName;
+                    _log.error(err);
+                    try {
+                        sendRequestReply(Reply.CONNECTION_REFUSED, InetAddress.getByName("127.0.0.1"), 0, out);
+                    } catch (IOException ioe) {}
+                    throw new SOCKSException(err);
+                }
+                int p = I2PAppContext.getGlobalContext().random().nextInt(proxies.size());
+                String proxy = proxies.get(p);
+                _log.debug("connecting to port " + connPort + " proxy " + proxy + " for " + connHostName + "...");
+                // this isn't going to work, these need to be socks outproxies so we need
+                // to do a socks session to them?
+                destSock = t.createI2PSocket(I2PTunnel.destFromName(proxy));
+            }
+            confirmConnection();
+            _log.debug("connection confirmed - exchanging data...");
+        } catch (DataFormatException e) {
+            try {
+                sendRequestReply(Reply.CONNECTION_REFUSED, InetAddress.getByName("127.0.0.1"), 0, out);
+            } catch (IOException ioe) {}
+            throw new SOCKSException("Error in destination format");
+        } catch (SocketException e) {
+            try {
+                sendRequestReply(Reply.CONNECTION_REFUSED, InetAddress.getByName("127.0.0.1"), 0, out);
+            } catch (IOException ioe) {}
+            throw new SOCKSException("Error connecting ("
+                                     + e.getMessage() + ")");
+        } catch (IOException e) {
+            try {
+                sendRequestReply(Reply.CONNECTION_REFUSED, InetAddress.getByName("127.0.0.1"), 0, out);
+            } catch (IOException ioe) {}
+            throw new SOCKSException("Error connecting ("
+                                     + e.getMessage() + ")");
+        } catch (I2PException e) {
+            try {
+                sendRequestReply(Reply.CONNECTION_REFUSED, InetAddress.getByName("127.0.0.1"), 0, out);
+            } catch (IOException ioe) {}
+            throw new SOCKSException("Error connecting ("
+                                     + e.getMessage() + ")");
+        }
+
+        return destSock;
+    }
+
+    /*
+     * Some namespaces to enclose SOCKS protocol codes
+     */
+    private static class Command {
+        private static final int CONNECT = 0x01;
+        private static final int BIND = 0x02;
+    }
+
+    private static class Reply {
+        private static final int SUCCEEDED = 0x5a;
+        private static final int CONNECTION_REFUSED = 0x5b;
+    }
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKS5Server.java

@@ -12,7 +12,17 @@ import java.io.DataOutputStream;
 import java.io.IOException;
 import java.net.InetAddress;
 import java.net.Socket;
+import java.net.SocketException;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.List;
 
+import net.i2p.I2PAppContext;
+import net.i2p.I2PException;
+import net.i2p.client.streaming.I2PSocket;
+import net.i2p.data.DataFormatException;
+import net.i2p.data.Destination;
+import net.i2p.i2ptunnel.I2PTunnel;
 import net.i2p.util.HexDump;
 import net.i2p.util.Log;
 
@@ -28,7 +38,6 @@ public class SOCKS5Server extends SOCKSServer {
     private static final int SOCKS_VERSION_5 = 0x05;
 
     private Socket clientSock = null;
-
     private boolean setupCompleted = false;
 
     /**
@@ -61,7 +70,8 @@ public class SOCKS5Server extends SOCKSServer {
             out = new DataOutputStream(clientSock.getOutputStream());
 
             init(in, out);
-            manageRequest(in, out);
+            if (manageRequest(in, out) == Command.UDP_ASSOCIATE)
+                handleUDP(in, out);
         } catch (IOException e) {
             throw new SOCKSException("Connection error (" + e.getMessage() + ")");
         }
@@ -105,7 +115,7 @@ public class SOCKS5Server extends SOCKSServer {
      * initialization, integrity/confidentiality encapsulations, etc)
      * has been stripped out of the input/output streams.
      */
-    private void manageRequest(DataInputStream in, DataOutputStream out) throws IOException, SOCKSException {
+    private int manageRequest(DataInputStream in, DataOutputStream out) throws IOException, SOCKSException {
         int socksVer = in.readByte() & 0xff;
         if (socksVer != SOCKS_VERSION_5) {
             _log.debug("error in SOCKS5 request (protocol != 5? wtf?)");
@@ -121,11 +131,15 @@ public class SOCKS5Server extends SOCKSServer {
             sendRequestReply(Reply.COMMAND_NOT_SUPPORTED, AddressType.DOMAINNAME, null, "0.0.0.0", 0, out);
             throw new SOCKSException("BIND command not supported");
         case Command.UDP_ASSOCIATE:
+          /*** if(!Boolean.valueOf(tunnel.getOptions().getProperty("i2ptunnel.socks.allowUDP")).booleanValue()) {
             _log.debug("UDP ASSOCIATE command is not supported!");
             sendRequestReply(Reply.COMMAND_NOT_SUPPORTED, AddressType.DOMAINNAME, null, "0.0.0.0", 0, out);
             throw new SOCKSException("UDP ASSOCIATE command not supported");
+           ***/
+            break;
         default:
             _log.debug("unknown command in request (" + Integer.toHexString(command) + ")");
+            sendRequestReply(Reply.COMMAND_NOT_SUPPORTED, AddressType.DOMAINNAME, null, "0.0.0.0", 0, out);
             throw new SOCKSException("Invalid command in request");
         }
 
@@ -145,7 +159,8 @@ public class SOCKS5Server extends SOCKSServer {
                     connHostName += ".";
                 }
             }
-            _log.warn("IPV4 address type in request: " + connHostName + ". Is your client secure?");
+            if (command != Command.UDP_ASSOCIATE)
+                _log.warn("IPV4 address type in request: " + connHostName + ". Is your client secure?");
             break;
         case AddressType.DOMAINNAME:
             {
@@ -161,19 +176,25 @@ public class SOCKS5Server extends SOCKSServer {
             _log.debug("DOMAINNAME address type in request: " + connHostName);
             break;
         case AddressType.IPV6:
-            _log.warn("IP V6 address type in request! Is your client secure?" + " (IPv6 is not supported, anyway :-)");
-            sendRequestReply(Reply.ADDRESS_TYPE_NOT_SUPPORTED, AddressType.DOMAINNAME, null, "0.0.0.0", 0, out);
-            throw new SOCKSException("IPV6 addresses not supported");
+            if (command != Command.UDP_ASSOCIATE) {
+                _log.warn("IP V6 address type in request! Is your client secure?" + " (IPv6 is not supported, anyway :-)");
+                sendRequestReply(Reply.ADDRESS_TYPE_NOT_SUPPORTED, AddressType.DOMAINNAME, null, "0.0.0.0", 0, out);
+                throw new SOCKSException("IPV6 addresses not supported");
+            }
+            break;
         default:
             _log.debug("unknown address type in request (" + Integer.toHexString(command) + ")");
+            sendRequestReply(Reply.ADDRESS_TYPE_NOT_SUPPORTED, AddressType.DOMAINNAME, null, "0.0.0.0", 0, out);
             throw new SOCKSException("Invalid addresses type in request");
         }
 
         connPort = in.readUnsignedShort();
         if (connPort == 0) {
             _log.debug("trying to connect to TCP port 0?  Dropping!");
+            sendRequestReply(Reply.CONNECTION_NOT_ALLOWED_BY_RULESET, AddressType.DOMAINNAME, null, "0.0.0.0", 0, out);
             throw new SOCKSException("Invalid port number in request");
         }
+        return command;
     }
 
     protected void confirmConnection() throws SOCKSException {
@@ -248,27 +269,188 @@ public class SOCKS5Server extends SOCKSServer {
         out.write(reply);
     }
 
+    /**
+     * Get an I2PSocket that can be used to send/receive 8-bit clean data
+     * to/from the destination of the SOCKS connection.
+     *
+     * @return an I2PSocket connected with the destination
+     */
+    public I2PSocket getDestinationI2PSocket(I2PSOCKSTunnel t) throws SOCKSException {
+        setupServer();
+
+        if (connHostName == null) {
+            _log.error("BUG: destination host name has not been initialized!");
+            throw new SOCKSException("BUG! See the logs!");
+        }
+        if (connPort == 0) {
+            _log.error("BUG: destination port has not been initialized!");
+            throw new SOCKSException("BUG! See the logs!");
+        }
+
+        DataOutputStream out; // for errors
+        try {
+            out = new DataOutputStream(clientSock.getOutputStream());
+        } catch (IOException e) {
+            throw new SOCKSException("Connection error (" + e.getMessage() + ")");
+        }
+
+        // FIXME: here we should read our config file, select an
+        // outproxy, and instantiate the proper socket class that
+        // handles the outproxy itself (SOCKS4a, SOCKS5, HTTP CONNECT...).
+        I2PSocket destSock;
+
+        try {
+            if (connHostName.toLowerCase().endsWith(".i2p")) {
+                _log.debug("connecting to " + connHostName + "...");
+                // Let's not due a new Dest for every request, huh?
+                //I2PSocketManager sm = I2PSocketManagerFactory.createManager();
+                //destSock = sm.connect(I2PTunnel.destFromName(connHostName), null);
+                Destination dest = I2PTunnel.destFromName(connHostName);
+                if (dest == null) {
+                    try {
+                        sendRequestReply(Reply.HOST_UNREACHABLE, AddressType.DOMAINNAME, null, "0.0.0.0", 0, out);
+                    } catch (IOException ioe) {}
+                    throw new SOCKSException("Host not found");
+                }
+                destSock = t.createI2PSocket(I2PTunnel.destFromName(connHostName));
+            } else if ("localhost".equals(connHostName) || "127.0.0.1".equals(connHostName)) {
+                String err = "No localhost accesses allowed through the Socks Proxy";
+                _log.error(err);
+                try {
+                    sendRequestReply(Reply.CONNECTION_NOT_ALLOWED_BY_RULESET, AddressType.DOMAINNAME, null, "0.0.0.0", 0, out);
+                } catch (IOException ioe) {}
+                throw new SOCKSException(err);
+            } else if (connPort == 80) {
+                // rewrite GET line to include hostname??? or add Host: line???
+                // or forward to local eepProxy (but that's a Socket not an I2PSocket)
+                // use eepProxy configured outproxies?
+                String err = "No handler for HTTP outproxy implemented";
+                _log.error(err);
+                try {
+                    sendRequestReply(Reply.CONNECTION_NOT_ALLOWED_BY_RULESET, AddressType.DOMAINNAME, null, "0.0.0.0", 0, out);
+                } catch (IOException ioe) {}
+                throw new SOCKSException(err);
+            } else {
+                List<String> proxies = t.getProxies(connPort);
+                if (proxies == null || proxies.size() <= 0) {
+                    String err = "No outproxy configured for port " + connPort + " and no default configured either";
+                    _log.error(err);
+                    try {
+                        sendRequestReply(Reply.CONNECTION_NOT_ALLOWED_BY_RULESET, AddressType.DOMAINNAME, null, "0.0.0.0", 0, out);
+                    } catch (IOException ioe) {}
+                    throw new SOCKSException(err);
+                }
+                int p = I2PAppContext.getGlobalContext().random().nextInt(proxies.size());
+                String proxy = proxies.get(p);
+                _log.debug("connecting to port " + connPort + " proxy " + proxy + " for " + connHostName + "...");
+                // this isn't going to work, these need to be socks outproxies so we need
+                // to do a socks session to them?
+                destSock = t.createI2PSocket(I2PTunnel.destFromName(proxy));
+            }
+            confirmConnection();
+            _log.debug("connection confirmed - exchanging data...");
+        } catch (DataFormatException e) {
+            try {
+                sendRequestReply(Reply.HOST_UNREACHABLE, AddressType.DOMAINNAME, null, "0.0.0.0", 0, out);
+            } catch (IOException ioe) {}
+            throw new SOCKSException("Error in destination format");
+        } catch (SocketException e) {
+            try {
+                sendRequestReply(Reply.HOST_UNREACHABLE, AddressType.DOMAINNAME, null, "0.0.0.0", 0, out);
+            } catch (IOException ioe) {}
+            throw new SOCKSException("Error connecting ("
+                                     + e.getMessage() + ")");
+        } catch (IOException e) {
+            try {
+                sendRequestReply(Reply.HOST_UNREACHABLE, AddressType.DOMAINNAME, null, "0.0.0.0", 0, out);
+            } catch (IOException ioe) {}
+            throw new SOCKSException("Error connecting ("
+                                     + e.getMessage() + ")");
+        } catch (I2PException e) {
+            try {
+                sendRequestReply(Reply.HOST_UNREACHABLE, AddressType.DOMAINNAME, null, "0.0.0.0", 0, out);
+            } catch (IOException ioe) {}
+            throw new SOCKSException("Error connecting ("
+                                     + e.getMessage() + ")");
+        }
+
+        return destSock;
+    }
+
+    // This isn't really the right place for this, we can't stop the tunnel once it starts.
+    static SOCKSUDPTunnel _tunnel;
+    static Object _startLock = new Object();
+    static byte[] dummyIP = new byte[4];
+    /**
+     * We got a UDP associate command.
+     * Loop here looking for more, never return normally,
+     * or else I2PSocksTunnel will create a streaming lib connection.
+     *
+     * Do UDP Socks clients actually send more than one Associate request?
+     * RFC 1928 isn't clear... maybe not.
+     */
+    private void handleUDP(DataInputStream in, DataOutputStream out) throws SOCKSException {
+        List<Integer> ports = new ArrayList(1);
+        synchronized (_startLock) {
+            if (_tunnel == null) {
+                // tunnel options?
+                _tunnel = new SOCKSUDPTunnel(new I2PTunnel());
+                _tunnel.startRunning();
+            }
+        }
+        while (true) {
+            // Set it up. connHostName and connPort are the client's info.
+            InetAddress ia = null;
+            try {
+                ia = InetAddress.getByAddress(connHostName, dummyIP);
+            } catch (UnknownHostException uhe) {} // won't happen, no resolving done here
+            int myPort = _tunnel.add(ia, connPort);
+            ports.add(Integer.valueOf(myPort));
+            try {
+                sendRequestReply(Reply.SUCCEEDED, AddressType.IPV4, InetAddress.getByName("127.0.0.1"), null, myPort, out);
+            } catch (IOException ioe) { break; }
+
+            // wait for more ???
+            try {
+                int command = manageRequest(in, out);
+                // don't do this...
+                if (command != Command.UDP_ASSOCIATE)
+                    break;
+            } catch (IOException ioe) { break; }
+            catch (SOCKSException ioe) { break; }
+        }
+
+        for (Integer i : ports)
+            _tunnel.remove(i);
+
+        // Prevent I2PSocksTunnel from calling getDestinationI2PSocket() above
+        // to create a streaming lib connection...
+        // This isn't very elegant...
+        //
+        throw new SOCKSException("End of UDP Processing");
+    }
+
     /*
      * Some namespaces to enclose SOCKS protocol codes
      */
-    private class Method {
+    private static class Method {
         private static final int NO_AUTH_REQUIRED = 0x00;
         private static final int NO_ACCEPTABLE_METHODS = 0xff;
     }
 
-    private class AddressType {
+    private static class AddressType {
         private static final int IPV4 = 0x01;
         private static final int DOMAINNAME = 0x03;
         private static final int IPV6 = 0x04;
     }
 
-    private class Command {
+    private static class Command {
         private static final int CONNECT = 0x01;
         private static final int BIND = 0x02;
         private static final int UDP_ASSOCIATE = 0x03;
     }
 
-    private class Reply {
+    private static class Reply {
         private static final int SUCCEEDED = 0x00;
         private static final int GENERAL_SOCKS_SERVER_FAILURE = 0x01;
         private static final int CONNECTION_NOT_ALLOWED_BY_RULESET = 0x02;
@@ -279,4 +461,4 @@ public class SOCKS5Server extends SOCKSServer {
         private static final int COMMAND_NOT_SUPPORTED = 0x07;
         private static final int ADDRESS_TYPE_NOT_SUPPORTED = 0x08;
     }
-}
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSHeader.java

@@ -0,0 +1,89 @@
+package net.i2p.i2ptunnel.socks;
+
+import net.i2p.data.Base32;
+import net.i2p.data.DataFormatException;
+import net.i2p.data.Destination;
+import net.i2p.i2ptunnel.I2PTunnel;
+
+/**
+ * Save the SOCKS header from a datagram
+ * Ref: RFC 1928
+ *
+ * @author zzz
+ */
+public class SOCKSHeader {
+
+    /**
+     * @param data the whole packet
+     */
+    public SOCKSHeader(byte[] data) {
+        if (data.length <= 8)
+            throw new IllegalArgumentException("Header too short: " + data.length);
+        if (data[0] != 0 || data[1] != 0)
+            throw new IllegalArgumentException("Not a SOCKS datagram?");
+        if (data[2] != 0)
+            throw new IllegalArgumentException("We can't handle fragments!");
+        int headerlen = 0;
+        int addressType = data[3];
+        if (addressType == 1) {
+            // this will fail in getDestination()
+            headerlen = 6 + 4;
+        } else if (addressType == 3) {
+            headerlen = 6 + 1 + (data[4] & 0xff);
+        } else if (addressType == 4) {
+            // this will fail in getDestination()
+            // but future garlicat partial hash lookup possible?
+            headerlen = 6 + 16;
+        } else {
+            throw new IllegalArgumentException("Unknown address type: " + addressType);
+        }
+        if (data.length < headerlen)
+            throw new IllegalArgumentException("Header too short: " + data.length);
+
+        this.header = new byte[headerlen];
+        System.arraycopy(this.header, 0, data, 0, headerlen);
+    }
+    
+    private static final byte[] beg = {0,0,0,3,60};
+    private static final byte[] end = {'.','b','3','2','.','i','2','p',0,0};
+
+    /**
+     *  Make a dummy header from a dest,
+     *  for those cases where we want to receive unsolicited datagrams.
+     *  Unused for now.
+     */
+    public SOCKSHeader(Destination dest) {
+        this.header = new byte[beg.length + 52 + end.length];
+        System.arraycopy(this.header, 0, beg, 0, beg.length);
+        String b32 = Base32.encode(dest.calculateHash().getData());
+        System.arraycopy(this.header, beg.length, b32.getBytes(), 0, 52);
+        System.arraycopy(this.header, beg.length + 52, end, 0, end.length);
+    }
+    
+    public String getHost() {
+        int addressType = this.header[3];
+        if (addressType != 3)
+            return null;
+        int namelen = (this.header[4] & 0xff);
+        byte[] nameBytes = new byte[namelen];
+        System.arraycopy(nameBytes, 0, this.header, 5, namelen);
+        return new String(nameBytes);
+    }
+
+    public Destination getDestination() {
+        String name = getHost();
+        if (name == null)
+            return null;
+        try {
+            // the naming service does caching (thankfully)
+            return I2PTunnel.destFromName(name);
+        } catch (DataFormatException dfe) {}
+        return null;
+    }
+
+    public byte[] getBytes() {
+        return header;
+    }
+
+    private byte[] header;
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSServer.java

@@ -6,15 +6,9 @@
  */
 package net.i2p.i2ptunnel.socks;
 
-import java.io.IOException;
 import java.net.Socket;
-import java.net.SocketException;
 
-import net.i2p.I2PException;
 import net.i2p.client.streaming.I2PSocket;
-import net.i2p.client.streaming.I2PSocketManager;
-import net.i2p.client.streaming.I2PSocketManagerFactory;
-import net.i2p.data.DataFormatException;
 import net.i2p.i2ptunnel.I2PTunnel;
 import net.i2p.util.Log;
 
@@ -30,10 +24,6 @@ public abstract class SOCKSServer {
     protected String connHostName = null;
     protected int connPort = 0;
 
-    I2PSocket destSocket = null;
-
-    Object FIXME = new Object();
-
     /**
      * Perform server initialization (expecially regarding protected
      * variables).
@@ -59,47 +49,6 @@ public abstract class SOCKSServer {
      *
      * @return an I2PSocket connected with the destination
      */
-    public I2PSocket getDestinationI2PSocket() throws SOCKSException {
-        setupServer();
+    public abstract I2PSocket getDestinationI2PSocket(I2PSOCKSTunnel t) throws SOCKSException;
 
-        if (connHostName == null) {
-            _log.error("BUG: destination host name has not been initialized!");
-            throw new SOCKSException("BUG! See the logs!");
-        }
-        if (connPort == 0) {
-            _log.error("BUG: destination port has not been initialized!");
-            throw new SOCKSException("BUG! See the logs!");
-        }
-
-        // FIXME: here we should read our config file, select an
-        // outproxy, and instantiate the proper socket class that
-        // handles the outproxy itself (SOCKS4a, SOCKS5, HTTP CONNECT...).
-        I2PSocket destSock;
-
-        try {
-            if (connHostName.toLowerCase().endsWith(".i2p")) {
-                _log.debug("connecting to " + connHostName + "...");
-                I2PSocketManager sm = I2PSocketManagerFactory.createManager();
-                destSock = sm.connect(I2PTunnel.destFromName(connHostName), null);
-                confirmConnection();
-                _log.debug("connection confirmed - exchanging data...");
-            } else {
-                _log.error("We don't support outproxies (yet)");
-                throw new SOCKSException("Ouproxies not supported (yet)");
-            }
-        } catch (DataFormatException e) {
-            throw new SOCKSException("Error in destination format");
-        } catch (SocketException e) {
-            throw new SOCKSException("Error connecting ("
-                                     + e.getMessage() + ")");
-        } catch (IOException e) {
-            throw new SOCKSException("Error connecting ("
-                                     + e.getMessage() + ")");
-        } catch (I2PException e) {
-            throw new SOCKSException("Error connecting ("
-                                     + e.getMessage() + ")");
-        }
-
-        return destSock;
-    }
 }

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSServerFactory.java

@@ -7,6 +7,7 @@
 package net.i2p.i2ptunnel.socks;
 
 import java.io.DataInputStream;
+import java.io.DataOutputStream;
 import java.io.IOException;
 import java.net.Socket;
 
@@ -18,6 +19,15 @@ import net.i2p.util.Log;
 public class SOCKSServerFactory {
     private final static Log _log = new Log(SOCKSServerFactory.class);
 
+    private final static String ERR_REQUEST_DENIED =
+        "HTTP/1.1 403 Access Denied\r\n" +
+        "Content-Type: text/html; charset=iso-8859-1\r\n" +
+        "Cache-control: no-cache\r\n" +
+        "\r\n" +
+        "<html><body><H1>I2P SOCKS PROXY ERROR: REQUEST DENIED</H1>" +
+        "Your browser is misconfigured. This is a SOCKS proxy, not a HTTP proxy" +
+        "</body></html>";
+    
     /**
      * Create a new SOCKS server, using the provided socket (that must
      * be connected to a client) to select the proper SOCKS protocol
@@ -34,13 +44,23 @@ public class SOCKSServerFactory {
             int socksVer = in.readByte();
 
             switch (socksVer) {
+            case 0x04:
+                // SOCKS version 4/4a
+                serv = new SOCKS4aServer(s);
+                break;
             case 0x05:
                 // SOCKS version 5
                 serv = new SOCKS5Server(s);
                 break;
+            case 'C':
+            case 'G':
+            case 'H':
+            case 'P':
+                DataOutputStream out = new DataOutputStream(s.getOutputStream());
+                out.write(ERR_REQUEST_DENIED.getBytes());
+                throw new SOCKSException("HTTP request to socks");
             default:
-                _log.debug("SOCKS protocol version not supported (" + Integer.toHexString(socksVer) + ")");
-                return null;
+                throw new SOCKSException("SOCKS protocol version not supported (" + Integer.toHexString(socksVer) + ")");
             }
         } catch (IOException e) {
             _log.debug("error reading SOCKS protocol version");
@@ -49,4 +69,4 @@ public class SOCKSServerFactory {
 
         return serv;
     }
-}
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSUDPPort.java

@@ -0,0 +1,77 @@
+package net.i2p.i2ptunnel.socks;
+
+import java.net.DatagramSocket;
+import java.net.InetAddress;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.Map;
+
+import net.i2p.data.Destination;
+import net.i2p.i2ptunnel.udp.*;
+
+/**
+ * Implements a UDP port and Socks encapsulation / decapsulation.
+ * This is for a single port. If there is demuxing for multiple
+ * ports, it happens outside of here.
+ *
+ * TX:
+ *   UDPSource -> SOCKSUDPUnwrapper -> ReplyTracker ( -> I2PSink in SOCKSUDPTunnel)
+ *
+ * RX:
+ *   UDPSink <- SOCKSUDPWrapper ( <- MultiSink <- I2PSource in SOCKSUDPTunnel)
+ *
+ * The Unwrapper passes headers to the Wrapper through a cache.
+ * The ReplyTracker passes sinks to MultiSink through a cache.
+ *
+ * @author zzz
+ */
+public class SOCKSUDPPort implements Source, Sink {
+
+    public SOCKSUDPPort(InetAddress host, int port, Map replyMap) {
+
+        // this passes the host and port from UDPUnwrapper to UDPWrapper
+        Map cache = new ConcurrentHashMap(4);
+
+        // rcv from I2P and send to a port
+        this.wrapper = new SOCKSUDPWrapper(cache);
+        this.udpsink = new UDPSink(host, port);
+        this.wrapper.setSink(this.udpsink);
+        
+        // rcv from the same port and send to I2P
+        DatagramSocket sock = this.udpsink.getSocket();
+        this.udpsource = new UDPSource(sock);
+        this.unwrapper = new SOCKSUDPUnwrapper(cache);
+        this.udpsource.setSink(this.unwrapper);
+        this.udptracker = new ReplyTracker(this, replyMap);
+        this.unwrapper.setSink(this.udptracker);
+    }
+
+    /** Socks passes this back to the client on the TCP connection */
+    public int getPort() {
+        return this.udpsink.getPort();
+    }
+
+    public void setSink(Sink sink) {
+        this.udptracker.setSink(sink);
+    }
+
+    public void start() {
+        // the other Sources don't use start
+        this.udpsource.start();
+    }
+
+    public void stop() {
+        this.udpsink.stop();
+        this.udpsource.stop();
+    }
+
+    public void send(Destination from, byte[] data) {
+        this.wrapper.send(from, data);
+    }
+    
+
+    private UDPSink udpsink;
+    private UDPSource udpsource;
+    private SOCKSUDPWrapper wrapper;
+    private SOCKSUDPUnwrapper unwrapper;
+    private ReplyTracker udptracker;
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSUDPTunnel.java

@@ -0,0 +1,94 @@
+package net.i2p.i2ptunnel.socks;
+
+import java.net.InetAddress;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.Iterator;
+import java.util.Map;
+
+import net.i2p.data.Destination;
+import net.i2p.i2ptunnel.I2PTunnel;
+import net.i2p.i2ptunnel.Logging;
+import net.i2p.i2ptunnel.udp.*;
+import net.i2p.i2ptunnel.udpTunnel.I2PTunnelUDPClientBase;
+import net.i2p.util.EventDispatcher;
+
+/**
+ * A Datagram Tunnel that can have multiple bidirectional ports on the UDP side.
+ *
+ * TX:
+ *   (ReplyTracker in multiple SOCKSUDPPorts -> ) I2PSink
+ *
+ * RX:
+ *   (SOCKSUDPWrapper in multiple SOCKSUDPPorts <- ) MultiSink <- I2PSource
+ *
+ * The reply from a dest goes to the last SOCKSUDPPort that sent to that dest.
+ * If multiple ports are talking to a dest at the same time, this isn't
+ * going to work very well.
+ *
+ * @author zzz modded from streamr/StreamrConsumer
+ */
+public class SOCKSUDPTunnel extends I2PTunnelUDPClientBase {
+
+    /**
+     *  Set up a tunnel with no UDP side yet.
+     *  Use add() for each port.
+     */
+    public SOCKSUDPTunnel(I2PTunnel tunnel) {
+        super(null, tunnel, tunnel, tunnel);
+
+        this.ports = new ConcurrentHashMap(1);
+        this.cache = new ConcurrentHashMap(1);
+        this.demuxer = new MultiSink(this.cache);
+        setSink(this.demuxer);
+    }
+
+
+    /** @return the UDP port number */
+    public int add(InetAddress host, int port) {
+        SOCKSUDPPort sup = new SOCKSUDPPort(host, port, this.cache);
+        this.ports.put(Integer.valueOf(sup.getPort()), sup);
+        sup.setSink(this);
+        sup.start();
+        return sup.getPort();
+    }
+
+    public void remove(Integer port) {
+        SOCKSUDPPort sup = this.ports.remove(port);
+        if (sup != null)
+            sup.stop();
+        for (Iterator iter = cache.entrySet().iterator(); iter.hasNext();) {
+            Map.Entry<Destination, SOCKSUDPPort> e = (Map.Entry) iter.next();
+            if (e.getValue() == sup)
+                iter.remove();
+        }
+    }
+    
+    public final void startRunning() {
+        super.startRunning();
+        // demuxer start() doesn't do anything
+        startall();
+    }
+    
+    public boolean close(boolean forced) {
+        stopall();
+        return super.close(forced);
+    }
+
+    /** you should really add() after startRunning() */
+    private void startall() {
+    }
+
+    private void stopall() {
+         for (SOCKSUDPPort sup : this.ports.values()) {
+              sup.stop();
+         }
+         this.ports.clear();
+         this.cache.clear();
+    }
+
+
+
+    private Map<Integer, SOCKSUDPPort> ports;
+    private Map<Destination, SOCKSUDPPort> cache;
+    private MultiSink demuxer;
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSUDPUnwrapper.java

@@ -0,0 +1,59 @@
+package net.i2p.i2ptunnel.socks;
+
+import java.util.Map;
+
+import net.i2p.data.Destination;
+import net.i2p.i2ptunnel.udp.*;
+import net.i2p.util.Log;
+
+/**
+ * Strip a SOCKS header off a datagram, convert it to a Destination
+ * Ref: RFC 1928
+ *
+ * @author zzz
+ */
+public class SOCKSUDPUnwrapper implements Source, Sink {
+    private static final Log _log = new Log(SOCKSUDPUnwrapper.class);
+
+    /**
+     * @param cache put headers here to pass to SOCKSUDPWrapper
+     */
+    public SOCKSUDPUnwrapper(Map<Destination, SOCKSHeader> cache) {
+        this.cache = cache;
+    }
+    
+    public void setSink(Sink sink) {
+        this.sink = sink;
+    }
+
+    public void start() {}
+
+    /**
+     *
+     */
+    public void send(Destination ignored_from, byte[] data) {
+        SOCKSHeader h;
+        try {
+            h = new SOCKSHeader(data);
+        } catch (IllegalArgumentException iae) {
+            _log.error(iae.toString());
+            return;
+        }
+        Destination dest = h.getDestination();
+        if (dest == null) {
+            // no, we aren't going to send non-i2p traffic to a UDP outproxy :)
+            _log.error("Destination not found: " + h.getHost());
+            return;
+        }
+
+        cache.put(dest, h);
+
+        int headerlen = h.getBytes().length;
+        byte unwrapped[] = new byte[data.length - headerlen];
+        System.arraycopy(unwrapped, 0, data, headerlen, unwrapped.length);
+        this.sink.send(dest, unwrapped);
+    }
+    
+    private Sink sink;
+    private Map<Destination, SOCKSHeader> cache;
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/socks/SOCKSUDPWrapper.java

@@ -0,0 +1,49 @@
+package net.i2p.i2ptunnel.socks;
+
+import java.util.Map;
+
+import net.i2p.data.Destination;
+import net.i2p.i2ptunnel.udp.*;
+
+/**
+ * Put a SOCKS header on a datagram
+ * Ref: RFC 1928
+ *
+ * @author zzz
+ */
+public class SOCKSUDPWrapper implements Source, Sink {
+    public SOCKSUDPWrapper(Map<Destination, SOCKSHeader> cache) {
+        this.cache = cache;
+    }
+    
+    public void setSink(Sink sink) {
+        this.sink = sink;
+    }
+
+    public void start() {}
+
+    /**
+     * Use the cached header, which should have the host string and port
+     *
+     */
+    public void send(Destination from, byte[] data) {
+        if (this.sink == null)
+            return;
+
+        SOCKSHeader h = cache.get(from);
+        if (h == null) {
+            // RFC 1928 says drop
+            // h = new SOCKSHeader(from);
+            return;
+        }
+
+        byte[] header = h.getBytes();
+        byte wrapped[] = new byte[header.length + data.length];
+        System.arraycopy(wrapped, 0, header, 0, header.length);
+        System.arraycopy(wrapped, header.length, data, 0, data.length);
+        this.sink.send(from, wrapped);
+    }
+    
+    private Sink sink;
+    private Map<Destination, SOCKSHeader> cache;
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/streamr/MultiSource.java

@@ -0,0 +1,64 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package net.i2p.i2ptunnel.streamr;
+
+import java.util.concurrent.CopyOnWriteArrayList;
+import java.util.List;
+
+import net.i2p.data.Destination;
+import net.i2p.i2ptunnel.udp.*;
+
+/**
+ * Sends to many Sinks
+ * @author welterde
+ * @author zzz modded for I2PTunnel
+ */
+public class MultiSource implements Source, Sink {
+    public MultiSource() {
+        this.sinks = new CopyOnWriteArrayList<Destination>();
+    }
+    
+    public void setSink(Sink sink) {
+        this.sink = sink;
+    }
+
+    public void start() {}
+
+    public void stop() {
+        this.sinks.clear();
+    }
+
+    public void send(Destination ignored_from, byte[] data) {
+        for(Destination dest : this.sinks) {
+            this.sink.send(dest, data);
+        }
+    }
+    
+    public void add(Destination sink) {
+        this.sinks.add(sink);
+    }
+    
+    public void remove(Destination sink) {
+        this.sinks.remove(sink);
+    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    private Sink sink;
+    private List<Destination> sinks;
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/streamr/Pinger.java

@@ -0,0 +1,59 @@
+package net.i2p.i2ptunnel.streamr;
+
+import net.i2p.i2ptunnel.udp.*;
+
+/**
+ *
+ * @author welterde/zzz
+ */
+public class Pinger implements Source, Runnable {
+    public Pinger() {
+        this.thread = new Thread(this);
+    }
+    public void setSink(Sink sink) {
+        this.sink = sink;
+    }
+    
+    public void start() {
+        this.running = true;
+        this.waitlock = new Object();
+        this.thread.start();
+    }
+    
+    public void stop() {
+        this.running = false;
+        synchronized(this.waitlock) {
+            this.waitlock.notifyAll();
+        }
+        // send unsubscribe-message
+        byte[] data = new byte[1];
+        data[0] = 1;
+        this.sink.send(null, data);
+    }
+    
+    public void run() {
+        // send subscribe-message
+        byte[] data = new byte[1];
+        data[0] = 0;
+        int i = 0;
+        while(this.running) {
+            //System.out.print("p");
+            this.sink.send(null, data);
+            synchronized(this.waitlock) {
+                int delay = 10000;
+                if (i < 5) {
+                    i++;
+                    delay = 2000;
+                }
+                try {
+                    this.waitlock.wait(delay);
+                } catch(InterruptedException ie) {}
+            }
+        }
+    }
+
+    protected Sink sink;
+    protected Thread thread;
+    protected Object waitlock;
+    protected boolean running;
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/streamr/StreamrConsumer.java

@@ -0,0 +1,66 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package net.i2p.i2ptunnel.streamr;
+
+import java.net.InetAddress;
+
+import net.i2p.data.Destination;
+import net.i2p.i2ptunnel.I2PTunnel;
+import net.i2p.i2ptunnel.Logging;
+import net.i2p.i2ptunnel.udp.*;
+import net.i2p.i2ptunnel.udpTunnel.I2PTunnelUDPClientBase;
+import net.i2p.util.EventDispatcher;
+
+/**
+ * Compared to a standard I2PTunnel,
+ * this acts like a client on the I2P side (no privkey file)
+ * but a server on the UDP side (sends to a configured host/port)
+ *
+ * @author welterde
+ * @author zzz modded for I2PTunnel
+ */
+public class StreamrConsumer extends I2PTunnelUDPClientBase {
+
+    public StreamrConsumer(InetAddress host, int port, String destination,
+                           Logging l, EventDispatcher notifyThis,
+                           I2PTunnel tunnel) {
+        super(destination, l, notifyThis, tunnel);
+
+        // create udp-destination
+        this.sink = new UDPSink(host, port);
+        setSink(this.sink);
+        
+        // create pinger
+        this.pinger = new Pinger();
+        this.pinger.setSink(this);
+    }
+    
+    public final void startRunning() {
+        super.startRunning();
+        // send subscribe-message
+        this.pinger.start();
+        l.log("Streamr client ready");
+    }
+    
+    public boolean close(boolean forced) {
+        // send unsubscribe-message
+        this.pinger.stop();
+        this.sink.stop();
+        return super.close(forced);
+    }
+
+
+
+
+
+
+
+
+    
+    
+    private UDPSink sink;
+    private Pinger pinger;
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/streamr/StreamrProducer.java

@@ -0,0 +1,72 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package net.i2p.i2ptunnel.streamr;
+
+// system
+import java.io.File;
+
+// i2p
+import net.i2p.client.I2PSession;
+import net.i2p.i2ptunnel.I2PTunnel;
+import net.i2p.i2ptunnel.Logging;
+import net.i2p.i2ptunnel.udp.*;
+import net.i2p.i2ptunnel.udpTunnel.I2PTunnelUDPServerBase;
+import net.i2p.util.EventDispatcher;
+
+/**
+ * Compared to a standard I2PTunnel,
+ * this acts like a server on the I2P side (persistent privkey file)
+ * but a client on the UDP side (receives on a configured port)
+ *
+ * @author welterde
+ * @author zzz modded for I2PTunnel
+ */
+public class StreamrProducer extends I2PTunnelUDPServerBase {
+
+    public StreamrProducer(int port,
+                           File privkey, String privkeyname, Logging l,
+                           EventDispatcher notifyThis, I2PTunnel tunnel) {
+        // verify subscription requests
+        super(true, privkey, privkeyname, l, notifyThis, tunnel);
+        
+        // The broadcaster
+        this.multi = new MultiSource();
+        this.multi.setSink(this);
+
+        // The listener
+        this.subscriber = new Subscriber(this.multi);
+        setSink(this.subscriber);
+
+        // now start udp-server
+        this.server = new UDPSource(port);
+        this.server.setSink(this.multi);
+    }
+    
+    public final void startRunning() {
+        super.startRunning();
+        this.server.start();
+        l.log("Streamr server ready");
+    }
+    
+    public boolean close(boolean forced) {
+        this.server.stop();
+        this.multi.stop();
+        return super.close(forced);
+    }
+
+
+    
+    
+    
+    
+    
+    
+    
+    
+    private MultiSource multi;
+    private UDPSource server;
+    private Sink subscriber;
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/streamr/Subscriber.java

@@ -0,0 +1,75 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package net.i2p.i2ptunnel.streamr;
+
+// system
+import java.io.File;
+import java.util.Set;
+
+// i2p
+import net.i2p.client.I2PSession;
+import net.i2p.data.Destination;
+import net.i2p.i2ptunnel.I2PTunnel;
+import net.i2p.i2ptunnel.Logging;
+import net.i2p.i2ptunnel.udp.*;
+import net.i2p.i2ptunnel.udpTunnel.I2PTunnelUDPServerBase;
+import net.i2p.util.EventDispatcher;
+import net.i2p.util.ConcurrentHashSet;
+
+/**
+ * server-mode
+ * @author welterde
+ * @author zzz modded from Producer for I2PTunnel
+ */
+public class Subscriber implements Sink {
+
+    public Subscriber(MultiSource multi) {
+        this.multi = multi;
+        // subscriptions
+        this.subscriptions = new ConcurrentHashSet<Destination>();
+    }
+
+    public void send(Destination dest, byte[] data) {
+        if(dest == null || data.length < 1) {
+            // invalid packet
+            // TODO: write to log
+        } else {
+            byte ctrl = data[0];
+            if(ctrl == 0) {
+                if (!this.subscriptions.contains(dest)) {
+                    // subscribe
+                    System.out.println("Add subscription: " + dest.toBase64().substring(0,4));
+                    this.subscriptions.add(dest);
+                    this.multi.add(dest);
+                } // else already subscribed
+            } else if(ctrl == 1) {
+                // unsubscribe
+                System.out.println("Remove subscription: " + dest.toBase64().substring(0,4));
+                boolean removed = this.subscriptions.remove(dest);
+                if(removed)
+                    multi.remove(dest);
+            } else {
+                // invalid packet
+                // TODO: write to log
+            }
+        }
+    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    private I2PSession sess;
+    private Source listener;
+    private Set<Destination> subscriptions;
+    private MultiSource multi;
+    private Source server;
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udp/I2PSink.java

@@ -0,0 +1,71 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package net.i2p.i2ptunnel.udp;
+
+// i2p
+import net.i2p.client.I2PSession;
+import net.i2p.client.I2PSessionException;
+import net.i2p.data.Destination;
+import net.i2p.client.datagram.I2PDatagramMaker;
+
+/**
+ * Producer
+ *
+ * This sends to a fixed destination specified in the constructor
+ *
+ * @author welterde
+ */
+public class I2PSink implements Sink {
+    public I2PSink(I2PSession sess, Destination dest) {
+        this(sess, dest, false);
+    }
+    public I2PSink(I2PSession sess, Destination dest, boolean raw) {
+        this.sess = sess;
+        this.dest = dest;
+        this.raw = raw;
+        
+        // create maker
+        if (!raw)
+            this.maker = new I2PDatagramMaker(this.sess);
+    }
+    
+    /** @param src ignored */
+    public synchronized void send(Destination src, byte[] data) {
+        //System.out.print("w");
+        // create payload
+        byte[] payload;
+        if(!this.raw)
+            payload = this.maker.makeI2PDatagram(data);
+        else
+            payload = data;
+        
+        // send message
+        try {
+            this.sess.sendMessage(this.dest, payload, I2PSession.PROTO_DATAGRAM,
+                                  I2PSession.PORT_UNSPECIFIED, I2PSession.PORT_UNSPECIFIED);
+        } catch(I2PSessionException exc) {
+            // TODO: handle better
+            exc.printStackTrace();
+        }
+    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    protected boolean raw;
+    protected I2PSession sess;
+    protected Destination dest;
+    protected I2PDatagramMaker maker;
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udp/I2PSinkAnywhere.java

@@ -0,0 +1,69 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package net.i2p.i2ptunnel.udp;
+
+// i2p
+import net.i2p.client.I2PSession;
+import net.i2p.client.I2PSessionException;
+import net.i2p.data.Destination;
+import net.i2p.client.datagram.I2PDatagramMaker;
+
+/**
+ * Producer
+ *
+ * This sends to any destination specified in send()
+ *
+ * @author zzz modded from I2PSink by welterde
+ */
+public class I2PSinkAnywhere implements Sink {
+    public I2PSinkAnywhere(I2PSession sess) {
+        this(sess, false);
+    }
+    public I2PSinkAnywhere(I2PSession sess, boolean raw) {
+        this.sess = sess;
+        this.raw = raw;
+        
+        // create maker
+        if (!raw)
+            this.maker = new I2PDatagramMaker(this.sess);
+    }
+    
+    /** @param to - where it's going */
+    public synchronized void send(Destination to, byte[] data) {
+        // create payload
+        byte[] payload;
+        if(!this.raw)
+            payload = this.maker.makeI2PDatagram(data);
+        else
+            payload = data;
+        
+        // send message
+        try {
+            this.sess.sendMessage(to, payload, I2PSession.PROTO_DATAGRAM,
+                                  I2PSession.PORT_UNSPECIFIED, I2PSession.PORT_UNSPECIFIED);
+        } catch(I2PSessionException exc) {
+            // TODO: handle better
+            exc.printStackTrace();
+        }
+    }
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    protected boolean raw;
+    protected I2PSession sess;
+    protected Destination dest;
+    protected I2PDatagramMaker maker;
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udp/I2PSource.java

@@ -0,0 +1,123 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package net.i2p.i2ptunnel.udp;
+
+// system
+import java.util.concurrent.ArrayBlockingQueue;
+import java.util.concurrent.BlockingQueue;
+
+// i2p
+import net.i2p.client.I2PSession;
+import net.i2p.client.I2PSessionListener;
+import net.i2p.client.datagram.I2PDatagramDissector;
+
+/**
+ *
+ * @author welterde
+ */
+public class I2PSource implements Source, Runnable {
+    public I2PSource(I2PSession sess) {
+        this(sess, true, false);
+    }
+    public I2PSource(I2PSession sess, boolean verify) {
+        this(sess, verify, false);
+    }
+    public I2PSource(I2PSession sess, boolean verify, boolean raw) {
+        this.sess = sess;
+        this.sink = null;
+        this.verify = verify;
+        this.raw = raw;
+        
+        // create queue
+        this.queue = new ArrayBlockingQueue(256);
+        
+        // create listener
+        this.sess.setSessionListener(new Listener());
+        
+        // create thread
+        this.thread = new Thread(this);
+    }
+    
+    public void setSink(Sink sink) {
+        this.sink = sink;
+    }
+    
+    public void start() {
+        this.thread.start();
+    }
+    
+    public void run() {
+        // create dissector
+        I2PDatagramDissector diss = new I2PDatagramDissector();
+        while(true) {
+            try {
+                // get id
+                int id = this.queue.take();
+                
+                // receive message
+                byte[] msg = this.sess.receiveMessage(id);
+                
+                if(!this.raw) {
+                    // load datagram into it
+                    diss.loadI2PDatagram(msg);
+                    
+                    // now call sink
+                    if(this.verify)
+                        this.sink.send(diss.getSender(), diss.getPayload());
+                    else
+                        this.sink.send(diss.extractSender(), diss.extractPayload());
+                } else {
+                    // verify is ignored
+                    this.sink.send(null, msg);
+                }
+                //System.out.print("r");
+            } catch(Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+    
+    
+    
+    
+    
+    
+    protected class Listener implements I2PSessionListener {
+
+        public void messageAvailable(I2PSession sess, int id, long size) {
+            try {
+                queue.put(id);
+            } catch(Exception e) {
+                // ignore
+            }
+        }
+
+        public void reportAbuse(I2PSession arg0, int arg1) {
+            // ignore
+        }
+
+        public void disconnected(I2PSession arg0) {
+            // ignore
+        }
+
+        public void errorOccurred(I2PSession arg0, String arg1, Throwable arg2) {
+            // ignore
+        }
+        
+    }
+    
+    
+    
+    
+    
+    
+    protected I2PSession sess;
+    protected BlockingQueue<Integer> queue;
+    protected Sink sink;
+    protected Thread thread;
+    protected boolean verify;
+    protected boolean raw;
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udp/Sink.java

@@ -0,0 +1,17 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package net.i2p.i2ptunnel.udp;
+
+// i2p
+import net.i2p.data.Destination;
+
+/**
+ *
+ * @author welterde
+ */
+public interface Sink {
+    public void send(Destination src, byte[] data);
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udp/Source.java

@@ -0,0 +1,15 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package net.i2p.i2ptunnel.udp;
+
+/**
+ *
+ * @author welterde
+ */
+public interface Source {
+    public void setSink(Sink sink);
+    public void start();
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udp/Stream.java

@@ -0,0 +1,15 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package net.i2p.i2ptunnel.udp;
+
+/**
+ *
+ * @author welterde
+ */
+public interface Stream {
+    public void start();
+    public void stop();
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udp/UDPSink.java

@@ -0,0 +1,77 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package net.i2p.i2ptunnel.udp;
+
+// system
+import java.net.DatagramSocket;
+import java.net.DatagramPacket;
+import java.net.InetAddress;
+
+// i2p
+import net.i2p.data.Destination;
+
+/**
+ *
+ * @author welterde
+ */
+public class UDPSink implements Sink {
+    public UDPSink(InetAddress host, int port) {
+        // create socket
+        try {
+            this.sock = new DatagramSocket();
+        } catch(Exception e) {
+            // TODO: fail better
+            throw new RuntimeException("failed to open udp-socket", e);
+        }
+        
+        this.remoteHost = host;
+        
+        // remote port
+        this.remotePort = port;
+    }
+    
+    public void send(Destination src, byte[] data) {
+        // if data.length > this.sock.getSendBufferSize() ...
+
+        // create packet
+        DatagramPacket packet = new DatagramPacket(data, data.length, this.remoteHost, this.remotePort);
+        
+        // send packet
+        try {
+            this.sock.send(packet);
+        } catch(Exception e) {
+            // TODO: fail a bit better
+            e.printStackTrace();
+        }
+    }
+    
+    public int getPort() {    
+        return this.sock.getLocalPort();    
+    }    
+    
+    /** to pass to UDPSource constructor */
+    public DatagramSocket getSocket() {    
+        return this.sock;    
+    }    
+    
+    public void stop() {    
+        this.sock.close();    
+    }    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    protected DatagramSocket sock;
+    protected InetAddress remoteHost;
+    protected int remotePort;
+
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udp/UDPSource.java

@@ -0,0 +1,91 @@
+/*
+ * To change this template, choose Tools | Templates
+ * and open the template in the editor.
+ */
+
+package net.i2p.i2ptunnel.udp;
+
+// system
+import java.net.DatagramSocket;
+import java.net.DatagramPacket;
+
+/**
+ *
+ * @author welterde
+ */
+public class UDPSource implements Source, Runnable {
+    public static final int MAX_SIZE = 15360;
+    public UDPSource(int port) {
+        this.sink = null;
+        
+        // create udp-socket
+        try {
+            this.sock = new DatagramSocket(port);
+        } catch(Exception e) {
+            throw new RuntimeException("failed to listen...", e);
+        }
+        
+        // create thread
+        this.thread = new Thread(this);
+    }
+
+    /** use socket from UDPSink */
+    public UDPSource(DatagramSocket sock) {
+        this.sink = null;
+        this.sock = sock;
+        this.thread = new Thread(this);
+    }
+    
+    public void setSink(Sink sink) {
+        this.sink = sink;
+    }
+    
+    public void start() {
+        this.thread.start();
+    }
+    
+    public void run() {
+        // create packet
+        byte[] buf = new byte[MAX_SIZE];
+        DatagramPacket pack = new DatagramPacket(buf, buf.length);
+        while(true) {
+            try {
+                // receive...
+                this.sock.receive(pack);
+                
+                // create new data array
+                byte[] nbuf = new byte[pack.getLength()];
+                
+                // copy over
+                System.arraycopy(pack.getData(), 0, nbuf, 0, nbuf.length);
+                
+                // transfer to sink
+                this.sink.send(null, nbuf);
+                //System.out.print("i");
+            } catch(Exception e) {
+                e.printStackTrace();
+                break;
+            }
+        }
+    }
+    
+    public void stop() {    
+        this.sock.close();    
+    }    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    
+    protected DatagramSocket sock;
+    protected Sink sink;
+    protected Thread thread;
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udpTunnel/I2PTunnelUDPClientBase.java

@@ -0,0 +1,210 @@
+/* I2PTunnel is GPL'ed (with the exception mentioned in I2PTunnel.java)
+ * (c) 2003 - 2004 mihi
+ */
+package net.i2p.i2ptunnel.udpTunnel;
+
+import java.io.ByteArrayOutputStream;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InterruptedIOException;
+import java.net.ConnectException;
+import java.net.InetAddress;
+import java.net.NoRouteToHostException;
+import java.net.ServerSocket;
+import java.net.Socket;
+import java.net.UnknownHostException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Properties;
+
+import net.i2p.I2PAppContext;
+import net.i2p.I2PException;
+import net.i2p.client.I2PClient;
+import net.i2p.client.I2PClientFactory;
+import net.i2p.client.I2PSession;
+import net.i2p.client.I2PSessionException;
+import net.i2p.data.DataFormatException;
+import net.i2p.data.Destination;
+import net.i2p.i2ptunnel.I2PTunnel;
+import net.i2p.i2ptunnel.I2PTunnelTask;
+import net.i2p.i2ptunnel.Logging;
+import net.i2p.i2ptunnel.udp.*;
+import net.i2p.util.EventDispatcher;
+import net.i2p.util.I2PThread;
+import net.i2p.util.Log;
+
+public abstract class I2PTunnelUDPClientBase extends I2PTunnelTask implements Source, Sink {
+
+    private static final Log _log = new Log(I2PTunnelUDPClientBase.class);
+    protected I2PAppContext _context;
+    protected Logging l;
+
+    static final long DEFAULT_CONNECT_TIMEOUT = 60 * 1000;
+
+    private static volatile long __clientId = 0;
+    protected long _clientId;
+
+    protected Destination dest = null;
+
+    private boolean listenerReady = false;
+
+    private ServerSocket ss;
+
+    private Object startLock = new Object();
+    private boolean startRunning = false;
+
+    private byte[] pubkey;
+
+    private String handlerName;
+
+    private Object conLock = new Object();
+    
+    /** How many connections will we allow to be in the process of being built at once? */
+    private int _numConnectionBuilders;
+    /** How long will we allow sockets to sit in the _waitingSockets map before killing them? */
+    private int _maxWaitTime;
+    
+    private I2PSession _session;
+    private Source _i2pSource;
+    private Sink _i2pSink;
+    private Destination _otherDest;
+
+    /**
+     * Base client class that sets up an I2P Datagram client destination.
+     * The UDP side is not implemented here, as there are at least
+     * two possibilities:
+     *
+     * 1) UDP side is a "server"
+     *    Example: Streamr Consumer
+     *    - Configure a destination host and port
+     *    - External application sends no data
+     *    - Extending class must have a constructor with host and port arguments
+     *
+     * 2) UDP side is a client/server
+     *    Example: SOCKS UDP (DNS requests?)
+     *    - configure an inbound port and a destination host and port
+     *    - External application sends and receives data
+     *    - Extending class must have a constructor with host and 2 port arguments
+     *
+     * So the implementing class must create a UDPSource and/or UDPSink,
+     * and must call setSink().
+     *
+     * @throws IllegalArgumentException if the I2CP configuration is b0rked so
+     *                                  badly that we cant create a socketManager
+     *
+     * @author zzz with portions from welterde's streamr
+     */
+    public I2PTunnelUDPClientBase(String destination, Logging l, EventDispatcher notifyThis,
+                                  I2PTunnel tunnel) throws IllegalArgumentException {
+        super("UDPServer", notifyThis, tunnel);
+        _clientId = ++__clientId;
+        this.l = l;
+
+        _context = tunnel.getContext();
+
+        tunnel.getClientOptions().setProperty("i2cp.dontPublishLeaseSet", "true");
+        
+        // create i2pclient and destination
+        I2PClient client = I2PClientFactory.createClient();
+        Destination dest;
+        byte[] key;
+        try {
+            ByteArrayOutputStream out = new ByteArrayOutputStream(512);
+            dest = client.createDestination(out);
+            key = out.toByteArray();
+        } catch(Exception exc) {
+            throw new RuntimeException("failed to create i2p-destination", exc);
+        }
+
+        // create a session
+        try {
+            ByteArrayInputStream in = new ByteArrayInputStream(key);
+            _session = client.createSession(in, tunnel.getClientOptions());
+        } catch(Exception exc) {
+            throw new RuntimeException("failed to create session", exc);
+        }
+
+        // Setup the source. Always expect raw unverified datagrams.
+        _i2pSource = new I2PSource(_session, false, true);
+
+        // Setup the sink. Always send repliable datagrams.
+        if (destination != null && destination.length() > 0) {
+            try {
+                _otherDest = I2PTunnel.destFromName(destination);
+            } catch (DataFormatException dfe) {}
+            if (_otherDest == null) {
+                l.log("Could not resolve " + destination);
+                throw new RuntimeException("failed to create session - could not resolve " + destination);
+             }
+            _i2pSink = new I2PSink(_session, _otherDest, false);
+        } else {
+            _i2pSink = new I2PSinkAnywhere(_session, false);
+        }   
+    }
+    
+    /**
+     * Actually start working on outgoing connections.
+     * Classes should override to start UDP side as well.
+     *
+     * Not specified in I2PTunnelTask but used in both
+     * I2PTunnelClientBase and I2PTunnelServer so let's
+     * implement it here too.
+     */
+    public void startRunning() {
+        synchronized (startLock) {
+            try {
+                _session.connect();
+            } catch(I2PSessionException exc) {
+                throw new RuntimeException("failed to connect session", exc);
+            }
+            start();
+            startRunning = true;
+            startLock.notify();
+        }
+        open = true;
+    }
+
+    /**
+     * I2PTunnelTask Methods
+     *
+     * Classes should override to close UDP side as well
+     */
+    public boolean close(boolean forced) {
+        if (!open) return true;
+        if (_session != null) {
+            try {
+                _session.destroySession();
+            } catch (I2PSessionException ise) {}
+        }
+        l.log("Closing client " + toString());
+        open = false;
+        return true;
+    }
+
+    /**
+     *  Source Methods
+     *
+     *  Sets the receiver of the UDP datagrams from I2P
+     *  Subclass must call this after constructor
+     *  and before start()
+     */
+    public void setSink(Sink s) {
+        _i2pSource.setSink(s);
+    }
+
+    /** start the source */
+    public void start() {
+        _i2pSource.start();
+    }
+
+    /**
+     *  Sink Methods
+     *
+     * @param to - ignored if configured for a single destination
+     * (we use the dest specified in the constructor)
+     */
+    public void send(Destination to, byte[] data) {
+        _i2pSink.send(to, data);
+    }
+}

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/udpTunnel/I2PTunnelUDPServerBase.java

@@ -0,0 +1,211 @@
+/* I2PTunnel is GPL'ed (with the exception mentioned in I2PTunnel.java)
+ * (c) 2003 - 2004 mihi
+ */
+package net.i2p.i2ptunnel.udpTunnel;
+
+import java.io.ByteArrayInputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.ConnectException;
+import java.net.InetAddress;
+import java.net.Socket;
+import java.net.SocketException;
+import java.net.SocketTimeoutException;
+import java.util.Iterator;
+import java.util.Properties;
+
+import net.i2p.I2PAppContext;
+import net.i2p.I2PException;
+import net.i2p.client.I2PClient;
+import net.i2p.client.I2PClientFactory;
+import net.i2p.client.I2PSession;
+import net.i2p.client.I2PSessionException;
+import net.i2p.data.Base64;
+import net.i2p.data.Destination;
+import net.i2p.i2ptunnel.I2PTunnel;
+import net.i2p.i2ptunnel.I2PTunnelTask;
+import net.i2p.i2ptunnel.Logging;
+import net.i2p.i2ptunnel.udp.*;
+import net.i2p.util.EventDispatcher;
+import net.i2p.util.I2PThread;
+import net.i2p.util.Log;
+
+public class I2PTunnelUDPServerBase extends I2PTunnelTask implements Source, Sink {
+
+    private final static Log _log = new Log(I2PTunnelUDPServerBase.class);
+
+    private Object lock = new Object();
+    protected Object slock = new Object();
+
+    private static volatile long __serverId = 0;
+
+    protected Logging l;
+
+    private static final long DEFAULT_READ_TIMEOUT = -1; // 3*60*1000;
+    /** default timeout to 3 minutes - override if desired */
+    protected long readTimeout = DEFAULT_READ_TIMEOUT;
+
+    private I2PSession _session;
+    private Source _i2pSource;
+    private Sink _i2pSink;
+
+    /**
+     * Base client class that sets up an I2P Datagram server destination.
+     * The UDP side is not implemented here, as there are at least
+     * two possibilities:
+     *
+     * 1) UDP side is a "client"
+     *    Example: Streamr Producer
+     *    - configure an inbound port
+     *    - External application receives no data
+     *    - Extending class must have a constructor with a port argument
+     *
+     * 2) UDP side is a client/server
+     *    Example: DNS
+     *    - configure an inbound port and a destination host and port
+     *    - External application sends and receives data
+     *    - Extending class must have a constructor with host and 2 port arguments
+     *
+     * So the implementing class must create a UDPSource and/or UDPSink,
+     * and must call setSink().
+     *
+     * @throws IllegalArgumentException if the I2CP configuration is b0rked so
+     *                                  badly that we cant create a socketManager
+     *
+     * @author zzz with portions from welterde's streamr
+     */
+
+    public I2PTunnelUDPServerBase(boolean verify, File privkey, String privkeyname, Logging l,
+                           EventDispatcher notifyThis, I2PTunnel tunnel) {
+        super("UDPServer <- " + privkeyname, notifyThis, tunnel);
+        FileInputStream fis = null;
+        try {
+            fis = new FileInputStream(privkey);
+            init(verify, fis, privkeyname, l);
+        } catch (IOException ioe) {
+            _log.error("Error starting server", ioe);
+            notifyEvent("openServerResult", "error");
+        } finally {
+            if (fis != null)
+                try { fis.close(); } catch (IOException ioe) {}
+        }
+    }
+
+    private void init(boolean verify, InputStream privData, String privkeyname, Logging l) {
+        this.l = l;
+        int portNum = 7654;
+        if (getTunnel().port != null) {
+            try {
+                portNum = Integer.parseInt(getTunnel().port);
+            } catch (NumberFormatException nfe) {
+                _log.log(Log.CRIT, "Invalid port specified [" + getTunnel().port + "], reverting to " + portNum);
+            }
+        }
+
+        // create i2pclient
+        I2PClient client = I2PClientFactory.createClient();
+
+        try {
+            _session = client.createSession(privData, getTunnel().getClientOptions());
+        } catch(I2PSessionException exc) {
+            throw new RuntimeException("failed to create session", exc);
+        }
+
+        // Setup the source. Always expect repliable datagrams, optionally verify
+        _i2pSource = new I2PSource(_session, verify, false);
+
+        // Setup the sink. Always send raw datagrams.
+        _i2pSink = new I2PSinkAnywhere(_session, true);
+    }
+    
+    /**
+     * Classes should override to start UDP side as well.
+     *
+     * Not specified in I2PTunnelTask but used in both
+     * I2PTunnelClientBase and I2PTunnelServer so let's
+     * implement it here too.
+     */
+    public void startRunning() {
+        //synchronized (startLock) {
+            try {
+                _session.connect();
+            } catch(I2PSessionException exc) {
+                throw new RuntimeException("failed to connect session", exc);
+            }
+            start();
+        //}
+
+        notifyEvent("openServerResult", "ok");
+        open = true;
+    }
+
+    /**
+     * Set the read idle timeout for newly-created connections (in
+     * milliseconds).  After this time expires without data being reached from
+     * the I2P network, the connection itself will be closed.
+     */
+    public void setReadTimeout(long ms) {
+        readTimeout = ms;
+    }
+    
+    /**
+     * Get the read idle timeout for newly-created connections (in
+     * milliseconds).
+     *
+     * @return The read timeout used for connections
+     */
+    public long getReadTimeout() {
+        return readTimeout;
+    }
+
+    /**
+     * I2PTunnelTask Methods
+     *
+     * Classes should override to close UDP side as well
+     */
+    public boolean close(boolean forced) {
+        if (!open) return true;
+        synchronized (lock) {
+            l.log("Shutting down server " + toString());
+            try {
+                if (_session != null) {
+                    _session.destroySession();
+                }
+            } catch (I2PException ex) {
+                _log.error("Error destroying the session", ex);
+            }
+            l.log("Server shut down.");
+            open = false;
+            return true;
+        }
+    }
+
+    /**
+     *  Source Methods
+     *
+     *  Sets the receiver of the UDP datagrams from I2P
+     *  Subclass must call this after constructor
+     *  and before start()
+     */
+    public void setSink(Sink s) {
+        _i2pSource.setSink(s);
+    }
+
+    /** start the source */
+    public void start() {
+        _i2pSource.start();
+    }
+
+    /**
+     *  Sink Methods
+     *
+     * @param to
+     *
+     */
+    public void send(Destination to, byte[] data) {
+        _i2pSink.send(to, data);
+    }
+}
+

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java

@@ -8,6 +8,7 @@ package net.i2p.i2ptunnel.web;
  *
  */
 
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
@@ -28,9 +29,7 @@ public class EditBean extends IndexBean {
         if (controllers.size() > tunnel) {
             TunnelController cur = (TunnelController)controllers.get(tunnel);
             if (cur == null) return false;
-            return ( ("client".equals(cur.getType())) || 
-            		 ("httpclient".equals(cur.getType()))||
-            		 ("ircclient".equals(cur.getType())));
+            return isClient(cur.getType());
         } else {
             return false;
         }
@@ -38,7 +37,7 @@ public class EditBean extends IndexBean {
     
     public String getTargetHost(int tunnel) {
         TunnelController tun = getController(tunnel);
-        if (tun != null)
+        if (tun != null && tun.getTargetHost() != null)
             return tun.getTargetHost();
         else
             return "127.0.0.1";
@@ -52,7 +51,7 @@ public class EditBean extends IndexBean {
     }
     public String getSpoofedHost(int tunnel) {
         TunnelController tun = getController(tunnel);
-        if (tun != null)
+        if (tun != null && tun.getSpoofedHost() != null)
             return tun.getSpoofedHost();
         else
             return "";
@@ -61,8 +60,9 @@ public class EditBean extends IndexBean {
         TunnelController tun = getController(tunnel);
         if (tun != null && tun.getPrivKeyFile() != null)
             return tun.getPrivKeyFile();
-        else
-            return "";
+        if (tunnel < 0)
+            tunnel = _group.getControllers().size();
+        return "i2ptunnel" + tunnel + "-privKeys.dat";
     }
     
     public boolean startAutomatically(int tunnel) {
@@ -82,119 +82,123 @@ public class EditBean extends IndexBean {
     }
     
     public boolean shouldDelay(int tunnel) {
-        TunnelController tun = getController(tunnel);
-        if (tun != null) {
-            Properties opts = getOptions(tun);
-            if (opts != null) {
-                String delay = opts.getProperty("i2p.streaming.connectDelay");
-                if ( (delay == null) || ("0".equals(delay)) )
-                    return false;
-                else
-                    return true;
-            } else {
-                return false;
-            }
-        } else {
-            return false;
-        }
+        return getProperty(tunnel, "i2p.streaming.connectDelay", 0) > 0;
     }
     
     public boolean isInteractive(int tunnel) {
-        TunnelController tun = getController(tunnel);
-        if (tun != null) {
-            Properties opts = getOptions(tun);
-            if (opts != null) {
-                String wsiz = opts.getProperty("i2p.streaming.maxWindowSize");
-                if ( (wsiz == null) || (!"1".equals(wsiz)) )
-                    return false;
-                else
-                    return true;
-            } else {
-                return false;
-            }
-        } else {
-            return false;
-        }
+        return getProperty(tunnel, "i2p.streaming.maxWindowSize", 128) == 12;
     }
     
     public int getTunnelDepth(int tunnel, int defaultLength) {
-        TunnelController tun = getController(tunnel);
-        if (tun != null) {
-            Properties opts = getOptions(tun);
-            if (opts != null) {
-                String len = opts.getProperty("inbound.length");
-                if (len == null) return defaultLength;
-                try {
-                    return Integer.parseInt(len);
-                } catch (NumberFormatException nfe) {
-                    return defaultLength;
-                }
-            } else {
-                return defaultLength;
-            }
-        } else {
-            return defaultLength;
-        }
+        return getProperty(tunnel, "inbound.length", defaultLength);
     }
     
     public int getTunnelQuantity(int tunnel, int defaultQuantity) {
-        TunnelController tun = getController(tunnel);
-        if (tun != null) {
-            Properties opts = getOptions(tun);
-            if (opts != null) {
-                String len = opts.getProperty("inbound.quantity");
-                if (len == null) return defaultQuantity;
-                try {
-                    return Integer.parseInt(len);
-                } catch (NumberFormatException nfe) {
-                    return defaultQuantity;
-                }
-            } else {
-                return defaultQuantity;
-            }
-        } else {
-            return defaultQuantity;
-        }
+        return getProperty(tunnel, "inbound.quantity", defaultQuantity);
     }
    
     public int getTunnelBackupQuantity(int tunnel, int defaultBackupQuantity) {
-        TunnelController tun = getController(tunnel);
-        if (tun != null) {
-            Properties opts = getOptions(tun);
-            if (opts != null) {
-                String len = opts.getProperty("inbound.backupQuantity");
-                if (len == null) return defaultBackupQuantity;
-                try {
-                    return Integer.parseInt(len);
-                } catch (NumberFormatException nfe) {
-                    return defaultBackupQuantity;
-                }
-            } else {
-                return defaultBackupQuantity;
-            }
-        } else {
-            return defaultBackupQuantity;
-        }
+        return getProperty(tunnel, "inbound.backupQuantity", defaultBackupQuantity);
     }
   
     public int getTunnelVariance(int tunnel, int defaultVariance) {
+        return getProperty(tunnel, "inbound.lengthVariance", defaultVariance);
+    }
+    
+    public boolean getReduce(int tunnel) {
+        return getBooleanProperty(tunnel, "i2cp.reduceOnIdle");
+    }
+    
+    public int getReduceCount(int tunnel) {
+        return getProperty(tunnel, "i2cp.reduceQuantity", 1);
+    }
+    
+    public int getReduceTime(int tunnel) {
+        return getProperty(tunnel, "i2cp.reduceIdleTime", 20*60*1000) / (60*1000);
+    }
+    
+    public int getCert(int tunnel) {
+        return 0;
+    }
+    
+    public int getEffort(int tunnel) {
+        return 23;
+    }
+    
+    public String getSigner(int tunnel) {
+        return "";
+    }
+    
+    public boolean getEncrypt(int tunnel) {
+        return getBooleanProperty(tunnel, "i2cp.encryptLeaseSet");
+    }
+    
+    public String getEncryptKey(int tunnel) {
+        return getProperty(tunnel, "i2cp.leaseSetKey", "");
+    }
+    
+    public boolean getAccess(int tunnel) {
+        return getBooleanProperty(tunnel, "i2cp.enableAccessList");
+    }
+    
+    public String getAccessList(int tunnel) {
+        return getProperty(tunnel, "i2cp.accessList", "").replaceAll(",", "\n");
+    }
+    
+    public boolean getClose(int tunnel) {
+        return getBooleanProperty(tunnel, "i2cp.closeOnIdle");
+    }
+    
+    public int getCloseTime(int tunnel) {
+        return getProperty(tunnel, "i2cp.closeIdleTime", 30*60*1000) / (60*1000);
+    }
+    
+    public boolean getNewDest(int tunnel) {
+        return getBooleanProperty(tunnel, "i2cp.newDestOnResume");
+    }
+    
+    public boolean getPersistentClientKey(int tunnel) {
+        return getBooleanProperty(tunnel, "persistentClientKey");
+    }
+    
+    public boolean getDelayOpen(int tunnel) {
+        return getBooleanProperty(tunnel, "i2cp.delayOpen");
+    }
+    
+    private int getProperty(int tunnel, String prop, int def) {
         TunnelController tun = getController(tunnel);
         if (tun != null) {
             Properties opts = getOptions(tun);
             if (opts != null) {
-                String len = opts.getProperty("inbound.lengthVariance");
-                if (len == null) return defaultVariance;
+                String s = opts.getProperty(prop);
+                if (s == null) return def;
                 try {
-                    return Integer.parseInt(len);
-                } catch (NumberFormatException nfe) {
-                    return defaultVariance;
-                }
-            } else {
-                return defaultVariance;
+                    return Integer.parseInt(s);
+                } catch (NumberFormatException nfe) {}
             }
-        } else {
-            return defaultVariance;
         }
+        return def;
+    }
+    
+    private String getProperty(int tunnel, String prop, String def) {
+        TunnelController tun = getController(tunnel);
+        if (tun != null) {
+            Properties opts = getOptions(tun);
+            if (opts != null)
+                return opts.getProperty(prop, def);
+        }
+        return def;
+    }
+    
+    /** default is false */
+    private boolean getBooleanProperty(int tunnel, String prop) {
+        TunnelController tun = getController(tunnel);
+        if (tun != null) {
+            Properties opts = getOptions(tun);
+            if (opts != null)
+                return Boolean.valueOf(opts.getProperty(prop)).booleanValue();
+        }
+        return false;
     }
     
     public String getI2CPHost(int tunnel) {
@@ -222,19 +226,9 @@ public class EditBean extends IndexBean {
             int i = 0;
             for (Iterator iter = opts.keySet().iterator(); iter.hasNext(); ) {
                 String key = (String)iter.next();
+                if (_noShowSet.contains(key))
+                    continue;
                 String val = opts.getProperty(key);
-                if ("inbound.length".equals(key)) continue;
-                if ("outbound.length".equals(key)) continue;
-                if ("inbound.lengthVariance".equals(key)) continue;
-                if ("outbound.lengthVariance".equals(key)) continue;
-                if ("inbound.backupQuantity".equals(key)) continue;
-                if ("outbound.backupQuantity".equals(key)) continue;
-                if ("inbound.quantity".equals(key)) continue;
-                if ("outbound.quantity".equals(key)) continue;
-                if ("inbound.nickname".equals(key)) continue;
-                if ("outbound.nickname".equals(key)) continue;
-                if ("i2p.streaming.connectDelay".equals(key)) continue;
-                if ("i2p.streaming.maxWindowSize".equals(key)) continue;
                 if (i != 0) buf.append(' ');
                 buf.append(key).append('=').append(val);
                 i++;

apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/IndexBean.java

@@ -8,13 +8,24 @@ package net.i2p.i2ptunnel.web;
  *
  */
 
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.Arrays;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
+import java.util.Set;
 import java.util.StringTokenizer;
 
 import net.i2p.I2PAppContext;
+import net.i2p.data.Base32;
+import net.i2p.data.Certificate;
+import net.i2p.data.Destination;
+import net.i2p.data.PrivateKeyFile;
+import net.i2p.data.SessionKey;
 import net.i2p.i2ptunnel.TunnelController;
 import net.i2p.i2ptunnel.TunnelControllerGroup;
+import net.i2p.util.ConcurrentHashSet;
 import net.i2p.util.Log;
 
 /**
@@ -57,6 +68,11 @@ public class IndexBean {
     private boolean _sharedClient;
     private boolean _privKeyGenerate;
     private boolean _removeConfirmed;
+    private Set<String> _booleanOptions;
+    private Map<String, String> _otherOptions;
+    private int _hashCashValue;
+    private int _certType;
+    private String _certSigner;
     
     public static final int RUNNING = 1;
     public static final int STARTING = 2;
@@ -85,6 +101,8 @@ public class IndexBean {
         } catch (NumberFormatException nfe) {}
         _nextNonce = _context.random().nextLong();
         System.setProperty(PROP_NONCE, Long.toString(_nextNonce));
+        _booleanOptions = new ConcurrentHashSet(4);
+        _otherOptions = new ConcurrentHashMap(4);
     }
     
     public long getNextNonce() { return _nextNonce; }
@@ -146,6 +164,12 @@ public class IndexBean {
         else if ("Delete this proxy".equals(_action) || // IE workaround:
                 (_action.toLowerCase().indexOf("d</span>elete") >= 0))
             return deleteTunnel();
+        else if ("Estimate".equals(_action))
+            return PrivateKeyFile.estimateHashCashTime(_hashCashValue);
+        else if ("Modify".equals(_action))
+            return modifyDestination();
+        else if ("Generate".equals(_action))
+            return generateNewEncryptionKey();
         else
             return "Action " + _action + " unknown";
     }
@@ -209,10 +233,7 @@ public class IndexBean {
         }
         // Only modify other shared tunnels
         // if the current tunnel is shared, and of supported type
-        if ("true".equalsIgnoreCase(cur.getSharedClient()) &&
-            ("ircclient".equals(cur.getType()) ||
-             "httpclient".equals(cur.getType()) ||
-             "client".equals(cur.getType()))) {
+        if ("true".equalsIgnoreCase(cur.getSharedClient()) && isClient(cur.getType())) {
             // all clients use the same I2CP session, and as such, use the same I2CP options
             List controllers = _group.getControllers();
 
@@ -224,11 +245,7 @@ public class IndexBean {
 
                 // Only modify this non-current tunnel
                 // if it belongs to a shared destination, and is of supported type
-                if ("true".equalsIgnoreCase(c.getSharedClient()) &&
-                    ("httpclient".equals(c.getType()) ||
-                     "ircclient".equals(c.getType()) ||
-                     "client".equals(c.getType()))) {
-
+                if ("true".equalsIgnoreCase(c.getSharedClient()) && isClient(c.getType())) {
                     Properties cOpt = c.getConfig("");
                     if (_tunnelQuantity != null) {
                         cOpt.setProperty("option.inbound.quantity", _tunnelQuantity);
@@ -326,9 +343,16 @@ public class IndexBean {
     public boolean isClient(int tunnelNum) {
         TunnelController cur = getController(tunnelNum);
         if (cur == null) return false;
-        return ( ("client".equals(cur.getType())) || 
-        		("httpclient".equals(cur.getType())) ||
-        		("ircclient".equals(cur.getType())));
+        return isClient(cur.getType());
+    }
+
+    public static boolean isClient(String type) {
+        return ( ("client".equals(type)) || 
+        		("httpclient".equals(type)) ||
+        		("sockstunnel".equals(type)) ||
+        		("connectclient".equals(type)) ||
+        		("streamrclient".equals(type)) ||
+        		("ircclient".equals(type)));
     }
     
     public String getTunnelName(int tunnel) {
@@ -361,6 +385,11 @@ public class IndexBean {
         else if ("ircclient".equals(internalType)) return "IRC client";
         else if ("server".equals(internalType)) return "Standard server";
         else if ("httpserver".equals(internalType)) return "HTTP server";
+        else if ("sockstunnel".equals(internalType)) return "SOCKS 4/4a/5 proxy";
+        else if ("connectclient".equals(internalType)) return "CONNECT/SSL/HTTPS proxy";
+        else if ("ircserver".equals(internalType)) return "IRC server";
+        else if ("streamrclient".equals(internalType)) return "Streamr client";
+        else if ("streamrserver".equals(internalType)) return "Streamr server";
         else return internalType;
     }
     
@@ -407,13 +436,13 @@ public class IndexBean {
     public String getClientDestination(int tunnel) {
         TunnelController tun = getController(tunnel);
         if (tun == null) return "";
-        if ("client".equals(tun.getType())||"ircclient".equals(tun.getType())) {
-            if (tun.getTargetDestination() != null)
-                return tun.getTargetDestination();
-            else
-                return "";
-        }
-        else return tun.getProxyList();
+        String rv;
+        if ("client".equals(tun.getType()) || "ircclient".equals(tun.getType()) ||
+            "streamrclient".equals(tun.getType()))
+            rv = tun.getTargetDestination();
+        else
+            rv = tun.getProxyList();
+        return rv != null ? rv : "";
     }
     
     public String getServerTarget(int tunnel) {
@@ -430,11 +459,18 @@ public class IndexBean {
             String rv = tun.getMyDestination();
             if (rv != null)
                 return rv;
-            else
-                return "";
-        } else {
-            return "";
+            // if not running, do this the hard way
+            String keyFile = tun.getPrivKeyFile();
+            if (keyFile != null && keyFile.trim().length() > 0) {
+                PrivateKeyFile pkf = new PrivateKeyFile(keyFile);
+                try {
+                    Destination d = pkf.getDestination();
+                    if (d != null)
+                        return d.toBase64();
+                } catch (Exception e) {}
+            }
         }
+        return "";
     }
     
     public String getDestHashBase32(int tunnel) {
@@ -443,11 +479,8 @@ public class IndexBean {
             String rv = tun.getMyDestHashBase32();
             if (rv != null)
                 return rv;
-            else
-                return "";
-        } else {
-            return "";
         }
+        return "";
     }
     
     ///
@@ -569,6 +602,164 @@ public class IndexBean {
         _profile = profile; 
     }
 
+    public void setReduce(String moo) {
+        _booleanOptions.add("i2cp.reduceOnIdle");
+    }
+    public void setClose(String moo) {
+        _booleanOptions.add("i2cp.closeOnIdle");
+    }
+    public void setEncrypt(String moo) {
+        _booleanOptions.add("i2cp.encryptLeaseSet");
+    }
+    public void setAccess(String moo) {
+        _booleanOptions.add("i2cp.enableAccessList");
+    }
+    public void setDelayOpen(String moo) {
+        _booleanOptions.add("i2cp.delayOpen");
+    }
+    public void setNewDest(String val) {
+        if ("1".equals(val))
+            _booleanOptions.add("i2cp.newDestOnResume");
+        else if ("2".equals(val))
+            _booleanOptions.add("persistentClientKey");
+    }
+
+    public void setReduceTime(String val) {
+        if (val != null) {
+            try {
+                _otherOptions.put("i2cp.reduceIdleTime", "" + (Integer.parseInt(val.trim()) * 60*1000));
+            } catch (NumberFormatException nfe) {}
+        }
+    }
+    public void setReduceCount(String val) {
+        if (val != null)
+            _otherOptions.put("i2cp.reduceQuantity", val.trim());
+    }
+    public void setEncryptKey(String val) {
+        if (val != null)
+            _otherOptions.put("i2cp.leaseSetKey", val.trim());
+    }
+    public void setAccessList(String val) {
+        if (val != null)
+            _otherOptions.put("i2cp.accessList", val.trim().replaceAll("\r\n", ",").replaceAll("\n", ",").replaceAll(" ", ","));
+    }
+    public void setCloseTime(String val) {
+        if (val != null) {
+            try {
+                _otherOptions.put("i2cp.closeIdleTime", "" + (Integer.parseInt(val.trim()) * 60*1000));
+            } catch (NumberFormatException nfe) {}
+        }
+    }
+
+    /** params needed for hashcash and dest modification */
+    public void setEffort(String val) {
+        if (val != null) {
+            try {
+                _hashCashValue = Integer.parseInt(val.trim());
+            } catch (NumberFormatException nfe) {}
+        }
+    }
+    public void setCert(String val) {
+        if (val != null) {
+            try {
+                _certType = Integer.parseInt(val.trim());
+            } catch (NumberFormatException nfe) {}
+        }
+    }
+    public void setSigner(String val) {
+        _certSigner = val;
+    }
+
+    /** Modify or create a destination */
+    private String modifyDestination() {
+        if (_privKeyFile == null || _privKeyFile.trim().length() <= 0)
+            return "Private Key File not specified";
+
+        TunnelController tun = getController(_tunnel);
+        Properties config = getConfig();
+        if (config == null)
+            return "Invalid params";
+        if (tun == null) {
+            // creating new
+            tun = new TunnelController(config, "", true);
+            _group.addController(tun);
+            saveChanges();
+        } else if (tun.getIsRunning() || tun.getIsStarting()) {
+            return "Tunnel must be stopped before modifying destination";
+        }
+        PrivateKeyFile pkf = new PrivateKeyFile(_privKeyFile);
+        try {
+            pkf.createIfAbsent();
+        } catch (Exception e) {
+            return "Create private key file failed: " + e;
+        }
+        switch (_certType) {
+            case Certificate.CERTIFICATE_TYPE_NULL:
+            case Certificate.CERTIFICATE_TYPE_HIDDEN:
+                pkf.setCertType(_certType);
+                break;
+            case Certificate.CERTIFICATE_TYPE_HASHCASH:
+                pkf.setHashCashCert(_hashCashValue);
+                break;
+            case Certificate.CERTIFICATE_TYPE_SIGNED:
+                if (_certSigner == null || _certSigner.trim().length() <= 0)
+                    return "No signing destination specified";
+                // find the signer's key file...
+                String signerPKF = null;
+                for (int i = 0; i < getTunnelCount(); i++) {
+                    TunnelController c = getController(i);
+                    if (_certSigner.equals(c.getConfig("").getProperty("name")) ||
+                        _certSigner.equals(c.getConfig("").getProperty("spoofedHost"))) {
+                        signerPKF = c.getConfig("").getProperty("privKeyFile");
+                        break;
+                    }
+                }
+                if (signerPKF == null || signerPKF.length() <= 0)
+                    return "Signing destination " + _certSigner + " not found";
+                if (_privKeyFile.equals(signerPKF))
+                    return "Self-signed destinations not allowed";
+                Certificate c = pkf.setSignedCert(new PrivateKeyFile(signerPKF));
+                if (c == null)
+                    return "Signing failed - does signer destination exist?";
+                break;
+            default:
+                return "Unknown certificate type";
+        }
+        Destination newdest;
+        try {
+            pkf.write();
+            newdest = pkf.getDestination();
+        } catch (Exception e) {
+            return "Modification failed: " + e;
+        }
+        return "Destination modified - " +
+               "New Base32 is " + Base32.encode(newdest.calculateHash().getData()) + ".b32.i2p " +
+               "New Destination is " + newdest.toBase64();
+     }
+
+    /** New key */
+    private String generateNewEncryptionKey() {
+        TunnelController tun = getController(_tunnel);
+        Properties config = getConfig();
+        if (config == null)
+            return "Invalid params";
+        if (tun == null) {
+            // creating new
+            tun = new TunnelController(config, "", true);
+            _group.addController(tun);
+            saveChanges();
+        } else if (tun.getIsRunning() || tun.getIsStarting()) {
+            return "Tunnel must be stopped before modifying leaseset encryption key";
+        }
+        byte[] data = new byte[SessionKey.KEYSIZE_BYTES];
+        _context.random().nextBytes(data);
+        SessionKey sk = new SessionKey(data);
+        setEncryptKey(sk.toBase64());
+        setEncrypt("");
+        saveChanges();
+        return "New Leaseset Encryption Key: " + sk.toBase64();
+     }
+
     /**
      * Based on all provided data, create a set of configuration parameters 
      * suitable for use in a TunnelController.  This will replace (not add to)
@@ -579,82 +770,79 @@ public class IndexBean {
         Properties config = new Properties();
         updateConfigGeneric(config);
         
-        if ("httpclient".equals(_type)) {
+        if (isClient(_type)) {
+            // generic client stuff
             if (_port != null)
                 config.setProperty("listenPort", _port);
             if (_reachableByOther != null)
                 config.setProperty("interface", _reachableByOther);
             else
                 config.setProperty("interface", _reachableBy);
-            if (_proxyList != null)
-                config.setProperty("proxyList", _proxyList);
-
-        	config.setProperty("option.inbound.nickname", CLIENT_NICKNAME);
-        	config.setProperty("option.outbound.nickname", CLIENT_NICKNAME);
+            config.setProperty("option.inbound.nickname", CLIENT_NICKNAME);
+            config.setProperty("option.outbound.nickname", CLIENT_NICKNAME);
             if (_name != null && !_sharedClient) {
                  config.setProperty("option.inbound.nickname", _name);
                  config.setProperty("option.outbound.nickname", _name);
             }
-
             config.setProperty("sharedClient", _sharedClient + "");
-        }else if ("ircclient".equals(_type)) {
-                if (_port != null)
-                    config.setProperty("listenPort", _port);
-                if (_reachableByOther != null)
-                    config.setProperty("interface", _reachableByOther);
-                else
-                    config.setProperty("interface", _reachableBy);
-                if (_targetDestination != null)
-                    config.setProperty("targetDestination", _targetDestination);
+            for (String p : _booleanClientOpts)
+                config.setProperty("option." + p, "" + _booleanOptions.contains(p));
+            for (String p : _otherClientOpts)
+                if (_otherOptions.containsKey(p))
+                    config.setProperty("option." + p, _otherOptions.get(p));
+        } else {
+            // generic server stuff
+            if (_targetHost != null)
+                config.setProperty("targetHost", _targetHost);
+            if (_targetPort != null)
+                config.setProperty("targetPort", _targetPort);
+            for (String p : _booleanServerOpts)
+                config.setProperty("option." + p, "" + _booleanOptions.contains(p));
+            for (String p : _otherServerOpts)
+                if (_otherOptions.containsKey(p))
+                    config.setProperty("option." + p, _otherOptions.get(p));
+        }
 
-            	config.setProperty("option.inbound.nickname", CLIENT_NICKNAME);
-            	config.setProperty("option.outbound.nickname", CLIENT_NICKNAME);
-                if (_name != null && !_sharedClient) {
-                     config.setProperty("option.inbound.nickname", _name);
-                     config.setProperty("option.outbound.nickname", _name);
-                }
-
-                config.setProperty("sharedClient", _sharedClient + "");
-        } else if ("client".equals(_type)) {
-            if (_port != null)
-                config.setProperty("listenPort", _port);
-            if (_reachableByOther != null)
-                config.setProperty("interface", _reachableByOther);
-            else
-                config.setProperty("interface", _reachableBy);
+        if ("httpclient".equals(_type) || "connectclient".equals(_type)) {
+            if (_proxyList != null)
+                config.setProperty("proxyList", _proxyList);
+        } else if ("ircclient".equals(_type) || "client".equals(_type) || "streamrclient".equals(_type)) {
             if (_targetDestination != null)
                 config.setProperty("targetDestination", _targetDestination);
-            
-            config.setProperty("option.inbound.nickname", CLIENT_NICKNAME);
-            config.setProperty("option.outbound.nickname", CLIENT_NICKNAME);
-            if (_name != null && !_sharedClient) {
-                config.setProperty("option.inbound.nickname", _name);
-                config.setProperty("option.outbound.nickname", _name);
-           }
-            config.setProperty("sharedClient", _sharedClient + "");
-        } else if ("server".equals(_type)) {
-            if (_targetHost != null)
-                config.setProperty("targetHost", _targetHost);
-            if (_targetPort != null)
-                config.setProperty("targetPort", _targetPort);
-            if (_privKeyFile != null)
-                config.setProperty("privKeyFile", _privKeyFile);
         } else if ("httpserver".equals(_type)) {
-            if (_targetHost != null)
-                config.setProperty("targetHost", _targetHost);
-            if (_targetPort != null)
-                config.setProperty("targetPort", _targetPort);
-            if (_privKeyFile != null)
-                config.setProperty("privKeyFile", _privKeyFile);
             if (_spoofedHost != null)
                 config.setProperty("spoofedHost", _spoofedHost);
-        } else {
-            return null;
         }
 
         return config;
     }
     
+    private static final String _noShowOpts[] = {
+        "inbound.length", "outbound.length", "inbound.lengthVariance", "outbound.lengthVariance",
+        "inbound.backupQuantity", "outbound.backupQuantity", "inbound.quantity", "outbound.quantity",
+        "inbound.nickname", "outbound.nickname", "i2p.streaming.connectDelay", "i2p.streaming.maxWindowSize"
+        };
+    private static final String _booleanClientOpts[] = {
+        "i2cp.reduceOnIdle", "i2cp.closeOnIdle", "i2cp.newDestOnResume", "persistentClientKey", "i2cp.delayOpen"
+        };
+    private static final String _booleanServerOpts[] = {
+        "i2cp.reduceOnIdle", "i2cp.encryptLeaseSet", "i2cp.enableAccessList"
+        };
+    private static final String _otherClientOpts[] = {
+        "i2cp.reduceIdleTime", "i2cp.reduceQuantity", "i2cp.closeIdleTime"
+        };
+    private static final String _otherServerOpts[] = {
+        "i2cp.reduceIdleTime", "i2cp.reduceQuantity", "i2cp.leaseSetKey", "i2cp.accessList"
+        };
+    protected static final Set _noShowSet = new HashSet();
+    static {
+        _noShowSet.addAll(Arrays.asList(_noShowOpts));
+        _noShowSet.addAll(Arrays.asList(_booleanClientOpts));
+        _noShowSet.addAll(Arrays.asList(_booleanServerOpts));
+        _noShowSet.addAll(Arrays.asList(_otherClientOpts));
+        _noShowSet.addAll(Arrays.asList(_otherServerOpts));
+    }
+
     private void updateConfigGeneric(Properties config) {
         config.setProperty("type", _type);
         if (_name != null)
@@ -668,6 +856,8 @@ public class IndexBean {
         } else {
             config.setProperty("i2cpPort", "7654");
         }
+        if (_privKeyFile != null)
+            config.setProperty("privKeyFile", _privKeyFile);
         
         if (_customOptions != null) {
             StringTokenizer tok = new StringTokenizer(_customOptions);
@@ -677,19 +867,9 @@ public class IndexBean {
                 if ( (eq <= 0) || (eq >= pair.length()) )
                     continue;
                 String key = pair.substring(0, eq);
+                if (_noShowSet.contains(key))
+                    continue;
                 String val = pair.substring(eq+1);
-                if ("inbound.length".equals(key)) continue;
-                if ("outbound.length".equals(key)) continue;
-                if ("inbound.quantity".equals(key)) continue;
-                if ("outbound.quantity".equals(key)) continue;
-                if ("inbound.lengthVariance".equals(key)) continue;
-                if ("outbound.lengthVariance".equals(key)) continue;
-                if ("inbound.backupQuantity".equals(key)) continue;
-                if ("outbound.backupQuantity".equals(key)) continue;
-                if ("inbound.nickname".equals(key)) continue;
-                if ("outbound.nickname".equals(key)) continue;
-                if ("i2p.streaming.connectDelay".equals(key)) continue;
-                if ("i2p.streaming.maxWindowSize".equals(key)) continue;
                 config.setProperty("option." + key, val);
             }
         }
@@ -717,14 +897,14 @@ public class IndexBean {
         else
             config.setProperty("option.i2p.streaming.connectDelay", "0");
         if (_name != null) {
-            if ( ((!"client".equals(_type)) && (!"httpclient".equals(_type))&& (!"ircclient".equals(_type))) || (!_sharedClient) ) {
+            if ( (!isClient(_type)) || (!_sharedClient) ) {
                 config.setProperty("option.inbound.nickname", _name);
                 config.setProperty("option.outbound.nickname", _name);
             } else {
                 config.setProperty("option.inbound.nickname", CLIENT_NICKNAME);
                 config.setProperty("option.outbound.nickname", CLIENT_NICKNAME);
             }
-        } 
+        }
         if ("interactive".equals(_profile))
             // This was 1 which doesn't make much sense
             // The real way to make it interactive is to make the streaming lib

apps/i2ptunnel/jsp/edit.jsp

@@ -14,12 +14,10 @@ String tun = request.getParameter("tunnel");
 } else {
   String type = request.getParameter("type");
   int curTunnel = -1;
-  if ("client".equals(type) || "httpclient".equals(type) || "ircclient".equals(type)) {
+  if (EditBean.isClient(type)) {
     %><jsp:include page="editClient.jsp" /><%
-  } else if ("server".equals(type) || "httpserver".equals(type)) {
-    %><jsp:include page="editServer.jsp" /><%
   } else {
-    %>Invalid tunnel type<%
+    %><jsp:include page="editServer.jsp" /><%
   }
 }
-%>
+%>

apps/i2ptunnel/jsp/editClient.jsp

@@ -75,7 +75,11 @@
             </div>
                  
             <div id="accessField" class="rowItem">
+         <% if ("streamrclient".equals(tunnelType)) { %>
+                <label>Target:</label>
+         <% } else { %>
                 <label>Access Point:</label>
+         <% } %>
             </div>
             <div id="portField" class="rowItem">
                 <label for="port" accesskey="P">
@@ -87,14 +91,17 @@
                 </label>
                 <input type="text" size="6" maxlength="5" id="port" name="port" title="Access Port Number" value="<%=editBean.getClientPort(curTunnel)%>" class="freetext" />               
             </div>
+         <% String otherInterface = "";
+            String clientInterface = editBean.getClientInterface(curTunnel);
+            if ("streamrclient".equals(tunnelType)) {   
+                otherInterface = clientInterface;
+            } else { %>
             <div id="reachField" class="rowItem">
                 <label for="reachableBy" accesskey="r">
                     <span class="accessKey">R</span>eachable by:
                 </label>
                 <select id="reachableBy" name="reachableBy" title="Valid IP for Client Access" class="selectbox">
-                    <% String clientInterface = editBean.getClientInterface(curTunnel);
-                       String otherInterface = "";
-                       if (!("127.0.0.1".equals(clientInterface)) &&
+                  <%   if (!("127.0.0.1".equals(clientInterface)) &&
                            !("0.0.0.0".equals(clientInterface)) &&
                             (clientInterface != null) &&
                             (clientInterface.trim().length() > 0)) {
@@ -105,9 +112,18 @@
                     <option value="other"<%=(!("".equals(otherInterface))    ? " selected=\"selected\"" : "")%>>LAN Hosts (Please specify your LAN address)</option>
                 </select>                
             </div> 
+         <% } // streamrclient %>
             <div id="otherField" class="rowItem">
                 <label for="reachableByOther" accesskey="O">
+         <% if ("streamrclient".equals(tunnelType)) { %>
+                    Host:
+                    <% String vvv = otherInterface;
+                       if (vvv == null || "".equals(vvv.trim()))
+                           out.write(" <font color=\"red\">(required)</font>");
+                     %>
+         <% } else { %>
                     <span class="accessKey">O</span>ther:
+         <% } %>
                 </label>
                 <input type="text" size="20" id="reachableByOther" name="reachableByOther" title="Alternative IP for Client Access" value="<%=otherInterface%>" class="freetext" />                
             </div>
@@ -116,14 +132,14 @@
                 <hr />
             </div>
            
-            <% if ("httpclient".equals(editBean.getInternalType(curTunnel))) {
+            <% if ("httpclient".equals(tunnelType) || "connectclient".equals(tunnelType)) {
           %><div id="destinationField" class="rowItem">
                 <label for="proxyList" accesskey="x">
                     Outpro<span class="accessKey">x</span>ies:
                 </label>
                 <input type="text" size="30" id="proxyList" name="proxyList" title="List of Outproxy I2P destinations" value="<%=editBean.getClientDestination(curTunnel)%>" class="freetext" />                
             </div>
-            <% } else {
+            <% } else if ("client".equals(tunnelType) || "ircclient".equals(tunnelType) || "streamrclient".equals(tunnelType)) {
           %><div id="destinationField" class="rowItem">
                 <label for="targetDestination" accesskey="T">
                     <span class="accessKey">T</span>unnel Destination:
@@ -135,8 +151,9 @@
                 <input type="text" size="30" id="targetDestination" name="targetDestination" title="Destination of the Tunnel" value="<%=editBean.getClientDestination(curTunnel)%>" class="freetext" />                
                 <span class="comment">(name or destination)</span>
             </div>
-            <% }
-          %><div id="profileField" class="rowItem">
+         <% } %>
+         <% if (!"streamrclient".equals(tunnelType)) { %>
+            <div id="profileField" class="rowItem">
                 <label for="profile" accesskey="f">
                     Pro<span class="accessKey">f</span>ile:
                 </label>
@@ -160,6 +177,7 @@
                 <input value="true" type="checkbox" id="shared" name="shared" title="Share tunnels with other clients"<%=(editBean.isSharedClient(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />                
                 <span class="comment">(Share tunnels with other clients and irc/httpclients? Change requires restart of client proxy)</span>
             </div>
+         <% } // !streamrclient %>
             <div id="startupField" class="rowItem">
                 <label for="startOnLoad" accesskey="a">
                     <span class="accessKey">A</span>uto Start:
@@ -205,12 +223,12 @@
                     <span class="accessKey">V</span>ariance:
                 </label>
                 <select id="tunnelVariance" name="tunnelVariance" title="Level of Randomization for Tunnel Depth" class="selectbox">
-                    <% int tunnelVariance = editBean.getTunnelVariance(curTunnel, -1);
+                    <% int tunnelVariance = editBean.getTunnelVariance(curTunnel, 0);
                   %><option value="0"<%=(tunnelVariance  ==  0 ? " selected=\"selected\"" : "") %>>0 hop variance (no randomisation, consistant performance)</option>
-                    <option value="-1"<%=(tunnelVariance == -1 ? " selected=\"selected\"" : "") %>>+/- 0-1 hop variance (standard randomisation, standard performance)</option>
-                    <option value="-2"<%=(tunnelVariance == -2 ? " selected=\"selected\"" : "") %>>+/- 0-2 hop variance (high randomisation, variable performance)</option>
                     <option value="1"<%=(tunnelVariance  ==  1 ? " selected=\"selected\"" : "") %>>+ 0-1 hop variance (medium additive randomisation, subtractive performance)</option>
                     <option value="2"<%=(tunnelVariance  ==  2 ? " selected=\"selected\"" : "") %>>+ 0-2 hop variance (high additive randomisation, subtractive performance)</option>
+                    <option value="-1"<%=(tunnelVariance == -1 ? " selected=\"selected\"" : "") %>>+/- 0-1 hop variance (standard randomisation, standard performance)</option>
+                    <option value="-2"<%=(tunnelVariance == -2 ? " selected=\"selected\"" : "") %>>+/- 0-2 hop variance (not recommended)</option>
                 <% if (tunnelVariance > 2 || tunnelVariance < -2) {
                 %>    <option value="<%=tunnelVariance%>" selected="selected"><%= (tunnelVariance > 2 ? "+ " : "+/- ") %>0-<%=tunnelVariance%> hop variance</option>
                 <% }
@@ -265,11 +283,118 @@
                 </label>
                 <input type="text" id="clientPort" name="clientport" size="20" title="I2CP Port Number" value="<%=editBean.getI2CPPort(curTunnel)%>" class="freetext" />                
             </div>
+                 
+            <div class="subdivider">
+                <hr />
+            </div>
+           
+            <div id="optionsField" class="rowItem">
+                <label for="reduce" accesskey="d">
+                    Re<span class="accessKey">d</span>uce tunnel quantity when idle:
+                </label>
+            </div>
+            <div id="portField" class="rowItem">
+                <label for="access" accesskey="d">
+                    Enable:
+                </label>
+                <input value="1" type="checkbox" id="startOnLoad" name="reduce" title="Reduce Tunnels"<%=(editBean.getReduce(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />                
+            </div>
+            <div id="portField" class="rowItem">
+                <label for="reduceCount" accesskey="d">
+                    Reduced tunnel count:
+                </label>
+                <input type="text" id="port" name="reduceCount" size="1" maxlength="1" title="Reduced Tunnel Count" value="<%=editBean.getReduceCount(curTunnel)%>" class="freetext" />                
+            </div>
+            <div id="portField" class="rowItem">
+                <label for="reduceTime" accesskey="d">
+                    Idle minutes:
+                </label>
+                <input type="text" id="port" name="reduceTime" size="4" maxlength="4" title="Reduced Tunnel Idle Time" value="<%=editBean.getReduceTime(curTunnel)%>" class="freetext" />                
+            </div>
             
             <div class="subdivider">
                 <hr />
             </div>
            
+            <div id="optionsField" class="rowItem">
+                <label for="reduce" accesskey="c">
+                    <span class="accessKey">C</span>lose tunnels when idle: <i>Experimental</i>
+                </label>
+            </div>
+            <div id="portField" class="rowItem">
+                <label for="access" accesskey="c">
+                    Enable:
+                </label>
+                <input value="1" type="checkbox" id="startOnLoad" name="close" title="Close Tunnels"<%=(editBean.getClose(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />                
+            </div>
+            <div id="portField" class="rowItem">
+                <label for="access" accesskey="c">
+                    New Keys on Reopen:
+                </label>
+                <table border="0"><tr><!-- I give up -->
+                <td><input value="1" type="radio" id="startOnLoad" name="newDest" title="New Destination"
+                     <%=(editBean.getNewDest(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />                
+                <td valign="center">Enable
+                <td><input value="0" type="radio" id="startOnLoad" name="newDest" title="New Destination"
+                     <%=(editBean.getNewDest(curTunnel) || editBean.getPersistentClientKey(curTunnel) ? "" : " checked=\"checked\"")%> class="tickbox" />                
+                <td valign="center">Disable
+                </table>
+            </div>
+            <div id="portField" class="rowItem">
+                <label for="reduceTime" accesskey="c">
+                    Idle minutes:
+                </label>
+                <input type="text" id="port" name="closeTime" size="4" maxlength="4" title="Close Tunnel Idle Time" value="<%=editBean.getCloseTime(curTunnel)%>" class="freetext" />                
+            </div>
+                 
+            <div class="subdivider">
+                <hr />
+            </div>
+
+            <div id="optionsField" class="rowItem">
+                <label for="reduce" accesskey="c">
+                    <span class="accessKey">D</span>elay tunnel open until required: <i>Experimental</i>
+                </label>
+            </div>
+            <div id="portField" class="rowItem">
+                <label for="access" accesskey="c">
+                    Enable:
+                </label>
+                <input value="1" type="checkbox" id="startOnLoad" name="delayOpen" title="Delay Tunnel Open"<%=(editBean.getDelayOpen(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />                
+            </div>
+                 
+            <div class="subdivider">
+                <hr />
+            </div>
+
+         <% if ("client".equals(tunnelType) || "ircclient".equals(tunnelType)) { %>
+            <div id="optionsField" class="rowItem">
+                <label for="privKeyFile" accesskey="k">
+                    Persistent private <span class="accessKey">k</span>ey:
+                </label>
+            </div>
+            <div id="portField" class="rowItem">
+                <label>Enable:</label>
+                <input value="2" type="radio" id="startOnLoad" name="newDest" title="New Destination"
+                     <%=(editBean.getPersistentClientKey(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />                
+            </div>
+            <div id="reachField" class="rowItem">
+                <label>File:</label>
+                <input type="text" size="30" id="clientHost" name="privKeyFile" title="Path to Private Key File" value="<%=editBean.getPrivateKeyFile(curTunnel)%>" class="freetext" />               
+            </div>
+            <div id="destinationField" class="rowItem">
+                <label for="localDestination" accesskey="L">
+                    <span class="accessKey">L</span>ocal destination:
+                </label>
+                <textarea rows="1" cols="60" readonly="readonly" id="localDestination" title="Read Only: Local Destination (if known)" wrap="off"><%=editBean.getDestinationBase64(curTunnel)%></textarea>               
+                <span class="comment">(if known)</span>
+            </div>
+
+            <div class="subdivider">
+                <hr />
+            </div>
+         <% } %>
+           
             <div id="customOptionsField" class="rowItem">
                 <label for="customOptions" accesskey="u">
                     C<span class="accessKey">u</span>stom options:
@@ -284,8 +409,11 @@
             <div class="header"></div>
             <div class="footer">
                 <div class="toolbox">
+                    <span class="comment">NOTE: If tunnel is currently running, most changes will not take effect until tunnel is stopped and restarted</span>
                     <input type="hidden" value="true" name="removeConfirm" />
-                    <button id="controlSave" accesskey="S" class="control" type="submit" name="action" value="Save changes" title="Save Changes"><span class="accessKey">S</span>ave</button><button id="controlDelete" <%=(editBean.allowJS() ? "onclick=\"if (!confirm('Are you sure you want to delete?')) { return false; }\" " : "")%>accesskey="D" class="control" type="submit" name="action" value="Delete this proxy" title="Delete this Proxy"><span class="accessKey">D</span>elete</button>
+                    <button id="controlSave" accesskey="S" class="control" type="submit" name="action" value="Save changes" title="Save Changes"><span class="accessKey">S</span>ave</button>
+                    <button id="controlDelete" <%=(editBean.allowJS() ? "onclick=\"if (!confirm('Are you sure you want to delete?')) { return false; }\" " : "")%>accesskey="D" class="control" type="submit" name="action" value="Delete this proxy" title="Delete this Proxy"><span class="accessKey">D</span>elete</button>
+                    <button id="controlCancel" class="control" type="submit" name="action" value="" title="Cancel">Cancel</button>
                 </div>
             </div> 
         </div>

apps/i2ptunnel/jsp/editServer.jsp

@@ -82,11 +82,19 @@
             </div>
                  
             <div id="targetField" class="rowItem">
+         <% if ("streamrserver".equals(tunnelType)) { %>
+                <label>Access Point:</label>
+         <% } else { %>
                 <label>Target:</label>
+         <% } %>
             </div>
             <div id="hostField" class="rowItem">
                 <label for="targetHost" accesskey="H">
+         <% if ("streamrserver".equals(tunnelType)) { %>
+                    <span class="accessKey">R</span>eachable by:
+         <% } else { %>
                     <span class="accessKey">H</span>ost:
+         <% } %>
                 </label>
                 <input type="text" size="20" id="targetHost" name="targetHost" title="Target Hostname or IP" value="<%=editBean.getTargetHost(curTunnel)%>" class="freetext" />                
             </div>
@@ -110,7 +118,8 @@
                 <label for="spoofedHost" accesskey="W">
                     <span class="accessKey">W</span>ebsite name:
                 </label>
-                <input type="text" size="20" id="spoofedHost" name="spoofedHost" title="Website Host Name" value="<%=editBean.getSpoofedHost(curTunnel)%>" class="freetext" />                
+                <input type="text" size="20" id="targetHost" name="spoofedHost" title="Website Host Name" value="<%=editBean.getSpoofedHost(curTunnel)%>" class="freetext" />                
+                <span class="comment">(leave blank for outproxies)</span>
             </div>
             <% }
           %><div id="privKeyField" class="rowItem">
@@ -123,6 +132,7 @@
                 </label>
                 <input type="text" size="30" id="privKeyFile" name="privKeyFile" title="Path to Private Key File" value="<%=editBean.getPrivateKeyFile(curTunnel)%>" class="freetext" />               
             </div>
+         <% if (!"streamrserver".equals(tunnelType)) { %>
             <div id="profileField" class="rowItem">
                 <label for="profile" accesskey="f">
                     Pro<span class="accessKey">f</span>ile:
@@ -133,12 +143,15 @@
                     <option <%=(interactiveProfile == false ? "selected=\"selected\" " : "")%>value="bulk">bulk connection (downloads/websites/BT) </option>
                 </select>                
             </div> 
+         <% } // !streamrserver %>
             <div id="destinationField" class="rowItem">
                 <label for="localDestination" accesskey="L">
                     <span class="accessKey">L</span>ocal destination:
                 </label>
                 <textarea rows="1" cols="60" readonly="readonly" id="localDestination" title="Read Only: Local Destination (if known)" wrap="off"><%=editBean.getDestinationBase64(curTunnel)%></textarea>               
-                <span class="comment">(if known)</span>
+         <% if (!"".equals(editBean.getDestinationBase64(curTunnel))) { %>    
+            <a href="/susidns/addressbook.jsp?book=private&hostname=<%=editBean.getTunnelName(curTunnel)%>&destination=<%=editBean.getDestinationBase64(curTunnel)%>#add">Add to local addressbook</a>    
+         <% } %>
             </div>
             
             <div class="footer">
@@ -177,12 +190,12 @@
                     <span class="accessKey">V</span>ariance:
                 </label>
                 <select id="tunnelVariance" name="tunnelVariance" title="Level of Randomization for Tunnel Depth" class="selectbox">
-                    <% int tunnelVariance = editBean.getTunnelVariance(curTunnel, -1);
+                    <% int tunnelVariance = editBean.getTunnelVariance(curTunnel, 0);
                   %><option value="0"<%=(tunnelVariance  ==  0 ? " selected=\"selected\"" : "") %>>0 hop variance          (no randomisation, consistant performance)</option>
-                    <option value="-1"<%=(tunnelVariance == -1 ? " selected=\"selected\"" : "") %>>+/- 0-1 hop variance    (standard randomisation, standard performance)</option>
-                    <option value="-2"<%=(tunnelVariance == -2 ? " selected=\"selected\"" : "") %>>+/- 0-2 hop variance    (high randomisation, variable performance)</option>
                     <option value="1"<%=(tunnelVariance  ==  1 ? " selected=\"selected\"" : "") %>>+ 0-1 hop variance      (medium additive randomisation, subtractive performance)</option>
                     <option value="2"<%=(tunnelVariance  ==  2 ? " selected=\"selected\"" : "") %>>+ 0-2 hop variance      (high additive randomisation, subtractive performance)</option>
+                    <option value="-1"<%=(tunnelVariance == -1 ? " selected=\"selected\"" : "") %>>+/- 0-1 hop variance    (standard randomisation, standard performance)</option>
+                    <option value="-2"<%=(tunnelVariance == -2 ? " selected=\"selected\"" : "") %>>+/- 0-2 hop variance    (not recommended)</option>
                 <% if (tunnelVariance > 2 || tunnelVariance < -2) {
                 %>    <option value="<%=tunnelVariance%>" selected="selected"><%= (tunnelVariance > 2 ? "+ " : "+/- ") %>0-<%=tunnelVariance%> hop variance</option>
                 <% }
@@ -242,6 +255,136 @@
                 <hr />
             </div>
            
+            <div id="optionsField" class="rowItem">
+                <label for="encrypt" accesskey="e">
+                    <span class="accessKey">E</span>ncrypt Leaseset:
+                </label>
+            </div>
+            <div id="portField" class="rowItem">
+                <label for="encrypt" accesskey="e">
+                    Enable:
+                </label>
+                <input value="1" type="checkbox" id="startOnLoad" name="encrypt" title="Encrypt LeaseSet"<%=(editBean.getEncrypt(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />                
+            </div>
+            <div id="portField" class="rowItem">
+                <label for="encrypt" accesskey="e">
+                    Leaseset Encryption Key:
+                </label>
+                <textarea rows="1" cols="44" id="portField" name="encryptKey" title="Encrypt Key" wrap="off"><%=editBean.getEncryptKey(curTunnel)%></textarea>               
+            </div>
+            <div id="portField" class="rowItem">
+                <label for="force" accesskey="c">
+                    Generate New Key:
+                </label>
+                <button id="controlSave" accesskey="S" class="control" type="submit" name="action" value="Generate" title="Generate New Key Now">Generate</button>
+                <span class="comment">(Tunnel must be stopped first)</span>
+            </div>
+                 
+            <div class="subdivider">
+                <hr />
+            </div>
+           
+            <div id="optionsField" class="rowItem">
+                <label for="access" accesskey="s">
+                    Restricted Acce<span class="accessKey">s</span>s List: <i>Unimplemented</i>
+                </label>
+            </div>
+            <div id="portField" class="rowItem">
+                <label for="access" accesskey="s">
+                    Enable:
+                </label>
+                <input value="1" type="checkbox" id="startOnLoad" name="access" title="Enable Access List"<%=(editBean.getAccess(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />                
+            </div>
+            <div id="hostField" class="rowItem">
+                <label for="accessList" accesskey="s">
+                    Access List:
+                </label>
+                <textarea rows="2" cols="60" id="hostField" name="accessList" title="Access List" wrap="off"><%=editBean.getAccessList(curTunnel)%></textarea>               
+                <span class="comment">(Restrict to these clients only)</span>
+            </div>
+                 
+            <div class="subdivider">
+                <hr />
+            </div>
+           
+            <div id="optionsField" class="rowItem">
+                <label for="reduce" accesskey="d">
+                    Re<span class="accessKey">d</span>uce tunnel quantity when idle:
+                </label>
+            </div>
+            <div id="portField" class="rowItem">
+                <label for="access" accesskey="d">
+                    Enable:
+                </label>
+                <input value="1" type="checkbox" id="startOnLoad" name="reduce" title="Reduce Tunnels"<%=(editBean.getReduce(curTunnel) ? " checked=\"checked\"" : "")%> class="tickbox" />                
+            </div>
+            <div id="portField" class="rowItem">
+                <label for="reduceCount" accesskey="d">
+                    Reduced tunnel count:
+                </label>
+                <input type="text" id="port" name="reduceCount" size="1" maxlength="1" title="Reduced Tunnel Count" value="<%=editBean.getReduceCount(curTunnel)%>" class="freetext" />                
+            </div>
+            <div id="portField" class="rowItem">
+                <label for="reduceTime" accesskey="d">
+                    Idle minutes:
+                </label>
+                <input type="text" id="port" name="reduceTime" size="4" maxlength="4" title="Reduced Tunnel Idle Time" value="<%=editBean.getReduceTime(curTunnel)%>" class="freetext" />                
+            </div>
+
+            <div class="subdivider">
+                <hr />
+            </div>
+           
+            <div id="tunnelOptionsField" class="rowItem">
+                <label for="cert" accesskey="c">
+                    New <span class="accessKey">C</span>ertificate type:
+                </label>
+            </div>
+            <div id="hostField" class="rowItem">
+              <div id="portField" class="rowItem">
+                <label>None</label>
+                <input value="0" type="radio" id="startOnLoad" name="cert" title="No Certificate"<%=(editBean.getCert(curTunnel)==0 ? " checked=\"checked\"" : "")%> class="tickbox" />                
+                <span class="comment"></span>
+              </div>
+              <div id="portField" class="rowItem">
+                <label>Hashcash (effort)</label>
+                <input value="1" type="radio" id="startOnLoad" name="cert" title="Hashcash Certificate"<%=(editBean.getCert(curTunnel)==1 ? " checked=\"checked\"" : "")%> class="tickbox" />                
+                <input type="text" id="port" name="effort" size="2" maxlength="2" title="Hashcash Effort" value="<%=editBean.getEffort(curTunnel)%>" class="freetext" />                
+              </div>
+            </div>
+            <div id="portField" class="rowItem">
+                <label for="force" accesskey="c">
+                    Hashcash Calc Time:
+                </label>
+                <button id="controlSave" accesskey="S" class="control" type="submit" name="action" value="Estimate" title="Estimate Calculation Time">Estimate</button>
+            </div>
+            <div id="hostField" class="rowItem">
+              <div id="portField" class="rowItem">
+                <label>Hidden</label>
+                <input value="2" type="radio" id="startOnLoad" name="cert" title="Hidden Certificate"<%=(editBean.getCert(curTunnel)==2 ? " checked=\"checked\"" : "")%> class="tickbox" />                
+                <span class="comment"></span>
+              </div>
+              <div id="portField" class="rowItem">
+                <label for="signer" accesskey="c">
+                    Signed (signed by):
+                </label>
+                <input value="3" type="radio" id="startOnLoad" name="cert" title="Signed Certificate"<%=(editBean.getCert(curTunnel)==3 ? " checked=\"checked\"" : "")%> class="tickbox" />                
+                <input type="text" id="port" name="signer" size="50" title="Cert Signer" value="<%=editBean.getSigner(curTunnel)%>" class="freetext" />                
+                <span class="comment"></span>
+              </div>
+            </div>
+            <div id="portField" class="rowItem">
+                <label for="force" accesskey="c">
+                    Modify Certificate:
+                </label>
+                <button id="controlSave" accesskey="S" class="control" type="submit" name="action" value="Modify" title="Force New Cert Now">Modify</button>
+                <span class="comment">(Tunnel must be stopped first)</span>
+            </div>
+                 
+            <div class="subdivider">
+                <hr />
+            </div>
+                 
             <div id="customOptionsField" class="rowItem">
                 <label for="customOptions" accesskey="u">
                     C<span class="accessKey">u</span>stom options:
@@ -256,8 +399,11 @@
             <div class="header"></div>
             <div class="footer">
                 <div class="toolbox">
+                    <span class="comment">NOTE: If tunnel is currently running, most changes will not take effect until tunnel is stopped and restarted</span>
                     <input type="hidden" value="true" name="removeConfirm" />
-                    <button id="controlSave" accesskey="S" class="control" type="submit" name="action" value="Save changes" title="Save Changes"><span class="accessKey">S</span>ave</button><button id="controlDelete" <%=(editBean.allowJS() ? "onclick=\"if (!confirm('Are you sure you want to delete?')) { return false; }\" " : "")%>accesskey="D" class="control" type="submit" name="action" value="Delete this proxy" title="Delete this Proxy"><span class="accessKey">D</span>elete</button>
+                    <button id="controlSave" accesskey="S" class="control" type="submit" name="action" value="Save changes" title="Save Changes"><span class="accessKey">S</span>ave</button>
+                    <button id="controlDelete" <%=(editBean.allowJS() ? "onclick=\"if (!confirm('Are you sure you want to delete?')) { return false; }\" " : "")%>accesskey="D" class="control" type="submit" name="action" value="Delete this proxy" title="Delete this Proxy"><span class="accessKey">D</span>elete</button>
+                    <button id="controlCancel" class="control" type="submit" name="action" value="" title="Cancel">Cancel</button>
                 </div>
             </div> 
         </div>

apps/i2ptunnel/jsp/index.jsp

@@ -112,10 +112,18 @@
             }
       %></div>
 
+      <% if (!"sockstunnel".equals(indexBean.getInternalType(curClient))) { %>
         <div class="destinationField rowItem">
-            <label>Destination:</label>
+            <label>
+            <% if ("httpclient".equals(indexBean.getInternalType(curClient)) || "connectclient".equals(indexBean.getInternalType(curClient))) { %>
+                Outproxy:
+            <% } else { %>
+                Destination:
+            <% } %>
+            </label>
             <input class="freetext" size="40" readonly="readonly" value="<%=indexBean.getClientDestination(curClient)%>" />
         </div>
+      <% } %>
 
         <div class="descriptionField rowItem">
             <label>Description:</label>
@@ -140,6 +148,9 @@
                         <option value="client">Standard</option>
                         <option value="httpclient">HTTP</option>
                         <option value="ircclient">IRC</option>
+                        <option value="sockstunnel">SOCKS 4/4a/5</option>
+                        <option value="connectclient">CONNECT</option>
+                        <option value="streamrclient">Streamr</option>
                     </select>
                     <input class="control" type="submit" value="Create" />
                 </div>
@@ -159,10 +170,10 @@
         <div class="nameHeaderField rowItem">
             <label>Name:</label>
         </div>
-        <div class="targetHeaderField rowItem">
+        <div class="previewHeaderField rowItem">
             <label>Points at:</label>
         </div>
-        <div class="previewHeaderField rowItem">
+        <div class="targetHeaderField rowItem">
             <label>Preview:</label>
         </div>
         <div class="statusHeaderField rowItem">
@@ -178,7 +189,7 @@
             <label>Name:</label>
             <span class="text"><a href="edit.jsp?tunnel=<%=curServer%>" title="Edit Server Tunnel Settings for <%=indexBean.getTunnelName(curServer)%>"><%=indexBean.getTunnelName(curServer)%></a></span>
         </div>
-        <div class="targetField rowItem">
+        <div class="previewField rowItem">
             <label>Points at:</label>
             <span class="text">
         <%
@@ -192,11 +203,14 @@
             }
           %></span>
         </div>
-        <div class="previewField rowItem">
+        <div class="targetField rowItem">
             <%
             if ("httpserver".equals(indexBean.getInternalType(curServer)) && indexBean.getTunnelStatus(curServer) == IndexBean.RUNNING) {
           %><label>Preview:</label>    
             <a class="control" title="Test HTTP server through I2P" href="http://<%=indexBean.getDestHashBase32(curServer)%>.b32.i2p">Preview</a>     
+            <%
+            } else if (indexBean.getTunnelStatus(curServer) == IndexBean.RUNNING) {
+          %><span class="text">Base32 Address:<br><%=indexBean.getDestHashBase32(curServer)%>.b32.i2p</span>
         <%
             } else {
           %><span class="comment">No Preview</span>
@@ -247,6 +261,8 @@
                     <select name="type">
                         <option value="server">Standard</option>
                         <option value="httpserver">HTTP</option>
+                        <option value="ircserver">IRC</option>
+                        <option value="streamrserver">Streamr</option>
                     </select>
                     <input class="control" type="submit" value="Create" />
                 </div>

apps/jetty/build.xml

@@ -78,7 +78,6 @@
                 <include name="jasper-runtime.jar" />
                 <include name="javax.servlet.jar" />
                 <include name="org.mortbay.jetty.jar" />
-                <include name="xercesImpl.jar" />
             </fileset>
         </copy>
         <delete dir="jetty-5.1.12" />

apps/routerconsole/java/src/net/i2p/router/web/ConfigAdvancedHelper.java

@@ -6,22 +6,7 @@ import java.util.TreeSet;
 
 import net.i2p.router.RouterContext;
 
-public class ConfigAdvancedHelper {
-    private RouterContext _context;
-    /**
-     * Configure this bean to query a particular router context
-     *
-     * @param contextId begging few characters of the routerHash, or null to pick
-     *                  the first one we come across.
-     */
-    public void setContextId(String contextId) {
-        try {
-            _context = ContextHelper.getContext(contextId);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-    
+public class ConfigAdvancedHelper extends HelperBase {
     public ConfigAdvancedHelper() {}
     
     public String getSettings() {

apps/routerconsole/java/src/net/i2p/router/web/ConfigClientsHelper.java

@@ -9,22 +9,7 @@ import java.util.TreeSet;
 import net.i2p.router.RouterContext;
 import net.i2p.router.startup.ClientAppConfig;
 
-public class ConfigClientsHelper {
-    private RouterContext _context;
-    /**
-     * Configure this bean to query a particular router context
-     *
-     * @param contextId begging few characters of the routerHash, or null to pick
-     *                  the first one we come across.
-     */
-    public void setContextId(String contextId) {
-        try {
-            _context = ContextHelper.getContext(contextId);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-
+public class ConfigClientsHelper extends HelperBase {
     public ConfigClientsHelper() {}
     
     public String getForm1() {

apps/routerconsole/java/src/net/i2p/router/web/ConfigKeyringHandler.java

@@ -0,0 +1,40 @@
+package net.i2p.router.web;
+
+import net.i2p.I2PAppContext;
+import net.i2p.data.DataFormatException;
+import net.i2p.data.Hash;
+import net.i2p.data.SessionKey;
+import net.i2p.util.ConvertToHash;
+
+/**
+ *  Support additions via B64 Destkey, B64 Desthash, or blahblah.i2p
+ */
+public class ConfigKeyringHandler extends FormHandler {
+    private String _peer;
+    private String _key;
+    
+    protected void processForm() {
+        if ("Add key".equals(_action)) {
+            if (_peer == null || _key == null) {
+                addFormError("You must enter a destination and a key");
+                return;
+            }
+            Hash h = ConvertToHash.getHash(_peer);
+            SessionKey sk = new SessionKey();
+            try {
+                sk.fromBase64(_key);
+            } catch (DataFormatException dfe) {}
+            if (h != null && h.getData() != null && sk.getData() != null) {
+                _context.keyRing().put(h, sk);
+                addFormNotice("Key for " + h.toBase64() + " added to keyring");
+            } else {
+                addFormError("Invalid destination or key");
+            }
+        } else {
+            addFormError("Unsupported");
+        }
+    }
+
+    public void setPeer(String peer) { _peer = peer; }
+    public void setKey(String peer) { _key = peer; }
+}

apps/routerconsole/java/src/net/i2p/router/web/ConfigKeyringHelper.java

@@ -0,0 +1,21 @@
+package net.i2p.router.web;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.OutputStreamWriter;
+
+import net.i2p.router.RouterContext;
+
+public class ConfigKeyringHelper extends HelperBase {
+    public ConfigKeyringHelper() {}
+    
+    public String getSummary() {
+        ByteArrayOutputStream baos = new ByteArrayOutputStream(4*1024);
+        try {
+            _context.keyRing().renderStatusHTML(new OutputStreamWriter(baos));
+        } catch (IOException ioe) {
+            ioe.printStackTrace();
+        }
+        return new String(baos.toByteArray());
+    }
+}

apps/routerconsole/java/src/net/i2p/router/web/ConfigLoggingHelper.java

@@ -6,22 +6,7 @@ import java.util.TreeSet;
 
 import net.i2p.router.RouterContext;
 
-public class ConfigLoggingHelper {
-    private RouterContext _context;
-    /**
-     * Configure this bean to query a particular router context
-     *
-     * @param contextId begging few characters of the routerHash, or null to pick
-     *                  the first one we come across.
-     */
-    public void setContextId(String contextId) {
-        try {
-            _context = ContextHelper.getContext(contextId);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-    
+public class ConfigLoggingHelper extends HelperBase {
     public ConfigLoggingHelper() {}
     
     public String getLogFilePattern() {

apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHandler.java

@@ -237,7 +237,7 @@ public class ConfigNetHandler extends FormHandler {
 
     private void hiddenSwitch() {
         // Full restart required to generate new keys
-        _context.router().addShutdownTask(new UpdateWrapperManagerAndRekeyTask(Router.EXIT_GRACEFUL_RESTART));
+        _context.addShutdownTask(new UpdateWrapperManagerAndRekeyTask(Router.EXIT_GRACEFUL_RESTART));
         _context.router().shutdownGracefully(Router.EXIT_GRACEFUL_RESTART);
     }
     

apps/routerconsole/java/src/net/i2p/router/web/ConfigNetHelper.java

@@ -10,22 +10,7 @@ import net.i2p.router.transport.udp.UDPAddress;
 import net.i2p.router.transport.udp.UDPTransport;
 import net.i2p.time.Timestamper;
 
-public class ConfigNetHelper {
-    private RouterContext _context;
-    /**
-     * Configure this bean to query a particular router context
-     *
-     * @param contextId begging few characters of the routerHash, or null to pick
-     *                  the first one we come across.
-     */
-    public void setContextId(String contextId) {
-        try {
-            _context = ContextHelper.getContext(contextId);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-
+public class ConfigNetHelper extends HelperBase {
     public ConfigNetHelper() {}
     
     /** copied from various private components */

apps/routerconsole/java/src/net/i2p/router/web/ConfigPeerHelper.java

@@ -4,25 +4,9 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 
-import net.i2p.data.DataHelper;
 import net.i2p.router.RouterContext;
 
-public class ConfigPeerHelper {
-    private RouterContext _context;
-    /**
-     * Configure this bean to query a particular router context
-     *
-     * @param contextId begging few characters of the routerHash, or null to pick
-     *                  the first one we come across.
-     */
-    public void setContextId(String contextId) {
-        try {
-            _context = ContextHelper.getContext(contextId);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-
+public class ConfigPeerHelper extends HelperBase {
     public ConfigPeerHelper() {}
     
     public String getBlocklistSummary() {

apps/routerconsole/java/src/net/i2p/router/web/ConfigRestartBean.java

@@ -25,18 +25,20 @@ public class ConfigRestartBean {
         String systemNonce = getNonce();
         if ( (nonce != null) && (systemNonce.equals(nonce)) && (action != null) ) {
             if ("shutdownImmediate".equals(action)) {
-                ctx.router().addShutdownTask(new ConfigServiceHandler.UpdateWrapperManagerTask(Router.EXIT_HARD));
-                ctx.router().shutdown(Router.EXIT_HARD); // never returns
+                ctx.addShutdownTask(new ConfigServiceHandler.UpdateWrapperManagerTask(Router.EXIT_HARD));
+                //ctx.router().shutdown(Router.EXIT_HARD); // never returns
+                ctx.router().shutdownGracefully(Router.EXIT_HARD); // give the UI time to respond
             } else if ("cancelShutdown".equals(action)) {
                 ctx.router().cancelGracefulShutdown();
             } else if ("restartImmediate".equals(action)) {
-                ctx.router().addShutdownTask(new ConfigServiceHandler.UpdateWrapperManagerTask(Router.EXIT_HARD_RESTART));
-                ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns
+                ctx.addShutdownTask(new ConfigServiceHandler.UpdateWrapperManagerTask(Router.EXIT_HARD_RESTART));
+                //ctx.router().shutdown(Router.EXIT_HARD_RESTART); // never returns
+                ctx.router().shutdownGracefully(Router.EXIT_HARD_RESTART); // give the UI time to respond
             } else if ("restart".equals(action)) {
-                ctx.router().addShutdownTask(new ConfigServiceHandler.UpdateWrapperManagerTask(Router.EXIT_GRACEFUL_RESTART));
+                ctx.addShutdownTask(new ConfigServiceHandler.UpdateWrapperManagerTask(Router.EXIT_GRACEFUL_RESTART));
                 ctx.router().shutdownGracefully(Router.EXIT_GRACEFUL_RESTART);
             } else if ("shutdown".equals(action)) {
-                ctx.router().addShutdownTask(new ConfigServiceHandler.UpdateWrapperManagerTask(Router.EXIT_GRACEFUL));
+                ctx.addShutdownTask(new ConfigServiceHandler.UpdateWrapperManagerTask(Router.EXIT_GRACEFUL));
                 ctx.router().shutdownGracefully();
             }
         }
@@ -79,9 +81,18 @@ public class ConfigRestartBean {
     }
 
     private static boolean isShuttingDown(RouterContext ctx) {
-        return Router.EXIT_GRACEFUL == ctx.router().scheduledGracefulExitCode();
+        return Router.EXIT_GRACEFUL == ctx.router().scheduledGracefulExitCode() ||
+               Router.EXIT_HARD == ctx.router().scheduledGracefulExitCode();
     }
     private static boolean isRestarting(RouterContext ctx) {
-        return Router.EXIT_GRACEFUL_RESTART == ctx.router().scheduledGracefulExitCode();
+        return Router.EXIT_GRACEFUL_RESTART == ctx.router().scheduledGracefulExitCode() ||
+               Router.EXIT_HARD_RESTART == ctx.router().scheduledGracefulExitCode();
+    }
+    /** this is for summaryframe.jsp */
+    public static long getRestartTimeRemaining() {
+        RouterContext ctx = ContextHelper.getContext(null);
+        if (ctx.router().gracefulShutdownInProgress())
+            return ctx.router().getShutdownTimeRemaining();
+        return Long.MAX_VALUE/2;  // summaryframe.jsp adds a safety factor so we don't want to overflow...
     }
 }

apps/routerconsole/java/src/net/i2p/router/web/ConfigServiceHandler.java

@@ -53,31 +53,31 @@ public class ConfigServiceHandler extends FormHandler {
         if (_action == null) return;
         
         if ("Shutdown gracefully".equals(_action)) {
-            _context.router().addShutdownTask(new UpdateWrapperManagerTask(Router.EXIT_GRACEFUL));
+            _context.addShutdownTask(new UpdateWrapperManagerTask(Router.EXIT_GRACEFUL));
             _context.router().shutdownGracefully();
             addFormNotice("Graceful shutdown initiated");
         } else if ("Shutdown immediately".equals(_action)) {
-            _context.router().addShutdownTask(new UpdateWrapperManagerTask(Router.EXIT_HARD));
+            _context.addShutdownTask(new UpdateWrapperManagerTask(Router.EXIT_HARD));
             _context.router().shutdown(Router.EXIT_HARD);
             addFormNotice("Shutdown immediately!  boom bye bye bad bwoy");
         } else if ("Cancel graceful shutdown".equals(_action)) {
             _context.router().cancelGracefulShutdown();
             addFormNotice("Graceful shutdown cancelled");
         } else if ("Graceful restart".equals(_action)) {
-            _context.router().addShutdownTask(new UpdateWrapperManagerTask(Router.EXIT_GRACEFUL_RESTART));
+            _context.addShutdownTask(new UpdateWrapperManagerTask(Router.EXIT_GRACEFUL_RESTART));
             _context.router().shutdownGracefully(Router.EXIT_GRACEFUL_RESTART);
             addFormNotice("Graceful restart requested");
         } else if ("Hard restart".equals(_action)) {
-            _context.router().addShutdownTask(new UpdateWrapperManagerTask(Router.EXIT_HARD_RESTART));
+            _context.addShutdownTask(new UpdateWrapperManagerTask(Router.EXIT_HARD_RESTART));
             _context.router().shutdown(Router.EXIT_HARD_RESTART);
             addFormNotice("Hard restart requested");
         } else if ("Rekey and Restart".equals(_action)) {
             addFormNotice("Rekeying after graceful restart");
-            _context.router().addShutdownTask(new UpdateWrapperManagerAndRekeyTask(Router.EXIT_GRACEFUL_RESTART));
+            _context.addShutdownTask(new UpdateWrapperManagerAndRekeyTask(Router.EXIT_GRACEFUL_RESTART));
             _context.router().shutdownGracefully(Router.EXIT_GRACEFUL_RESTART);
         } else if ("Rekey and Shutdown".equals(_action)) {
             addFormNotice("Rekeying after graceful shutdown");
-            _context.router().addShutdownTask(new UpdateWrapperManagerAndRekeyTask(Router.EXIT_GRACEFUL));
+            _context.addShutdownTask(new UpdateWrapperManagerAndRekeyTask(Router.EXIT_GRACEFUL));
             _context.router().shutdownGracefully(Router.EXIT_GRACEFUL);
         } else if ("Run I2P on startup".equals(_action)) {
             installService();

apps/routerconsole/java/src/net/i2p/router/web/ConfigStatsHelper.java

@@ -15,8 +15,7 @@ import net.i2p.stat.RateStat;
 import net.i2p.stat.StatManager;
 import net.i2p.util.Log;
 
-public class ConfigStatsHelper {
-    private RouterContext _context;
+public class ConfigStatsHelper extends HelperBase {
     private Log _log;
     private String _filter;
     private Set _filters;

apps/routerconsole/java/src/net/i2p/router/web/ConfigTunnelsHelper.java

@@ -8,22 +8,7 @@ import net.i2p.data.Destination;
 import net.i2p.router.RouterContext;
 import net.i2p.router.TunnelPoolSettings;
 
-public class ConfigTunnelsHelper {
-    private RouterContext _context;
-    /**
-     * Configure this bean to query a particular router context
-     *
-     * @param contextId begging few characters of the routerHash, or null to pick
-     *                  the first one we come across.
-     */
-    public void setContextId(String contextId) {
-        try {
-            _context = ContextHelper.getContext(contextId);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-
+public class ConfigTunnelsHelper extends HelperBase {
     public ConfigTunnelsHelper() {}
     
     
@@ -64,7 +49,9 @@ public class ConfigTunnelsHelper {
 
     private static final int WARN_LENGTH = 4;
     private static final int MAX_LENGTH = 4;
-    private static final int MAX_QUANTITY = 3;
+    private static final int WARN_QUANTITY = 5;
+    private static final int MAX_QUANTITY = 6;
+    private static final int MAX_BACKUP_QUANTITY = 3;
     private static final int MAX_VARIANCE = 2;
     private static final int MIN_NEG_VARIANCE = -1;
     private void renderForm(StringBuffer buf, int index, String prefix, String name, TunnelPoolSettings in, TunnelPoolSettings out) {
@@ -79,6 +66,9 @@ public class ConfigTunnelsHelper {
         if (in.getLength() + Math.abs(in.getLengthVariance()) >= WARN_LENGTH ||
             out.getLength() + Math.abs(out.getLengthVariance()) >= WARN_LENGTH)
             buf.append("<tr><td colspan=\"3\"><font color=\"red\">PERFORMANCE WARNING - Settings include very long tunnels</font></td></tr>");
+        if (in.getQuantity() + in.getBackupQuantity() >= WARN_QUANTITY ||
+            out.getQuantity() + out.getBackupQuantity() >= WARN_QUANTITY)
+            buf.append("<tr><td colspan=\"3\"><font color=\"red\">PERFORMANCE WARNING - Settings include high tunnel quantities</font></td></tr>");
 
 
         buf.append("<tr><td></td><td><b>Inbound</b></td><td><b>Outbound</b></td></tr>\n");
@@ -145,15 +135,15 @@ public class ConfigTunnelsHelper {
         buf.append("<tr><td>Backup quantity</td>\n");
         buf.append("<td><select name=\"").append(index).append(".backupInbound\">\n");
         now = in.getBackupQuantity();
-        renderOptions(buf, 0, MAX_QUANTITY, now, "", "tunnel");
-        if (now > MAX_QUANTITY)
+        renderOptions(buf, 0, MAX_BACKUP_QUANTITY, now, "", "tunnel");
+        if (now > MAX_BACKUP_QUANTITY)
             renderOptions(buf, now, now, now, "", "tunnel");
         buf.append("</select></td>\n");
 
         buf.append("<td><select name=\"").append(index).append(".backupOutbound\">\n");
         now = out.getBackupQuantity();
-        renderOptions(buf, 0, MAX_QUANTITY, now, "", "tunnel");
-        if (now > MAX_QUANTITY)
+        renderOptions(buf, 0, MAX_BACKUP_QUANTITY, now, "", "tunnel");
+        if (now > MAX_BACKUP_QUANTITY)
             renderOptions(buf, now, now, now, "", "tunnel");
         buf.append("</select></td>\n");
         buf.append("</tr>\n");

apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHandler.java

@@ -51,7 +51,7 @@ public class ConfigUpdateHandler extends FormHandler {
                 if ( (_updatePolicy == null) || (!_updatePolicy.equals("notify")) )
                     addFormNotice("Update available, attempting to download now");
                 else
-                    addFormNotice("Update available, click link on left to download");
+                    addFormNotice("Update available, click button on left to download");
             } else
                 addFormNotice("No update available");
         }

apps/routerconsole/java/src/net/i2p/router/web/ConfigUpdateHelper.java

@@ -4,22 +4,7 @@ import net.i2p.crypto.TrustedUpdate;
 import net.i2p.data.DataHelper;
 import net.i2p.router.RouterContext;
 
-public class ConfigUpdateHelper {
-    private RouterContext _context;
-    /**
-     * Configure this bean to query a particular router context
-     *
-     * @param contextId begging few characters of the routerHash, or null to pick
-     *                  the first one we come across.
-     */
-    public void setContextId(String contextId) {
-        try {
-            _context = ContextHelper.getContext(contextId);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-
+public class ConfigUpdateHelper extends HelperBase {
     public ConfigUpdateHelper() {}
     
     public boolean updateAvailable() {

apps/routerconsole/java/src/net/i2p/router/web/ContentHelper.java

@@ -6,25 +6,11 @@ import java.util.Locale;
 import net.i2p.router.RouterContext;
 import net.i2p.util.FileUtil;
 
-public class ContentHelper {
+public class ContentHelper extends HelperBase {
     private String _page;
     private int _maxLines;
     private boolean _startAtBeginning;
     private String _lang;
-    private RouterContext _context;
-    /**
-     * Configure this bean to query a particular router context
-     *
-     * @param contextId begging few characters of the routerHash, or null to pick
-     *                  the first one we come across.
-     */
-    public void setContextId(String contextId) {
-        try {
-            _context = ContextHelper.getContext(contextId);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
     
     public ContentHelper() {}
     

apps/routerconsole/java/src/net/i2p/router/web/GraphHelper.java

@@ -11,27 +11,12 @@ import net.i2p.data.DataHelper;
 import net.i2p.router.RouterContext;
 import net.i2p.stat.Rate;
 
-public class GraphHelper {
-    private RouterContext _context;
-    private Writer _out;
+public class GraphHelper extends HelperBase {
     private int _periodCount;
     private boolean _showEvents;
     private int _width;
     private int _height;
     private int _refreshDelaySeconds;
-    /**
-     * Configure this bean to query a particular router context
-     *
-     * @param contextId begging few characters of the routerHash, or null to pick
-     *                  the first one we come across.
-     */
-    public void setContextId(String contextId) {
-        try {
-            _context = ContextHelper.getContext(contextId);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
     
     public GraphHelper() {
         _periodCount = 60; // SummaryListener.PERIODS;
@@ -41,7 +26,6 @@ public class GraphHelper {
         _refreshDelaySeconds = 60;
     }
     
-    public void setOut(Writer out) { _out = out; }
     public void setPeriodCount(String str) { 
         try { _periodCount = Integer.parseInt(str); } catch (NumberFormatException nfe) {}
     }

apps/routerconsole/java/src/net/i2p/router/web/HelperBase.java

@@ -0,0 +1,29 @@
+package net.i2p.router.web;
+
+import java.io.Writer;
+
+import net.i2p.router.RouterContext;
+
+/**
+ * Base helper
+ */
+public abstract class HelperBase {
+    protected RouterContext _context;
+    protected Writer _out;
+
+    /**
+     * Configure this bean to query a particular router context
+     *
+     * @param contextId begging few characters of the routerHash, or null to pick
+     *                  the first one we come across.
+     */
+    public void setContextId(String contextId) {
+        try {
+            _context = ContextHelper.getContext(contextId);
+        } catch (Throwable t) {
+            t.printStackTrace();
+        }
+    }
+
+    public void setWriter(Writer out) { _out = out; }
+}

apps/routerconsole/java/src/net/i2p/router/web/JobQueueHelper.java

@@ -7,27 +7,9 @@ import java.io.Writer;
 
 import net.i2p.router.RouterContext;
 
-public class JobQueueHelper {
-    private RouterContext _context;
-    private Writer _out;
-    /**
-     * Configure this bean to query a particular router context
-     *
-     * @param contextId begging few characters of the routerHash, or null to pick
-     *                  the first one we come across.
-     */
-    public void setContextId(String contextId) {
-        try {
-            _context = ContextHelper.getContext(contextId);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-    
+public class JobQueueHelper extends HelperBase {
     public JobQueueHelper() {}
     
-    public void setWriter(Writer writer) { _out = writer; }
-    
     public String getJobQueueSummary() {
         try {
             if (_out != null) {

apps/routerconsole/java/src/net/i2p/router/web/LogsHelper.java

@@ -5,22 +5,7 @@ import java.util.List;
 import net.i2p.router.RouterContext;
 import net.i2p.util.FileUtil;
 
-public class LogsHelper {
-    private RouterContext _context;
-    /**
-     * Configure this bean to query a particular router context
-     *
-     * @param contextId begging few characters of the routerHash, or null to pick
-     *                  the first one we come across.
-     */
-    public void setContextId(String contextId) {
-        try {
-            _context = ContextHelper.getContext(contextId);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-    
+public class LogsHelper extends HelperBase {
     public LogsHelper() {}
     
     public String getLogs() {

apps/routerconsole/java/src/net/i2p/router/web/NavHelper.java

@@ -6,22 +6,8 @@ import java.util.Map;
 
 import net.i2p.router.RouterContext;
 
-public class NavHelper {
+public class NavHelper extends HelperBase {
     private static Map _apps = new HashMap();
-    private RouterContext _context;
-    /**
-     * Configure this bean to query a particular router context
-     *
-     * @param contextId begging few characters of the routerHash, or null to pick
-     *                  the first one we come across.
-     */
-    public void setContextId(String contextId) {
-        try {
-            _context = ContextHelper.getContext(contextId);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
     
     public NavHelper() {}
     

apps/routerconsole/java/src/net/i2p/router/web/NetDbHelper.java

@@ -7,29 +7,14 @@ import java.io.Writer;
 
 import net.i2p.router.RouterContext;
 
-public class NetDbHelper {
-    private RouterContext _context;
-    private Writer _out;
+public class NetDbHelper extends HelperBase {
     private String _routerPrefix;
-
-    /**
-     * Configure this bean to query a particular router context
-     *
-     * @param contextId begging few characters of the routerHash, or null to pick
-     *                  the first one we come across.
-     */
-    public void setContextId(String contextId) {
-        try {
-            _context = ContextHelper.getContext(contextId);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
+    private boolean _full = false;
     
     public NetDbHelper() {}
     
-    public void setWriter(Writer writer) { _out = writer; }
     public void setRouter(String r) { _routerPrefix = r; }
+    public void setFull(String f) { _full = "1".equals(f); };
     
     public String getNetDbSummary() {
         try {
@@ -37,14 +22,14 @@ public class NetDbHelper {
                 if (_routerPrefix != null)
                     _context.netDb().renderRouterInfoHTML(_out, _routerPrefix);
                 else
-                    _context.netDb().renderStatusHTML(_out);
+                    _context.netDb().renderStatusHTML(_out, _full);
                 return "";
             } else {
                 ByteArrayOutputStream baos = new ByteArrayOutputStream(32*1024);
                 if (_routerPrefix != null)
                     _context.netDb().renderRouterInfoHTML(new OutputStreamWriter(baos), _routerPrefix);
                 else
-                    _context.netDb().renderStatusHTML(new OutputStreamWriter(baos));
+                    _context.netDb().renderStatusHTML(new OutputStreamWriter(baos), _full);
                 return new String(baos.toByteArray());
             }
         } catch (IOException ioe) {

apps/routerconsole/java/src/net/i2p/router/web/NoticeHelper.java

@@ -7,22 +7,7 @@ import net.i2p.router.RouterContext;
  * Simple helper to query the appropriate router for data necessary to render
  * any emergency notices 
  */
-public class NoticeHelper {
-    private RouterContext _context;
-    /**
-     * Configure this bean to query a particular router context
-     *
-     * @param contextId begging few characters of the routerHash, or null to pick
-     *                  the first one we come across.
-     */
-    public void setContextId(String contextId) {
-        try {
-            _context = ContextHelper.getContext(contextId);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-    
+public class NoticeHelper extends HelperBase {
     public String getSystemNotice() {
         if (true) return ""; // moved to the left hand nav
         if (_context.router().gracefulShutdownInProgress()) {
@@ -35,4 +20,4 @@ public class NoticeHelper {
             return "";
         }
     }
-}
+}

apps/routerconsole/java/src/net/i2p/router/web/OldConsoleHelper.java

@@ -8,29 +8,9 @@ import java.io.Writer;
 import net.i2p.router.RouterContext;
 import net.i2p.router.admin.StatsGenerator;
 
-public class OldConsoleHelper {
-    private RouterContext _context;
-    private Writer _out;
-    /**
-     * Configure this bean to query a particular router context
-     *
-     * @param contextId begging few characters of the routerHash, or null to pick
-     *                  the first one we come across.
-     */
-    public void setContextId(String contextId) {
-        try {
-            _context = ContextHelper.getContext(contextId);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-    
+public class OldConsoleHelper extends HelperBase {
     public OldConsoleHelper() {}
     
-    public void setWriter(Writer writer) { 
-        _out = writer; 
-    }
-    
     public String getConsole() {
         try {
             if (_out != null) {

apps/routerconsole/java/src/net/i2p/router/web/PeerHelper.java

@@ -5,28 +5,12 @@ import java.io.Writer;
 
 import net.i2p.router.RouterContext;
 
-public class PeerHelper {
-    private RouterContext _context;
-    private Writer _out;
+public class PeerHelper extends HelperBase {
     private int _sortFlags;
     private String _urlBase;
-    /**
-     * Configure this bean to query a particular router context
-     *
-     * @param contextId begging few characters of the routerHash, or null to pick
-     *                  the first one we come across.
-     */
-    public void setContextId(String contextId) {
-        try {
-            _context = ContextHelper.getContext(contextId);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
     
     public PeerHelper() {}
     
-    public void setOut(Writer out) { _out = out; }
     public void setSort(String flags) {
         if (flags != null) {
             try {

apps/routerconsole/java/src/net/i2p/router/web/ProfilesHelper.java

@@ -6,22 +6,7 @@ import java.io.OutputStreamWriter;
 
 import net.i2p.router.RouterContext;
 
-public class ProfilesHelper {
-    private RouterContext _context;
-    /**
-     * Configure this bean to query a particular router context
-     *
-     * @param contextId begging few characters of the routerHash, or null to pick
-     *                  the first one we come across.
-     */
-    public void setContextId(String contextId) {
-        try {
-            _context = ContextHelper.getContext(contextId);
-        } catch (Throwable t) {
-            t.printStackTrace();
-        }
-    }
-    
+public class ProfilesHelper extends HelperBase {
     public ProfilesHelper() {}
     
     public String getProfileSummary() {

apps/routerconsole/java/src/net/i2p/router/web/StatHelper.java

@@ -11,12 +11,10 @@ import net.i2p.router.RouterContext;
  * uuuugly.  dump the peer profile data if given a peer.
  *
  */
-public class StatHelper {
+public class StatHelper extends HelperBase {
     private String _peer;
-    private Writer _writer;
     
     public void setPeer(String peer) { _peer = peer; }
-    public void setWriter(Writer writer) { _writer = writer; }
     
     public String getProfile() { 
         RouterContext ctx = (RouterContext)net.i2p.router.RouterContext.listContexts().get(0);
@@ -25,10 +23,10 @@ public class StatHelper {
             Hash peer = (Hash)iter.next();
             if (peer.toBase64().startsWith(_peer)) {
                 try {
-                    WriterOutputStream wos = new WriterOutputStream(_writer);
+                    WriterOutputStream wos = new WriterOutputStream(_out);
                     ctx.profileOrganizer().exportProfile(peer, wos);
                     wos.flush();
-                    _writer.flush();
+                    _out.flush();
                     return "";
                 } catch (Exception e) {
                     e.printStackTrace();