From ce78639065c3d12b9bf4259310dfa93dff74905f Mon Sep 17 00:00:00 2001 From: knaccc Date: Sat, 24 Aug 2019 04:59:34 +0100 Subject: [PATCH] prevent duplicate port assignment --- .../src/org/getmonero/i2p/zero/TunnelControl.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/TunnelControl.java b/org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/TunnelControl.java index 19b1157..2697262 100644 --- a/org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/TunnelControl.java +++ b/org.getmonero.i2p.zero/src/org/getmonero/i2p/zero/TunnelControl.java @@ -121,7 +121,7 @@ public class TunnelControl implements Runnable { case "server": case "eepsite": entry.put("host", t.getHost()); - entry.put("port", t.getPort()); + entry.put("port", t.getPort()+""); entry.put("dest", t.getI2P()); if(includeKeyPairs) entry.put("keypair", ((ServerTunnel) t).keyPair.toString()); if(t.getType().equals("eepsite")) { @@ -136,12 +136,12 @@ public class TunnelControl implements Runnable { case "client": entry.put("dest", t.getI2P()); - entry.put("port", t.getPort()); + entry.put("port", t.getPort()+""); break; case "socks": case "http": - entry.put("port", t.getPort()); + entry.put("port", t.getPort()+""); break; } } @@ -487,7 +487,7 @@ public class TunnelControl implements Runnable { } public boolean isPortAlreadyAssigned(int port) { - return tunnelList.tunnels.stream().anyMatch(t->!(t instanceof ServerTunnel) && t.getPort()!=port); + return tunnelList.tunnels.stream().anyMatch(t->!(t instanceof ServerTunnel) && t.getPort()==port); } @Override