From bd489cf4391d10bbd238cc8a640be64d6c43b252 Mon Sep 17 00:00:00 2001
From: sponge <sponge@mail.i2p>
Date: Sat, 4 Apr 2009 19:47:36 +0000
Subject: [PATCH] 2009-04-04 sponge * Hopeful fixups to the infamous
orpahned tunnel problem. * BOB now 0.0.5
---
apps/BOB/nbproject/project.properties | 1 +
apps/BOB/src/net/i2p/BOB/BOB.java | 3 +-
apps/BOB/src/net/i2p/BOB/DoCMDS.java | 2 +-
apps/BOB/src/net/i2p/BOB/I2Plistener.java | 108 +++++++----
apps/BOB/src/net/i2p/BOB/I2PtoTCP.java | 4 +-
apps/BOB/src/net/i2p/BOB/MUXlisten.java | 14 +-
apps/BOB/src/net/i2p/BOB/Main.java | 5 +-
apps/BOB/src/net/i2p/BOB/TCPio.java | 21 +--
apps/BOB/src/net/i2p/BOB/TCPlistener.java | 168 ++++++++++++------
apps/BOB/src/net/i2p/BOB/TCPtoI2P.java | 21 +--
.../src/net/i2p/router/RouterVersion.java | 2 +-
11 files changed, 229 insertions(+), 120 deletions(-)
diff --git a/apps/BOB/nbproject/project.properties b/apps/BOB/nbproject/project.properties
index ee493f7643..9eeffd29f1 100644
--- a/apps/BOB/nbproject/project.properties
+++ b/apps/BOB/nbproject/project.properties
@@ -27,6 +27,7 @@ excludes=
file.reference.build-javadoc=../../i2p.i2p/build/javadoc
file.reference.i2p.jar=../../core/java/build/i2p.jar
file.reference.i2ptunnel.jar=../i2ptunnel/java/build/i2ptunnel.jar
+file.reference.jbigi.jar=../../installer/lib/jbigi/jbigi.jar
file.reference.mstreaming.jar=../ministreaming/java/build/mstreaming.jar
file.reference.router.jar=../../router/java/build/router.jar
file.reference.streaming.jar=../streaming/java/build/streaming.jar
diff --git a/apps/BOB/src/net/i2p/BOB/BOB.java b/apps/BOB/src/net/i2p/BOB/BOB.java
index 59b46b8d74..48a0e067c6 100644
--- a/apps/BOB/src/net/i2p/BOB/BOB.java
+++ b/apps/BOB/src/net/i2p/BOB/BOB.java
@@ -34,6 +34,7 @@ import java.util.Properties;
import net.i2p.client.I2PClient;
import net.i2p.client.streaming.RetransmissionTimer;
import net.i2p.util.Log;
+
/**
* <span style="font-size:8px;font-family:courier;color:#EEEEEE;background-color:#000000">
* ################################################################################<br>
@@ -157,12 +158,12 @@ public class BOB {
boolean save = false;
// Set up all defaults to be passed forward to other threads.
// Re-reading the config file in each thread is pretty damn stupid.
- // I2PClient client = I2PClientFactory.createClient();
String configLocation = System.getProperty(PROP_CONFIG_LOCATION, "bob.config");
// This is here just to ensure there is no interference with our threadgroups.
RetransmissionTimer Y = RetransmissionTimer.getInstance();
i = Y.hashCode();
+
{
try {
FileInputStream fi = new FileInputStream(configLocation);
diff --git a/apps/BOB/src/net/i2p/BOB/DoCMDS.java b/apps/BOB/src/net/i2p/BOB/DoCMDS.java
index 099d69feca..12d8d61560 100644
--- a/apps/BOB/src/net/i2p/BOB/DoCMDS.java
+++ b/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 = "04", BEXT = "";
+ public static final String BMAJ = "00", BMIN = "00", BREV = "05", BEXT = "";
public static final String BOBversion = BMAJ + "." + BMIN + "." + BREV + BEXT;
private Socket server;
private Properties props;
diff --git a/apps/BOB/src/net/i2p/BOB/I2Plistener.java b/apps/BOB/src/net/i2p/BOB/I2Plistener.java
index c59683270e..813bb5d343 100644
--- a/apps/BOB/src/net/i2p/BOB/I2Plistener.java
+++ b/apps/BOB/src/net/i2p/BOB/I2Plistener.java
@@ -62,6 +62,26 @@ public class I2Plistener implements Runnable {
tgwatch = 1;
}
+ private void rlock() throws Exception {
+ database.getReadLock();
+ info.getReadLock();
+ }
+
+ private void runlock() throws Exception {
+ database.releaseReadLock();
+ info.releaseReadLock();
+ }
+
+ private void wlock() throws Exception {
+ database.getWriteLock();
+ info.getWriteLock();
+ }
+
+ private void wunlock() throws Exception {
+ info.releaseWriteLock();
+ database.releaseWriteLock();
+ }
+
/**
* Simply listen on I2P port, and thread connections
*
@@ -70,68 +90,86 @@ public class I2Plistener implements Runnable {
boolean g = false;
I2PSocket sessSocket = null;
- serverSocket.setSoTimeout(50);
- database.getReadLock();
- info.getReadLock();
- if(info.exists("INPORT")) {
- tgwatch = 2;
- }
- info.releaseReadLock();
- database.releaseReadLock();
- boolean spin = true;
- while(spin) {
+die: {
- database.getReadLock();
- info.getReadLock();
- spin = info.get("RUNNING").equals(Boolean.TRUE);
- info.releaseReadLock();
- database.releaseReadLock();
+ serverSocket.setSoTimeout(50);
try {
+ if (info.exists("INPORT")) {
+ tgwatch = 2;
+ }
+ } catch (Exception e) {
+ try {
+ runlock();
+ } catch (Exception e2) {
+ break die;
+ }
+ break die;
+ }
+ boolean spin = true;
+ while (spin) {
+
try {
- sessSocket = serverSocket.accept();
- g = true;
- } catch(ConnectException ce) {
- g = false;
- } catch(SocketTimeoutException ste) {
- g = false;
+ rlock();
+ } catch (Exception e) {
+ break die;
}
- if(g) {
- g = false;
- // toss the connection to a new thread.
- I2PtoTCP conn_c = new I2PtoTCP(sessSocket, info, database);
- Thread t = new Thread(conn_c, "BOBI2PtoTCP");
- t.start();
+ try {
+ spin = info.get("RUNNING").equals(Boolean.TRUE);
+ } catch (Exception e) {
+ try {
+ runlock();
+ } catch (Exception e2) {
+ break die;
+ }
+ break die;
}
+ try {
+ try {
+ sessSocket = serverSocket.accept();
+ g = true;
+ } catch (ConnectException ce) {
+ g = false;
+ } catch (SocketTimeoutException ste) {
+ g = false;
+ }
+ if (g) {
+ g = false;
+ // toss the connection to a new thread.
+ I2PtoTCP conn_c = new I2PtoTCP(sessSocket, info, database);
+ Thread t = new Thread(conn_c, "BOBI2PtoTCP");
+ t.start();
+ }
- } catch(I2PException e) {
- // System.out.println("Exception " + e);
+ } catch (I2PException e) {
+ // System.out.println("Exception " + e);
+ }
}
}
// System.out.println("I2Plistener: Close");
try {
serverSocket.close();
- } catch(I2PException e) {
+ } catch (I2PException e) {
// nop
}
// need to kill off the socket manager too.
I2PSession session = socketManager.getSession();
- if(session != null) {
+ if (session != null) {
// System.out.println("I2Plistener: destroySession");
try {
session.destroySession();
- } catch(I2PSessionException ex) {
+ } catch (I2PSessionException ex) {
// nop
}
}
// System.out.println("I2Plistener: Waiting for children");
- while(Thread.activeCount() > tgwatch) { // wait for all threads in our threadgroup to finish
+ while (Thread.activeCount() > tgwatch) { // wait for all threads in our threadgroup to finish
try {
Thread.sleep(100); //sleep for 100 ms (One tenth second)
- } catch(Exception e) {
+ } catch (Exception e) {
// nop
}
}
- // System.out.println("I2Plistener: Done.");
+ // System.out.println("I2Plistener: Done.");
}
}
diff --git a/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java b/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java
index 5d24e19d36..06c3131fee 100644
--- a/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java
+++ b/apps/BOB/src/net/i2p/BOB/I2PtoTCP.java
@@ -105,8 +105,8 @@ die: {
out.flush(); // not really needed, but...
}
// setup to cross the streams
- TCPio conn_c = new TCPio(in, Iout, info, database); // app -> I2P
- TCPio conn_a = new TCPio(Iin, out, info, database); // I2P -> app
+ TCPio conn_c = new TCPio(in, Iout /*, info, database */ ); // app -> I2P
+ TCPio conn_a = new TCPio(Iin, out /* , info, database */); // I2P -> app
Thread t = new Thread(conn_c, "TCPioA");
Thread q = new Thread(conn_a, "TCPioB");
// Fire!
diff --git a/apps/BOB/src/net/i2p/BOB/MUXlisten.java b/apps/BOB/src/net/i2p/BOB/MUXlisten.java
index 89ab53fe62..879cf9a64a 100644
--- a/apps/BOB/src/net/i2p/BOB/MUXlisten.java
+++ b/apps/BOB/src/net/i2p/BOB/MUXlisten.java
@@ -100,7 +100,7 @@ public class MUXlisten implements Runnable {
// Everything is OK as far as we can tell.
this.database.getWriteLock();
this.info.getWriteLock();
- this.info.add("STARTING", Boolean.TRUE);
+ this.info.add("STARTING", new Boolean(true));
this.info.releaseWriteLock();
this.database.releaseWriteLock();
}
@@ -134,8 +134,8 @@ public class MUXlisten implements Runnable {
try {
wlock();
try {
- info.add("RUNNING", Boolean.TRUE);
- info.add("STARTING", Boolean.FALSE);
+ info.add("RUNNING", new Boolean(true));
+ info.add("STARTING", new Boolean(false));
} catch(Exception e) {
wunlock();
return;
@@ -198,7 +198,7 @@ die: {
try {
wlock();
try {
- info.add("RUNNING", Boolean.FALSE);
+ info.add("RUNNING", new Boolean(false));
} catch(Exception e) {
wunlock();
break die;
@@ -255,9 +255,9 @@ die: {
try {
wlock();
try {
- info.add("STARTING", Boolean.FALSE);
- info.add("STOPPING", Boolean.FALSE);
- info.add("RUNNING", Boolean.FALSE);
+ info.add("STARTING", new Boolean(false));
+ info.add("STOPPING", new Boolean(false));
+ info.add("RUNNING", new Boolean(false));
} catch(Exception e) {
wunlock();
return;
diff --git a/apps/BOB/src/net/i2p/BOB/Main.java b/apps/BOB/src/net/i2p/BOB/Main.java
index 2d81fb30ed..b32e4758ef 100644
--- a/apps/BOB/src/net/i2p/BOB/Main.java
+++ b/apps/BOB/src/net/i2p/BOB/Main.java
@@ -24,7 +24,7 @@
package net.i2p.BOB;
import net.i2p.client.streaming.RetransmissionTimer;
-
+import net.i2p.util.SimpleScheduler;
/**
* Start from command line
*
@@ -39,6 +39,9 @@ public class Main {
public static void main(String[] args) {
// THINK THINK THINK THINK THINK THINK
RetransmissionTimer Y = RetransmissionTimer.getInstance();
+ // needs SimpleScheduler
+ // no way to stop the scheduler?!?
+ SimpleScheduler.getInstance();
BOB.main(args);
Y.stop();
}
diff --git a/apps/BOB/src/net/i2p/BOB/TCPio.java b/apps/BOB/src/net/i2p/BOB/TCPio.java
index c9f4ab64cd..109d8e8cb5 100644
--- a/apps/BOB/src/net/i2p/BOB/TCPio.java
+++ b/apps/BOB/src/net/i2p/BOB/TCPio.java
@@ -35,7 +35,7 @@ public class TCPio implements Runnable {
private InputStream Ain;
private OutputStream Aout;
- private NamedDB info, database;
+ // private NamedDB info, database;
/**
* Constructor
@@ -43,13 +43,14 @@ public class TCPio implements Runnable {
* @param Ain
* @param Aout
* @param info
- * @param database
+ *
+ * param database
*/
- TCPio(InputStream Ain, OutputStream Aout, NamedDB info, NamedDB database) {
+ TCPio(InputStream Ain, OutputStream Aout /*, NamedDB info , NamedDB database */) {
this.Ain = Ain;
this.Aout = Aout;
- this.info = info;
- this.database = database;
+ // this.info = info;
+ // this.database = database;
}
/**
@@ -86,11 +87,11 @@ public class TCPio implements Runnable {
boolean spin = true;
try {
while(spin) {
- database.getReadLock();
- info.getReadLock();
- spin = info.get("RUNNING").equals(Boolean.TRUE);
- info.releaseReadLock();
- database.releaseReadLock();
+ // database.getReadLock();
+ // info.getReadLock();
+ // spin = info.get("RUNNING").equals(Boolean.TRUE);
+ // info.releaseReadLock();
+ // database.releaseReadLock();
b = Ain.read(a, 0, 1);
// System.out.println(info.get("NICKNAME").toString() + " " + b);
if(b > 0) {
diff --git a/apps/BOB/src/net/i2p/BOB/TCPlistener.java b/apps/BOB/src/net/i2p/BOB/TCPlistener.java
index 30380a55dd..7e931768c9 100644
--- a/apps/BOB/src/net/i2p/BOB/TCPlistener.java
+++ b/apps/BOB/src/net/i2p/BOB/TCPlistener.java
@@ -63,6 +63,26 @@ public class TCPlistener implements Runnable {
tgwatch = 1;
}
+ private void rlock() throws Exception {
+ database.getReadLock();
+ info.getReadLock();
+ }
+
+ private void runlock() throws Exception {
+ database.releaseReadLock();
+ info.releaseReadLock();
+ }
+
+ private void wlock() throws Exception {
+ database.getWriteLock();
+ info.getWriteLock();
+ }
+
+ private void wunlock() throws Exception {
+ info.releaseWriteLock();
+ database.releaseWriteLock();
+ }
+
/**
* Simply listen on TCP port, and thread connections
*
@@ -70,77 +90,121 @@ public class TCPlistener implements Runnable {
public void run() {
boolean g = false;
boolean spin = true;
- database.getReadLock();
- info.getReadLock();
- if(info.exists("OUTPORT")) {
- tgwatch = 2;
- }
- try {
- Socket server = new Socket();
- listener.setSoTimeout(50); // Half of the expected time from MUXlisten
- info.releaseReadLock();
- database.releaseReadLock();
- while(spin) {
- database.getReadLock();
- info.getReadLock();
- spin = info.get("RUNNING").equals(Boolean.TRUE);
- info.releaseReadLock();
- database.releaseReadLock();
- try {
- server = listener.accept();
- g = true;
- } catch(SocketTimeoutException ste) {
- g = false;
+
+die: {
+ try {
+ rlock();
+ } catch (Exception e) {
+ break die;
+ }
+ try {
+ if (info.exists("OUTPORT")) {
+ tgwatch = 2;
}
- if(g) {
- // toss the connection to a new thread.
- TCPtoI2P conn_c = new TCPtoI2P(socketManager, server, info, database);
- Thread t = new Thread(conn_c, "BOBTCPtoI2P");
- t.start();
- g = false;
+ } catch (Exception e) {
+ try {
+ runlock();
+ } catch (Exception e2) {
+ break die;
}
+ break die;
}
- //System.out.println("TCPlistener: destroySession");
- listener.close();
- } catch(IOException ioe) {
try {
- listener.close();
- } catch(IOException e) {
+ runlock();
+ } catch (Exception e) {
+ break die;
}
- // Fatal failure, cause a stop event
- database.getReadLock();
- info.getReadLock();
- spin = info.get("RUNNING").equals(Boolean.TRUE);
- info.releaseReadLock();
- database.releaseReadLock();
- if(spin) {
- database.getWriteLock();
- info.getWriteLock();
- info.add("STOPPING", new Boolean(true));
- info.add("RUNNING", new Boolean(false));
- info.releaseWriteLock();
- database.releaseWriteLock();
+ try {
+ Socket server = new Socket();
+ listener.setSoTimeout(50); // Half of the expected time from MUXlisten
+ while (spin) {
+ try {
+ rlock();
+ } catch (Exception e) {
+ break die;
+ }
+ try {
+ spin = info.get("RUNNING").equals(Boolean.TRUE);
+ } catch (Exception e) {
+ try {
+ runlock();
+ } catch (Exception e2) {
+ break die;
+ }
+ break die;
+ }
+ try {
+ server = listener.accept();
+ g = true;
+ } catch (SocketTimeoutException ste) {
+ g = false;
+ }
+ if (g) {
+ // toss the connection to a new thread.
+ TCPtoI2P conn_c = new TCPtoI2P(socketManager, server /* , info, database */);
+ Thread t = new Thread(conn_c, "BOBTCPtoI2P");
+ t.start();
+ g = false;
+ }
+ }
+ //System.out.println("TCPlistener: destroySession");
+ listener.close();
+ } catch (IOException ioe) {
+ try {
+ listener.close();
+ } catch (IOException e) {
+ }
+ // Fatal failure, cause a stop event
+ try {
+ rlock();
+ try {
+ spin = info.get("RUNNING").equals(Boolean.TRUE);
+ } catch (Exception e) {
+ runlock();
+ break die;
+ }
+ } catch (Exception e) {
+ break die;
+ }
+ if (spin) {
+ try {
+ wlock();
+ try {
+ info.add("STOPPING", new Boolean(true));
+ info.add("RUNNING", new Boolean(false));
+ } catch (Exception e) {
+ wunlock();
+ break die;
+ }
+ } catch (Exception e) {
+ break die;
+ }
+ try {
+ wunlock();
+ } catch (Exception e) {
+ break die;
+ }
+ }
}
}
-
// need to kill off the socket manager too.
I2PSession session = socketManager.getSession();
- if(session != null) {
+ if (session != null) {
try {
session.destroySession();
- } catch(I2PSessionException ex) {
+ } catch (I2PSessionException ex) {
// nop
}
}
//System.out.println("TCPlistener: Waiting for children");
- while(Thread.activeCount() > tgwatch) { // wait for all threads in our threadgroup to finish
+ while (Thread.activeCount() > tgwatch) { // wait for all threads in our threadgroup to finish
try {
Thread.sleep(100); //sleep for 100 ms (One tenth second)
- } catch(Exception e) {
+ } catch (Exception e) {
// nop
- }
+ }
}
- //System.out.println("TCPlistener: Done.");
+ //System.out.println("TCPlistener: Done.");
}
}
diff --git a/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java b/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java
index df61e78e1b..fe1ca32788 100644
--- a/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java
+++ b/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java
@@ -45,7 +45,7 @@ import net.i2p.i2ptunnel.I2PTunnel;
public class TCPtoI2P implements Runnable {
private I2PSocket I2P;
- private NamedDB info, database;
+ // private NamedDB info, database;
private Socket sock;
private I2PSocketManager socketManager;
@@ -84,13 +84,13 @@ public class TCPtoI2P implements Runnable {
* Constructor
* @param i2p
* @param socket
- * @param info
- * @param database
+ * param info
+ * param database
*/
- TCPtoI2P(I2PSocketManager i2p, Socket socket, NamedDB info, NamedDB database) {
+ TCPtoI2P(I2PSocketManager i2p, Socket socket /*, NamedDB info, NamedDB database */) {
this.sock = socket;
- this.info = info;
- this.database = database;
+ // this.info = info;
+ // this.database = database;
this.socketManager = i2p;
}
@@ -110,6 +110,7 @@ public class TCPtoI2P implements Runnable {
/**
* TCP stream to I2P stream thread starter
+ *
*/
public void run() {
String line, input;
@@ -138,8 +139,8 @@ public class TCPtoI2P implements Runnable {
InputStream Iin = I2P.getInputStream();
OutputStream Iout = I2P.getOutputStream();
// setup to cross the streams
- TCPio conn_c = new TCPio(in, Iout, info, database); // app -> I2P
- TCPio conn_a = new TCPio(Iin, out, info, database); // I2P -> app
+ TCPio conn_c = new TCPio(in, Iout /*, info, database */); // app -> I2P
+ TCPio conn_a = new TCPio(Iin, out /*, info, database */); // I2P -> app
Thread t = new Thread(conn_c, "TCPioA");
Thread q = new Thread(conn_a, "TCPioB");
// Fire!
@@ -167,7 +168,8 @@ public class TCPtoI2P implements Runnable {
} catch(Exception e) {
Emsg("ERROR " + e.toString(), out);
}
- } catch(IOException ioe) {
+ } catch(Exception e) {
+ // bail on anything else
}
try {
// System.out.println("TCPtoI2P: Close I2P");
@@ -181,6 +183,5 @@ public class TCPtoI2P implements Runnable {
} catch(Exception e) {
}
// System.out.println("TCPtoI2P: Done.");
-
}
}
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index d1e87948b1..eeea3faa97 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/router/java/src/net/i2p/router/RouterVersion.java
@@ -17,7 +17,7 @@ import net.i2p.CoreVersion;
public class RouterVersion {
public final static String ID = "$Revision: 1.548 $ $Date: 2008-06-07 23:00:00 $";
public final static String VERSION = CoreVersion.VERSION;
- public final static long BUILD = 7;
+ public final static long BUILD = 8;
public static void main(String args[]) {
System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
System.out.println("Router ID: " + RouterVersion.ID);
--
GitLab