diff --git a/apps/BOB/src/net/i2p/BOB/BOB.java b/apps/BOB/src/net/i2p/BOB/BOB.java index 0db0a1c294..a0cc6224fb 100644 --- a/apps/BOB/src/net/i2p/BOB/BOB.java +++ b/apps/BOB/src/net/i2p/BOB/BOB.java @@ -37,7 +37,6 @@ import java.util.jar.Manifest; import net.i2p.I2PAppContext; import net.i2p.app.*; import net.i2p.client.I2PClient; -import net.i2p.client.I2PSession; import net.i2p.util.I2PAppThread; import net.i2p.util.PortMapper; import net.i2p.util.SimpleTimer2; @@ -243,7 +242,7 @@ public class BOB implements Runnable, ClientApp { save = true; } if (!props.containsKey(I2PClient.PROP_TCP_PORT)) { - props.setProperty(I2PClient.PROP_TCP_PORT, Integer.toString(I2PSession.DEFAULT_LISTEN_PORT)); + props.setProperty(I2PClient.PROP_TCP_PORT, Integer.toString(I2PClient.DEFAULT_LISTEN_PORT)); save = true; } if (!props.containsKey(PROP_BOB_PORT)) { diff --git a/apps/BOB/src/net/i2p/BOB/MUXlisten.java b/apps/BOB/src/net/i2p/BOB/MUXlisten.java index 2518953381..b34947cbc2 100644 --- a/apps/BOB/src/net/i2p/BOB/MUXlisten.java +++ b/apps/BOB/src/net/i2p/BOB/MUXlisten.java @@ -24,7 +24,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import net.i2p.I2PException; import net.i2p.client.I2PClient; -import net.i2p.client.I2PSession; import net.i2p.client.streaming.I2PServerSocket; import net.i2p.client.streaming.I2PSocketManager; import net.i2p.client.streaming.I2PSocketManagerFactory; @@ -97,7 +96,7 @@ public class MUXlisten implements Runnable { } String i2cpHost = Q.getProperty(I2PClient.PROP_TCP_HOST, "127.0.0.1"); - int i2cpPort = I2PSession.DEFAULT_LISTEN_PORT; + int i2cpPort = I2PClient.DEFAULT_LISTEN_PORT; String i2cpPortStr = Q.getProperty(I2PClient.PROP_TCP_PORT); if (i2cpPortStr != null) { try { diff --git a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java index 0787a0fa63..bed0df7b92 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java +++ b/apps/i2psnark/java/src/org/klomp/snark/I2PSnarkUtil.java @@ -99,7 +99,7 @@ public class I2PSnarkUtil { _baseName = baseName; _opts = new HashMap(); //setProxy("127.0.0.1", 4444); - setI2CPConfig("127.0.0.1", I2PSession.DEFAULT_LISTEN_PORT, null); + setI2CPConfig("127.0.0.1", I2PClient.DEFAULT_LISTEN_PORT, null); _banlist = new ConcurrentHashSet(); _maxUploaders = Snark.MAX_TOTAL_UPLOADERS; _maxUpBW = SnarkManager.DEFAULT_MAX_UP_BW; diff --git a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java index 56e3e5d97e..7af0e5c7b6 100644 --- a/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java +++ b/apps/i2psnark/java/src/org/klomp/snark/SnarkManager.java @@ -28,7 +28,7 @@ import net.i2p.I2PAppContext; import net.i2p.app.ClientApp; import net.i2p.app.ClientAppManager; import net.i2p.app.ClientAppState; -import net.i2p.client.I2PSession; +import net.i2p.client.I2PClient; import net.i2p.crypto.SHA1Hash; import net.i2p.crypto.SigType; import net.i2p.data.Base64; @@ -786,7 +786,7 @@ public class SnarkManager implements CompleteListener, ClientApp { if (!_config.containsKey(PROP_I2CP_HOST)) _config.setProperty(PROP_I2CP_HOST, "127.0.0.1"); if (!_config.containsKey(PROP_I2CP_PORT)) - _config.setProperty(PROP_I2CP_PORT, Integer.toString(I2PSession.DEFAULT_LISTEN_PORT)); + _config.setProperty(PROP_I2CP_PORT, Integer.toString(I2PClient.DEFAULT_LISTEN_PORT)); if (!_config.containsKey(PROP_I2CP_OPTS)) _config.setProperty(PROP_I2CP_OPTS, "inbound.length=3 outbound.length=3" + " inbound.quantity=" + DEFAULT_TUNNEL_QUANTITY + @@ -912,7 +912,7 @@ public class SnarkManager implements CompleteListener, ClientApp { private void updateConfig() { String i2cpHost = _config.getProperty(PROP_I2CP_HOST); - int i2cpPort = getInt(PROP_I2CP_PORT, I2PSession.DEFAULT_LISTEN_PORT); + int i2cpPort = getInt(PROP_I2CP_PORT, I2PClient.DEFAULT_LISTEN_PORT); String opts = _config.getProperty(PROP_I2CP_OPTS); Map i2cpOpts = new HashMap(); if (opts != null) { diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java index c4403a8e0a..9e22d9b3c6 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnel.java @@ -97,7 +97,7 @@ public class I2PTunnel extends EventDispatcherImpl implements Logging { public boolean ownDest = false; /** the I2CP port, non-null */ - public String port = System.getProperty(I2PClient.PROP_TCP_PORT, Integer.toString(I2PSession.DEFAULT_LISTEN_PORT)); + public String port = System.getProperty(I2PClient.PROP_TCP_PORT, Integer.toString(I2PClient.DEFAULT_LISTEN_PORT)); /** the I2CP host, non-null */ public String host = System.getProperty(I2PClient.PROP_TCP_HOST, "127.0.0.1"); /** the listen-on host. Sadly the listen-on port does not have a field. */ diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java index 839d8e8c6d..102c37cd53 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelClientBase.java @@ -409,7 +409,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna Log _log = tunnel.getContext().logManager().getLog(I2PTunnelClientBase.class); Properties props = new Properties(); props.putAll(tunnel.getClientOptions()); - int portNum = I2PSession.DEFAULT_LISTEN_PORT; + int portNum = I2PClient.DEFAULT_LISTEN_PORT; if (tunnel.port != null) { try { portNum = Integer.parseInt(tunnel.port); @@ -471,7 +471,7 @@ public abstract class I2PTunnelClientBase extends I2PTunnelTask implements Runna // try to make this error sensible as it will happen... String portNum = getTunnel().port; if (portNum == null) - portNum = Integer.toString(I2PSession.DEFAULT_LISTEN_PORT); + portNum = Integer.toString(I2PClient.DEFAULT_LISTEN_PORT); String msg; if (getTunnel().getContext().isRouterContext()) msg = "Unable to build tunnels for the client"; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java index e9bde17241..c3e325c251 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/I2PTunnelServer.java @@ -210,7 +210,7 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable { private I2PSocketManager createManager(InputStream privData) { Properties props = new Properties(); props.putAll(getTunnel().getClientOptions()); - int portNum = I2PSession.DEFAULT_LISTEN_PORT; + int portNum = I2PClient.DEFAULT_LISTEN_PORT; if (getTunnel().port != null) { try { portNum = Integer.parseInt(getTunnel().port); @@ -305,7 +305,7 @@ public class I2PTunnelServer extends I2PTunnelTask implements Runnable { // try to make this error sensible as it will happen... String portNum = getTunnel().port; if (portNum == null) - portNum = Integer.toString(I2PSession.DEFAULT_LISTEN_PORT); + portNum = Integer.toString(I2PClient.DEFAULT_LISTEN_PORT); String msg; if (getTunnel().getContext().isRouterContext()) msg = "Unable to build tunnels for the server at " + remoteHost.getHostAddress() + ':' + remotePort; diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java index ec64965836..ef436d2908 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/TunnelController.java @@ -733,10 +733,10 @@ public class TunnelController implements Logging { int portNum = Integer.parseInt(port); _tunnel.port = String.valueOf(portNum); } catch (NumberFormatException nfe) { - _tunnel.port = Integer.toString(I2PSession.DEFAULT_LISTEN_PORT); + _tunnel.port = Integer.toString(I2PClient.DEFAULT_LISTEN_PORT); } } else { - _tunnel.port = Integer.toString(I2PSession.DEFAULT_LISTEN_PORT); + _tunnel.port = Integer.toString(I2PClient.DEFAULT_LISTEN_PORT); } } diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java index fe2ad90188..f0a154e512 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/ui/TunnelConfig.java @@ -11,7 +11,6 @@ import java.util.concurrent.ConcurrentHashMap; import net.i2p.I2PAppContext; import net.i2p.client.I2PClient; -import net.i2p.client.I2PSession; import net.i2p.crypto.KeyGenerator; import net.i2p.crypto.SigType; import net.i2p.data.Base64; @@ -837,7 +836,7 @@ public class TunnelConfig { if ( (_i2cpPort != null) && (_i2cpPort.trim().length() > 0) ) { config.setProperty(TunnelController.PROP_I2CP_PORT, _i2cpPort); } else { - config.setProperty(TunnelController.PROP_I2CP_PORT, Integer.toString(I2PSession.DEFAULT_LISTEN_PORT)); + config.setProperty(TunnelController.PROP_I2CP_PORT, Integer.toString(I2PClient.DEFAULT_LISTEN_PORT)); } } if (_privKeyFile != null) diff --git a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java index 3c48bd57da..ab8ccc06ff 100644 --- a/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java +++ b/apps/i2ptunnel/java/src/net/i2p/i2ptunnel/web/EditBean.java @@ -14,7 +14,7 @@ import java.util.List; import java.util.Set; import net.i2p.I2PException; -import net.i2p.client.I2PSession; +import net.i2p.client.I2PClient; import net.i2p.crypto.SigType; import net.i2p.data.Base64; import net.i2p.data.DataHelper; @@ -447,7 +447,7 @@ public class EditBean extends IndexBean { if (tun != null) return tun.getI2CPPort(); else - return Integer.toString(I2PSession.DEFAULT_LISTEN_PORT); + return Integer.toString(I2PClient.DEFAULT_LISTEN_PORT); } public String getCustomOptions(int tunnel) { diff --git a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java index 800f015448..2f619e9390 100644 --- a/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java +++ b/apps/ministreaming/java/src/net/i2p/client/streaming/I2PSocketManagerFactory.java @@ -275,7 +275,7 @@ public class I2PSocketManagerFactory { } private static int getPort() { - int i2cpPort = I2PSession.DEFAULT_LISTEN_PORT; + int i2cpPort = I2PClient.DEFAULT_LISTEN_PORT; String i2cpPortStr = System.getProperty(I2PClient.PROP_TCP_PORT); if (i2cpPortStr != null) { try { diff --git a/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java b/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java index ff7179f44a..193cd76e07 100644 --- a/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java +++ b/apps/sam/java/src/net/i2p/sam/SAMStreamSession.java @@ -146,7 +146,7 @@ class SAMStreamSession implements SAMMessageSess { allprops.putAll(props); String i2cpHost = allprops.getProperty(I2PClient.PROP_TCP_HOST, "127.0.0.1"); - int i2cpPort = I2PSession.DEFAULT_LISTEN_PORT; + int i2cpPort = I2PClient.DEFAULT_LISTEN_PORT; String sport = allprops.getProperty(I2PClient.PROP_TCP_PORT); if (sport != null) { try { diff --git a/core/java/src/net/i2p/client/I2PClient.java b/core/java/src/net/i2p/client/I2PClient.java index 2b2474c91a..c2133a5303 100644 --- a/core/java/src/net/i2p/client/I2PClient.java +++ b/core/java/src/net/i2p/client/I2PClient.java @@ -64,6 +64,12 @@ public interface I2PClient { */ public final static String PROP_FAST_RECEIVE = "i2cp.fastReceive"; + /** + * 7654 + * @since 0.9.38 + */ + public static final int DEFAULT_LISTEN_PORT = 7654; + /** protocol flag that must be sent when opening the i2cp connection to the router */ public final static int PROTOCOL_BYTE = 0x2A; diff --git a/core/java/src/net/i2p/client/I2PSession.java b/core/java/src/net/i2p/client/I2PSession.java index e7c431f75e..d15c04aecd 100644 --- a/core/java/src/net/i2p/client/I2PSession.java +++ b/core/java/src/net/i2p/client/I2PSession.java @@ -444,10 +444,4 @@ public interface I2PSession { * @since 0.9.2 */ public static final int PROTO_DATAGRAM_RAW = 18; - - /** - * 7654 - * @since 0.9.38 - */ - public static final int DEFAULT_LISTEN_PORT = 7654; } diff --git a/core/java/src/net/i2p/client/impl/I2PSessionImpl.java b/core/java/src/net/i2p/client/impl/I2PSessionImpl.java index 6e69bc3b58..9bf0272449 100644 --- a/core/java/src/net/i2p/client/impl/I2PSessionImpl.java +++ b/core/java/src/net/i2p/client/impl/I2PSessionImpl.java @@ -224,7 +224,7 @@ public abstract class I2PSessionImpl implements I2PSession, I2CPMessageReader.I2 } } - public static final int LISTEN_PORT = DEFAULT_LISTEN_PORT; + public static final int LISTEN_PORT = I2PClient.DEFAULT_LISTEN_PORT; private static final int BUF_SIZE = 32*1024; diff --git a/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java b/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java index 5da19c5801..714e254f18 100644 --- a/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java +++ b/router/java/src/net/i2p/router/client/ClientManagerFacadeImpl.java @@ -13,7 +13,7 @@ import java.io.Writer; import java.util.Collections; import java.util.Set; -import net.i2p.client.I2PSession; +import net.i2p.client.I2PClient; import net.i2p.client.I2PSessionException; import net.i2p.crypto.SessionKeyManager; import net.i2p.data.DataHelper; @@ -41,7 +41,7 @@ public class ClientManagerFacadeImpl extends ClientManagerFacade implements Inte private final RouterContext _context; /** note that this is different than the property the client side uses, i2cp.tcp.port */ public final static String PROP_CLIENT_PORT = "i2cp.port"; - public final static int DEFAULT_PORT = I2PSession.DEFAULT_LISTEN_PORT; + public final static int DEFAULT_PORT = I2PClient.DEFAULT_LISTEN_PORT; /** note that this is different than the property the client side uses, i2cp.tcp.host */ public final static String PROP_CLIENT_HOST = "i2cp.hostname"; public final static String DEFAULT_HOST = "127.0.0.1";