2004-11-17 jrandom

    * Fix to propogate i2psocket options into the SAM bridge correctly (thanks
      Ragnarok!)

apps/sam/java/src/net/i2p/sam/SAMStreamSession.java

@@ -180,9 +180,9 @@ public class SAMStreamSession {
         Destination d = new Destination();
         d.fromBase64(dest);
 
-        // FIXME: we should config I2PSocketOptions here
-        I2PSocketOptions opts = socketMgr.buildOptions();
-        opts.setConnectTimeout(60 * 1000);
+        I2PSocketOptions opts = socketMgr.buildOptions(props);
+        if (props.getProperty(I2PSocketOptions.PROP_CONNECT_TIMEOUT) == null)
+            opts.setConnectTimeout(60 * 1000);
 
         _log.debug("Connecting new I2PSocket...");
         I2PSocket i2ps = socketMgr.connect(d, opts);

history.txt

-$Id: history.txt,v 1.73 2004/11/16 17:11:12 jrandom Exp $
+$Id: history.txt,v 1.74 2004/11/17 13:34:25 jrandom Exp $
+
+2004-11-17  jrandom
+    * Fix to propogate i2psocket options into the SAM bridge correctly (thanks
+      Ragnarok!)
 
 2004-11-17  jrandom
     * Minor logging update.

router/java/src/net/i2p/router/RouterVersion.java

@@ -15,9 +15,9 @@ import net.i2p.CoreVersion;
  *
  */
 public class RouterVersion {
-    public final static String ID = "$Revision: 1.78 $ $Date: 2004/11/16 17:11:12 $";
+    public final static String ID = "$Revision: 1.79 $ $Date: 2004/11/17 13:34:26 $";
     public final static String VERSION = "0.4.1.4";
-    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);
         System.out.println("Router ID: " + RouterVersion.ID);