From cd075fc8a600bd840dd827211af54e2bda2ff65a Mon Sep 17 00:00:00 2001
From: jrandom <jrandom>
Date: Wed, 17 Nov 2004 19:42:53 +0000
Subject: [PATCH] 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 | 6 +++---
history.txt | 6 +++++-
router/java/src/net/i2p/router/RouterVersion.java | 4 ++--
3 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java b/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java
index ad8532ab10..edafc53cbb 100644
--- a/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java
+++ b/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);
diff --git a/history.txt b/history.txt
index 56f23096f9..01db0b772e 100644
--- a/history.txt
+++ b/history.txt
@@ -1,4 +1,8 @@
-$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.
diff --git a/router/java/src/net/i2p/router/RouterVersion.java b/router/java/src/net/i2p/router/RouterVersion.java
index 96ad51e44c..7bb0c23c89 100644
--- a/router/java/src/net/i2p/router/RouterVersion.java
+++ b/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);
--
GitLab