diff --git a/apps/streaming/java/test/net/i2p/client/streaming/ConnectInactivityTest.java b/apps/streaming/java/test/net/i2p/client/streaming/ConnectInactivityTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..33804fb6a7166efbc581175374837d43cbf26c14
--- /dev/null
+++ b/apps/streaming/java/test/net/i2p/client/streaming/ConnectInactivityTest.java
@@ -0,0 +1,131 @@
+package net.i2p.client.streaming;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.Properties;
+
+import net.i2p.I2PAppContext;
+import net.i2p.client.I2PClient;
+import net.i2p.client.I2PClientFactory;
+import net.i2p.client.I2PSession;
+import net.i2p.data.Destination;
+import net.i2p.util.Log;
+
+/**
+ *
+ */
+public class ConnectInactivityTest {
+ private Log _log;
+ private I2PSession _client;
+ private I2PSession _server;
+ public void test() {
+ try {
+ I2PAppContext context = I2PAppContext.getGlobalContext();
+ _log = context.logManager().getLog(ConnectTest.class);
+ _log.debug("creating server session");
+ _server = createSession();
+ _log.debug("running server");
+ runServer(context, _server);
+ _log.debug("creating client session");
+ _client = createSession();
+ _log.debug("running client");
+ runClient(context, _client);
+ } catch (Exception e) {
+ _log.error("error running", e);
+ }
+ }
+
+ private void runClient(I2PAppContext ctx, I2PSession session) {
+ Thread t = new Thread(new ClientRunner(ctx, session));
+ t.setName("client");
+ t.setDaemon(false);
+ t.start();
+ }
+
+ private void runServer(I2PAppContext ctx, I2PSession session) {
+ Thread t = new Thread(new ServerRunner(ctx, session));
+ t.setName("server");
+ t.setDaemon(false);
+ t.start();
+ }
+
+ private class ServerRunner implements Runnable {
+ private I2PAppContext _context;
+ private I2PSession _session;
+ private Log _log;
+ public ServerRunner(I2PAppContext ctx, I2PSession session) {
+ _context = ctx;
+ _session = session;
+ _log = ctx.logManager().getLog(ServerRunner.class);
+ }
+
+ public void run() {
+ try {
+ Properties opts = new Properties();
+ I2PSocketManager mgr = new I2PSocketManagerFull(_context, _session, opts, "client");
+ _log.debug("manager created");
+ I2PServerSocket ssocket = mgr.getServerSocket();
+ _log.debug("server socket created");
+ I2PSocket socket = ssocket.accept();
+ _log.debug("socket accepted: " + socket);
+ try { Thread.sleep(10*60*1000); } catch (InterruptedException ie) {}
+ socket.close();
+ ssocket.close();
+ _session.destroySession();
+ } catch (Exception e) {
+ _log.error("error running", e);
+ }
+ }
+
+ }
+
+ private class ClientRunner implements Runnable {
+ private I2PAppContext _context;
+ private I2PSession _session;
+ private Log _log;
+ public ClientRunner(I2PAppContext ctx, I2PSession session) {
+ _context = ctx;
+ _session = session;
+ _log = ctx.logManager().getLog(ClientRunner.class);
+ }
+
+ public void run() {
+ try {
+ Properties opts = new Properties();
+ I2PSocketManager mgr = new I2PSocketManagerFull(_context, _session, opts, "client");
+ _log.debug("manager created");
+ I2PSocket socket = mgr.connect(_server.getMyDestination());
+ _log.debug("socket created");
+ try { Thread.sleep(10*60*1000); } catch (InterruptedException ie) {}
+ socket.close();
+ _log.debug("socket closed");
+ //_session.destroySession();
+ } catch (Exception e) {
+ _log.error("error running", e);
+ }
+ }
+
+ }
+
+ private I2PSession createSession() {
+ try {
+ I2PClient client = I2PClientFactory.createClient();
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(512);
+ Destination dest = client.createDestination(baos);
+ Properties p = new Properties();
+ p.setProperty(I2PClient.PROP_TCP_HOST, "localhost");
+ p.setProperty(I2PClient.PROP_TCP_PORT, "10001");
+ I2PSession sess = client.createSession(new ByteArrayInputStream(baos.toByteArray()), p);
+ sess.connect();
+ return sess;
+ } catch (Exception e) {
+ _log.error("error running", e);
+ throw new RuntimeException("b0rk b0rk b0rk");
+ }
+ }
+
+ public static void main(String args[]) {
+ ConnectInactivityTest ct = new ConnectInactivityTest();
+ ct.test();
+ }
+}
diff --git a/apps/streaming/java/test/net/i2p/client/streaming/ConnectTimeoutTest.java b/apps/streaming/java/test/net/i2p/client/streaming/ConnectTimeoutTest.java
new file mode 100644
index 0000000000000000000000000000000000000000..5b3b4e39d5e1c61a761fe09cffe1f37febe478a9
--- /dev/null
+++ b/apps/streaming/java/test/net/i2p/client/streaming/ConnectTimeoutTest.java
@@ -0,0 +1,160 @@
+package net.i2p.client.streaming;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.util.Properties;
+
+import net.i2p.I2PAppContext;
+import net.i2p.client.I2PClient;
+import net.i2p.client.I2PClientFactory;
+import net.i2p.client.I2PSession;
+import net.i2p.data.Destination;
+import net.i2p.util.Log;
+
+/**
+ * Try to connect to a new nonexistant peer and, of course,
+ * timeout.
+ */
+public class ConnectTimeoutTest {
+ private Log _log;
+ private I2PSession _client;
+ private I2PSession _server;
+ private Destination _serverDest;
+
+ public void testNonexistant() {
+ try {
+ I2PAppContext context = I2PAppContext.getGlobalContext();
+ _log = context.logManager().getLog(ConnectTest.class);
+ _log.debug("creating server dest");
+ try {
+ _serverDest = I2PClientFactory.createClient().createDestination(new ByteArrayOutputStream());
+ } catch (Exception e) {}
+ _log.debug("creating client session");
+ _client = createSession();
+ _log.debug("running client");
+ runClient(context, _client);
+ } catch (Exception e) {
+ _log.error("error running", e);
+ }
+ while (true) { synchronized (this) { try { wait(); } catch (Exception e) {} } }
+ }
+
+ public void test() {
+ try {
+ I2PAppContext context = I2PAppContext.getGlobalContext();
+ _log = context.logManager().getLog(ConnectTest.class);
+ _log.debug("creating server session");
+ _server = createSession();
+ _log.debug("running server");
+ runServer(context, _server);
+ _log.debug("creating client session");
+ _client = createSession();
+ _log.debug("running client");
+ runClient(context, _client);
+ } catch (Exception e) {
+ _log.error("error running", e);
+ }
+ try { Thread.sleep(30*1000); } catch (Exception e) {}
+ }
+
+ private void runClient(I2PAppContext ctx, I2PSession session) {
+ Thread t = new Thread(new ClientRunner(ctx, session));
+ t.setName("client");
+ t.setDaemon(true);
+ t.start();
+ }
+
+ private void runServer(I2PAppContext ctx, I2PSession session) {
+ Thread t = new Thread(new ServerRunner(ctx, session));
+ t.setName("server");
+ t.setDaemon(true);
+ t.start();
+ }
+
+ private class ServerRunner implements Runnable {
+ private I2PAppContext _context;
+ private I2PSession _session;
+ private Log _log;
+ public ServerRunner(I2PAppContext ctx, I2PSession session) {
+ _context = ctx;
+ _session = session;
+ _log = ctx.logManager().getLog(ServerRunner.class);
+ }
+
+ public void run() {
+ try {
+ I2PSocketManager mgr = I2PSocketManagerFactory.createManager("localhost", 10001, getProps());
+ _log.debug("manager created");
+ I2PServerSocket ssocket = mgr.getServerSocket();
+ _log.debug("server socket created");
+ while (true) {
+ I2PSocket socket = ssocket.accept();
+ _log.debug("socket accepted: " + socket);
+ try { Thread.sleep(10*1000); } catch (InterruptedException ie) {}
+ socket.close();
+ }
+ } catch (Exception e) {
+ _log.error("error running", e);
+ }
+ }
+
+ }
+
+ private class ClientRunner implements Runnable {
+ private I2PAppContext _context;
+ private I2PSession _session;
+ private Log _log;
+ public ClientRunner(I2PAppContext ctx, I2PSession session) {
+ _context = ctx;
+ _session = session;
+ _log = ctx.logManager().getLog(ClientRunner.class);
+ }
+
+ public void run() {
+ try {
+ I2PSocketManager mgr = I2PSocketManagerFactory.createManager("localhost", 10001, getProps());
+ _log.debug("manager created");
+ I2PSocket socket = mgr.connect(_serverDest);
+ _log.debug("socket created");
+ socket.getOutputStream().write("you smell".getBytes());
+ socket.getOutputStream().flush();
+ _log.error("wtf, shouldn't have flushed");
+ socket.close();
+ _log.debug("socket closed");
+ } catch (Exception e) {
+ _log.error("error running (yay!)", e);
+ }
+ }
+
+ }
+
+ private I2PSession createSession() {
+ try {
+ I2PClient client = I2PClientFactory.createClient();
+ ByteArrayOutputStream baos = new ByteArrayOutputStream(512);
+ Destination dest = client.createDestination(baos);
+ Properties p = getProps();
+
+ I2PSession sess = client.createSession(new ByteArrayInputStream(baos.toByteArray()), p);
+ sess.connect();
+ return sess;
+ } catch (Exception e) {
+ _log.error("error running", e);
+ throw new RuntimeException("b0rk b0rk b0rk");
+ }
+ }
+
+ public static void main(String args[]) {
+ ConnectTimeoutTest ct = new ConnectTimeoutTest();
+ ct.testNonexistant();
+ }
+
+ private static Properties getProps() {
+ Properties p = new Properties();
+ p.setProperty(I2PSocketManagerFactory.PROP_MANAGER, I2PSocketManagerFull.class.getName());
+ p.setProperty("tunnels.depthInbound", "0");
+ p.setProperty(I2PClient.PROP_TCP_HOST, "localhost");
+ p.setProperty(I2PClient.PROP_TCP_PORT, "10001");
+ return p;
+ }
+}