From be2083d430dcb78e8d490966c4aa7d083db82f19 Mon Sep 17 00:00:00 2001 From: Mikal Villa Date: Mon, 10 Jun 2019 09:39:46 +0200 Subject: [PATCH 1/2] Fixes i2cp bug while connecting to remote router --- core/src/main/groovy/com/muwire/core/Core.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/main/groovy/com/muwire/core/Core.groovy b/core/src/main/groovy/com/muwire/core/Core.groovy index db9e54f2..0e40d29c 100644 --- a/core/src/main/groovy/com/muwire/core/Core.groovy +++ b/core/src/main/groovy/com/muwire/core/Core.groovy @@ -91,6 +91,8 @@ public class Core { def i2pOptionsFile = new File(home,"i2p.properties") if (i2pOptionsFile.exists()) { i2pOptionsFile.withInputStream { i2pOptions.load(it) } + println "$i2pOptions" + if (!i2pOptions.hasProperty("inbound.nickname")) i2pOptions["inbound.nickname"] = "MuWire" if (!i2pOptions.hasProperty("outbound.nickname")) @@ -108,7 +110,7 @@ public class Core { I2PSession i2pSession I2PSocketManager socketManager keyDat.withInputStream { - socketManager = new I2PSocketManagerFactory().createManager(it, i2pOptions) + socketManager = new I2PSocketManagerFactory().createManager(it, i2pOptions["i2cp.tcp.host"], i2pOptions["i2cp.tcp.port"].toInteger(), i2pOptions) } socketManager.getDefaultOptions().setReadTimeout(60000) socketManager.getDefaultOptions().setConnectTimeout(30000) From fb4f56eec97ecf5e068d83a913506c404cfb2c69 Mon Sep 17 00:00:00 2001 From: Mikal Villa Date: Mon, 10 Jun 2019 09:40:32 +0200 Subject: [PATCH 2/2] Remove debug message --- core/src/main/groovy/com/muwire/core/Core.groovy | 1 - 1 file changed, 1 deletion(-) diff --git a/core/src/main/groovy/com/muwire/core/Core.groovy b/core/src/main/groovy/com/muwire/core/Core.groovy index 0e40d29c..90ba2fcb 100644 --- a/core/src/main/groovy/com/muwire/core/Core.groovy +++ b/core/src/main/groovy/com/muwire/core/Core.groovy @@ -91,7 +91,6 @@ public class Core { def i2pOptionsFile = new File(home,"i2p.properties") if (i2pOptionsFile.exists()) { i2pOptionsFile.withInputStream { i2pOptions.load(it) } - println "$i2pOptions" if (!i2pOptions.hasProperty("inbound.nickname")) i2pOptions["inbound.nickname"] = "MuWire"