From 2415c5a38bdbc217ad5d27c341ea00c3cf38743d Mon Sep 17 00:00:00 2001 From: sponge Date: Fri, 16 Apr 2010 19:38:40 +0000 Subject: [PATCH] * BOB early session destroy to speed up tunnel tare-down. --- apps/BOB/nbproject/private/private.xml | 3 ++- apps/BOB/src/net/i2p/BOB/DoCMDS.java | 2 +- apps/BOB/src/net/i2p/BOB/MUXlisten.java | 13 +++++++++++++ history.txt | 3 +++ router/java/src/net/i2p/router/RouterVersion.java | 2 +- 5 files changed, 20 insertions(+), 3 deletions(-) diff --git a/apps/BOB/nbproject/private/private.xml b/apps/BOB/nbproject/private/private.xml index 683809948c..eeb608664a 100644 --- a/apps/BOB/nbproject/private/private.xml +++ b/apps/BOB/nbproject/private/private.xml @@ -2,6 +2,7 @@ - file:/usblv/NetBeansProjects/i2p.i2p/apps/BOB/src/net/i2p/BOB/TCPtoI2P.java + file:/usblv/NetBeansProjects/i2p.i2p/apps/BOB/src/net/i2p/BOB/MUXlisten.java + file:/usblv/NetBeansProjects/i2p.i2p/apps/BOB/src/net/i2p/BOB/Main.java diff --git a/apps/BOB/src/net/i2p/BOB/DoCMDS.java b/apps/BOB/src/net/i2p/BOB/DoCMDS.java index 4a037971f7..22664c856d 100644 --- a/apps/BOB/src/net/i2p/BOB/DoCMDS.java +++ b/apps/BOB/src/net/i2p/BOB/DoCMDS.java @@ -50,7 +50,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 = "0B", BEXT = ""; + public static final String BMAJ = "00", BMIN = "00", BREV = "0C", 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/MUXlisten.java b/apps/BOB/src/net/i2p/BOB/MUXlisten.java index 671fffa952..6a9e7b36c5 100644 --- a/apps/BOB/src/net/i2p/BOB/MUXlisten.java +++ b/apps/BOB/src/net/i2p/BOB/MUXlisten.java @@ -311,6 +311,19 @@ public class MUXlisten implements Runnable { } catch (InterruptedException ex) { } + // Hopefully nuke stuff here... + { + String boner = tg.getName(); + try { + _log.warn("destroySocketManager " + boner); + socketManager.destroySocketManager(); + _log.warn("destroySocketManager Successful" + boner); + } catch (Exception e) { + // nop + _log.warn("destroySocketManager Failed" + boner); + _log.warn(e.toString()); + } + } // zero out everything. try { wlock(); diff --git a/history.txt b/history.txt index 4cbd7265ab..313a3ce751 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,6 @@ +2010-04-16 sponge + * BOB early session destroy to speed up tunnel tare-down. + 2010-04-15 zzz * DataHelper: Limit max length in readline() * Floodfills: Increase max to 100 (was 60) and min to 60 (was 45) diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java index 46b0184db4..cef5686075 100644 --- a/router/java/src/net/i2p/router/RouterVersion.java +++ b/router/java/src/net/i2p/router/RouterVersion.java @@ -18,7 +18,7 @@ public class RouterVersion { /** deprecated */ public final static String ID = "Monotone"; public final static String VERSION = CoreVersion.VERSION; - public final static long BUILD = 11; + public final static long BUILD = 12; /** for example "-test" */ public final static String EXTRA = "-rc";