summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
Diffstat (limited to 'java/src')
-rw-r--r--java/src/Ice/Util.java12
-rw-r--r--java/src/IceInternal/Instance.java12
-rw-r--r--java/src/IceInternal/Network.java41
-rw-r--r--java/src/IceInternal/TcpAcceptor.java10
-rw-r--r--java/src/IceInternal/TcpEndpoint.java5
-rw-r--r--java/src/IceInternal/UdpEndpoint.java2
-rw-r--r--java/src/IceInternal/UdpTransceiver.java68
7 files changed, 22 insertions, 128 deletions
diff --git a/java/src/Ice/Util.java b/java/src/Ice/Util.java
index af99cd22297..efae40e3486 100644
--- a/java/src/Ice/Util.java
+++ b/java/src/Ice/Util.java
@@ -91,17 +91,7 @@ public final class Util
stringToIdentity(String s)
{
Identity ident = new Identity();
- int hashPos = s.indexOf('#');
- int slashPos = s.indexOf('/');
- int pos = -1;
- if (hashPos != -1 && slashPos != -1)
- {
- pos = Math.min(hashPos, slashPos);
- }
- else if (hashPos != -1 || slashPos != -1)
- {
- pos = Math.max(hashPos, slashPos);
- }
+ int pos = s.indexOf('/');
if (pos != -1)
{
ident.category = s.substring(0, pos);
diff --git a/java/src/IceInternal/Instance.java b/java/src/IceInternal/Instance.java
index e545bdb29d1..772b929d62e 100644
--- a/java/src/IceInternal/Instance.java
+++ b/java/src/IceInternal/Instance.java
@@ -126,16 +126,8 @@ public class Instance
{
_logger = new Ice.LoggerI();
_traceLevels = new TraceLevels(_properties);
- _defaultProtocol = _properties.getProperty("Ice.DefaultProtocol");
- if (_defaultProtocol.length() == 0)
- {
- _defaultProtocol = "tcp";
- }
- _defaultHost = _properties.getProperty("Ice.DefaultHost");
- if (_defaultHost.length() == 0)
- {
- _defaultHost = Network.getLocalHost(true);
- }
+ _defaultProtocol = _properties.getPropertyWithDefault("Ice.DefaultProtocol", "tcp");
+ _defaultHost = _properties.getPropertyWithDefault("Ice.DefaultHost", "127.0.0.1");
_routerManager = new RouterManager();
_referenceFactory = new ReferenceFactory(this);
_proxyFactory = new ProxyFactory(this);
diff --git a/java/src/IceInternal/Network.java b/java/src/IceInternal/Network.java
index 0fdb0ae281d..9ddaa1c87d9 100644
--- a/java/src/IceInternal/Network.java
+++ b/java/src/IceInternal/Network.java
@@ -17,8 +17,7 @@ public final class Network
{
try
{
- java.nio.channels.SocketChannel fd =
- java.nio.channels.SocketChannel.open();
+ java.nio.channels.SocketChannel fd = java.nio.channels.SocketChannel.open();
java.net.Socket socket = fd.socket();
socket.setTcpNoDelay(true);
socket.setKeepAlive(true);
@@ -342,44 +341,6 @@ public final class Network
}
}
- public static java.net.InetSocketAddress
- getLocalAddress(int port)
- {
- try
- {
- java.net.InetAddress addr = java.net.InetAddress.getLocalHost();
- return new java.net.InetSocketAddress(addr, port);
- }
- catch (java.net.UnknownHostException ex)
- {
- throw new Ice.DNSException();
- }
- }
-
- public static String
- getLocalHost(boolean numeric)
- {
- String host;
-
- try
- {
- if (!numeric)
- {
- host = java.net.InetAddress.getLocalHost().getHostName();
- }
- else
- {
- host = java.net.InetAddress.getLocalHost().getHostAddress();
- }
- }
- catch(java.net.UnknownHostException ex)
- {
- throw new Ice.DNSException();
- }
-
- return host;
- }
-
public static class SocketPair
{
public java.nio.channels.spi.AbstractSelectableChannel source;
diff --git a/java/src/IceInternal/TcpAcceptor.java b/java/src/IceInternal/TcpAcceptor.java
index 58a52bd3867..3c339d8fe33 100644
--- a/java/src/IceInternal/TcpAcceptor.java
+++ b/java/src/IceInternal/TcpAcceptor.java
@@ -78,9 +78,7 @@ class TcpAcceptor implements Acceptor
equivalent(String host, int port)
{
java.net.InetSocketAddress addr = Network.getAddress(host, port);
- java.net.InetSocketAddress localAddr =
- Network.getLocalAddress(_addr.getPort());
- return addr.equals(localAddr);
+ return addr.equals(_addr);
}
int
@@ -89,7 +87,7 @@ class TcpAcceptor implements Acceptor
return _addr.getPort();
}
- TcpAcceptor(Instance instance, int port)
+ TcpAcceptor(Instance instance, String host, int port)
{
_instance = instance;
_traceLevels = instance.traceLevels();
@@ -103,10 +101,8 @@ class TcpAcceptor implements Acceptor
try
{
- java.net.InetSocketAddress addr =
- new java.net.InetSocketAddress(port);
-
_fd = Network.createTcpServerSocket();
+ java.net.InetSocketAddress addr = new java.net.InetSocketAddress(host, port);
_addr = Network.doBind(_fd, addr);
}
catch (RuntimeException ex)
diff --git a/java/src/IceInternal/TcpEndpoint.java b/java/src/IceInternal/TcpEndpoint.java
index ac4ac6a2a5d..64cd872cdb2 100644
--- a/java/src/IceInternal/TcpEndpoint.java
+++ b/java/src/IceInternal/TcpEndpoint.java
@@ -267,9 +267,8 @@ public final class TcpEndpoint extends Endpoint
public Acceptor
acceptor(EndpointHolder endpoint)
{
- TcpAcceptor p = new TcpAcceptor(_instance, _port);
- endpoint.value = new TcpEndpoint(_instance, _host, p.effectivePort(),
- _timeout);
+ TcpAcceptor p = new TcpAcceptor(_instance, _host, _port);
+ endpoint.value = new TcpEndpoint(_instance, _host, p.effectivePort(), _timeout);
return p;
}
diff --git a/java/src/IceInternal/UdpEndpoint.java b/java/src/IceInternal/UdpEndpoint.java
index c68ea00de06..47eace060b6 100644
--- a/java/src/IceInternal/UdpEndpoint.java
+++ b/java/src/IceInternal/UdpEndpoint.java
@@ -231,7 +231,7 @@ public final class UdpEndpoint extends Endpoint
public Transceiver
serverTransceiver(EndpointHolder endpoint)
{
- UdpTransceiver p = new UdpTransceiver(_instance, _port, _connect);
+ UdpTransceiver p = new UdpTransceiver(_instance, _host, _port, _connect);
endpoint.value = new UdpEndpoint(_instance, _host, p.effectivePort());
return p;
}
diff --git a/java/src/IceInternal/UdpTransceiver.java b/java/src/IceInternal/UdpTransceiver.java
index b68a3a9e1ef..b901fd2b4f4 100644
--- a/java/src/IceInternal/UdpTransceiver.java
+++ b/java/src/IceInternal/UdpTransceiver.java
@@ -23,7 +23,7 @@ final class UdpTransceiver implements Transceiver
{
if (_traceLevels.network >= 1)
{
- String s = "closing " + _protocolName + " connection\n" + toString();
+ String s = "closing udp connection\n" + toString();
_logger.trace(_traceLevels.networkCat, s);
}
@@ -61,7 +61,7 @@ final class UdpTransceiver implements Transceiver
if (_traceLevels.network >= 3)
{
- String s = "sent " + ret + " bytes via " + _protocolName + "\n" + toString();
+ String s = "sent " + ret + " bytes via udp\n" + toString();
_logger.trace(_traceLevels.networkCat, s);
}
@@ -115,7 +115,7 @@ final class UdpTransceiver implements Transceiver
if (_traceLevels.network >= 1)
{
- String s = "connected " + _protocolName + "socket\n" + toString();
+ String s = "connected udp socket\n" + toString();
_logger.trace(_traceLevels.networkCat, s);
}
}
@@ -154,7 +154,7 @@ final class UdpTransceiver implements Transceiver
if (_traceLevels.network >= 3)
{
- String s = "received " + ret + " bytes via " + _protocolName + "\n" + toString();
+ String s = "received " + ret + " bytes via udp\n" + toString();
_logger.trace(_traceLevels.networkCat, s);
}
@@ -171,17 +171,8 @@ final class UdpTransceiver implements Transceiver
public final boolean
equivalent(String host, int port)
{
- assert(_incoming); // This equivalence test is only valid for incoming connections.
-
java.net.InetSocketAddress addr = Network.getAddress(host, port);
- if (addr.getAddress().isLoopbackAddress())
- {
- return port == _addr.getPort();
- }
-
- java.net.InetSocketAddress localAddr =
- Network.getLocalAddress(_addr.getPort());
- return addr.equals(localAddr);
+ return addr.equals(_addr);
}
public final int
@@ -190,47 +181,27 @@ final class UdpTransceiver implements Transceiver
return _addr.getPort();
}
- public final void
- setProtocolName(String protocolName)
- {
- _protocolName = protocolName;
- }
-
//
// Only for use by UdpEndpoint
//
- UdpTransceiver(Instance instance,
- String host,
- int port)
- {
- this(instance, host, port, "udp");
- }
-
- //
- // Only for use by UdpEndpoint
- //
- UdpTransceiver(Instance instance,
- String host,
- int port,
- String protocolName)
+ UdpTransceiver(Instance instance, String host, int port)
{
_instance = instance;
_traceLevels = instance.traceLevels();
_logger = instance.logger();
_incoming = false;
_connect = true;
- _protocolName = protocolName;
try
{
- _addr = Network.getAddress(host, port);
_fd = Network.createUdpSocket();
+ _addr = Network.getAddress(host, port);
Network.doConnect(_fd, _addr, -1);
_connect = false; // We're connected now
if (_traceLevels.network >= 1)
{
- String s = "starting to send " + _protocolName + " packets\n" + toString();
+ String s = "starting to send udp packets\n" + toString();
_logger.trace(_traceLevels.networkCat, s);
}
}
@@ -244,37 +215,23 @@ final class UdpTransceiver implements Transceiver
//
// Only for use by UdpEndpoint
//
- UdpTransceiver(Instance instance,
- int port,
- boolean connect)
- {
- this(instance, port, connect, "udp");
- }
-
- //
- // Only for use by UdpEndpoint
- //
- UdpTransceiver(Instance instance,
- int port,
- boolean connect,
- String protocolName)
+ UdpTransceiver(Instance instance, String host, int port, boolean connect)
{
_instance = instance;
_traceLevels = instance.traceLevels();
_logger = instance.logger();
_incoming = true;
_connect = connect;
- _protocolName = protocolName;
try
{
- _addr = new java.net.InetSocketAddress(port);
_fd = Network.createUdpSocket();
- _addr = Network.doBind(_fd, _addr);
+ java.net.InetSocketAddress addr = new java.net.InetSocketAddress(host, port);
+ _addr = Network.doBind(_fd, addr);
if (_traceLevels.network >= 1)
{
- String s = "starting to receive " + _protocolName + " packets\n" + toString();
+ String s = "starting to receive udp packets\n" + toString();
_logger.trace(_traceLevels.networkCat, s);
}
}
@@ -300,5 +257,4 @@ final class UdpTransceiver implements Transceiver
private boolean _connect;
private java.nio.channels.DatagramChannel _fd;
private java.net.InetSocketAddress _addr;
- private String _protocolName;
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-08-04 03:02:07 +0000