propagate from branch 'i2p.i2p.zzz.test' (head 8926fc63796bf18b615460f036598090e038462c)

            to branch 'i2p.i2p' (head a0a51ce09fc12b75238432d8926103af46696820)

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/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/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelIRCServer.java

@@ -16,6 +16,7 @@ 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;
@@ -36,26 +37,27 @@ import net.i2p.util.Log;
  * "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=none:           Don't cloak. Users may be correlated with their
- *                                        (probably) shared clients destination.
- *                                        Of course if the ircd does cloaking than this is ok.
  *   - 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);
-    private static final String PROP_CLOAK="ircserver.cloakKey";
-    private boolean _cloak;
-    private byte[] _cloakKey; // 32 bytes of stuff to scramble the dest with
+    
     
     /**
      * @throws IllegalArgumentException if the I2PTunnel does not contain
@@ -71,15 +73,14 @@ public class I2PTunnelIRCServer extends I2PTunnelServer implements Runnable {
     private void initCloak(I2PTunnel tunnel) {
         Properties opts = tunnel.getClientOptions();
         String passphrase = opts.getProperty(PROP_CLOAK);
-        _cloak = passphrase == null || !"none".equals(passphrase);
-        if (_cloak) {
-            if (passphrase == null) {
-                _cloakKey = new byte[Hash.HASH_LENGTH];
-                tunnel.getContext().random().nextBytes(_cloakKey);
-            } else {
-                _cloakKey = SHA256Generator.getInstance().calculateHash(passphrase.trim().getBytes()).getData();
-            }
+        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) {
@@ -122,16 +123,17 @@ public class I2PTunnelIRCServer extends I2PTunnelServer implements Runnable {
      *
      */
     String cloakDest(Destination d) {
-        Hash h;
-        if (_cloak) {
-            byte[] b = new byte[d.size() + _cloakKey.length];
-            System.arraycopy(b, 0, d.toByteArray(), 0, d.size());
-            System.arraycopy(b, d.size(), _cloakKey, 0, _cloakKey.length);
-            h = SHA256Generator.getInstance().calculateHash(b);
-        } else {
-            h = d.calculateHash();
-        }
-        return h.toBase64().substring(0, 8) + ".i2p";
+        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 */
@@ -156,9 +158,10 @@ public class I2PTunnelIRCServer extends I2PTunnelServer implements Runnable {
             if(field[0].charAt(0)==':')
                 idx++;
 
-            try { command = field[idx++]; }
-             catch (IndexOutOfBoundsException ioobe) // wtf, server sent borked command?
-            {
+            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.");
             }
 
@@ -169,7 +172,8 @@ public class I2PTunnelIRCServer extends I2PTunnelServer implements Runnable {
                 //  =>
                 // USER zzz1 abcd1234.i2p localhost :zzz
                 // this whole class is for these two lines...
-                buf.append("USER ").append(field[idx]).append(' ').append(newHostname).append(".i2p ");
+                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;
             }
@@ -181,4 +185,7 @@ public class I2PTunnelIRCServer extends I2PTunnelServer implements Runnable {
             _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;
 }

core/java/src/net/i2p/data/PrivateKeyFile.java

@@ -261,7 +261,7 @@ public class PrivateKeyFile {
     public String toString() {
         StringBuffer s = new StringBuffer(128);
         s.append("Dest: ");
-        s.append(this.dest.toBase64());
+        s.append(this.dest != null ? this.dest.toBase64() : "null");
         s.append("\nContains: ");
         s.append(this.dest);
         s.append("\nPrivate Key: ");

history.txt

+2009-02-26 zzz
+    * I2CP Client: Add support for muxing
+    * I2PTunnel:
+      - Add new IRCServer tunnel type
+      - Add SOCKS 4/4a support
+      - Catch OOMs in HTTPServer
+      - Name the IRCClient filter threads
+      - Port Streamr to I2PTunnel
+      - The beginnings of SOCKS UDP support
+    * Naming: Add reverse lookup by hash
+    * OCMOSJ: Clean up the cache cleaning
+    * Router: Move addShutdownTask from Router to I2PAppContext
+      so that apps can register more easily
+    * Routerconsole:
+      - Thread hard shutdown and restart requests from the routerconsole,
+        and add a delay even if no tunnels, to allow time for a UI response
+      - Sort the summary bar destinations
+      - Move dest-to-hash converter to new helper class so we can
+        use it in i2ptunnel
+
+2009-02-22 sponge
+    * BOB: Orphan tunnel issue fix, bump BOB version
+    * bump to Build 6
+
 2009-02-16 zzz
     * Streaming lib: Plug timer leak, don't send keepalives
       after close, don't disconnect hard after close

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 = 5;
+    public final static long BUILD = 7;
     public static void main(String args[]) {
         System.out.println("I2P Router version: " + VERSION + "-" + BUILD);
         System.out.println("Router ID: " + RouterVersion.ID);