diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-10-16 15:01:08 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-10-16 15:01:08 -0230 |
| commit | 667cf6024bbf1950da2eecffe65f00dc2169a9d6 (patch) | |
| tree | a6efa0a355f8a2b1fa8f8b15fdf1d26ed91959f1 /java/src/IceInternal/UdpTransceiver.java | |
| parent | Changed Glacier2 to enable ACM for client connections, bug 3244 and 4298 (diff) | |
| download | ice-667cf6024bbf1950da2eecffe65f00dc2169a9d6.tar.bz2 ice-667cf6024bbf1950da2eecffe65f00dc2169a9d6.tar.xz ice-667cf6024bbf1950da2eecffe65f00dc2169a9d6.zip | |
Added Ruby implemetation of EndpointInfo and ConnectionInfo
Diffstat (limited to 'java/src/IceInternal/UdpTransceiver.java')
| -rw-r--r-- | java/src/IceInternal/UdpTransceiver.java | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/java/src/IceInternal/UdpTransceiver.java b/java/src/IceInternal/UdpTransceiver.java index 717688d3e92..10f4c531935 100644 --- a/java/src/IceInternal/UdpTransceiver.java +++ b/java/src/IceInternal/UdpTransceiver.java @@ -235,7 +235,6 @@ final class UdpTransceiver implements Transceiver assert(_fd != null); Ice.UdpConnectionInfo info = new Ice.UdpConnectionInfo(); - info.endpoint = _endpointInfo; java.net.DatagramSocket socket = _fd.socket(); info.localAddress = socket.getLocalAddress().getHostAddress(); info.localPort = socket.getLocalPort(); @@ -285,9 +284,8 @@ final class UdpTransceiver implements Transceiver // // Only for use by UdpEndpoint // - UdpTransceiver(Instance instance, Ice.UdpEndpointInfo endpointInfo, java.net.InetSocketAddress addr) + UdpTransceiver(Instance instance, java.net.InetSocketAddress addr, String mcastInterface, int mcastTtl) { - _endpointInfo = endpointInfo; _traceLevels = instance.traceLevels(); _logger = instance.initializationData().logger; _stats = instance.initializationData().stats; @@ -304,7 +302,7 @@ final class UdpTransceiver implements Transceiver _connect = false; // We're connected now if(_addr.getAddress().isMulticastAddress()) { - configureMulticast(null, _endpointInfo.mcastInterface, _endpointInfo.mcastTtl); + configureMulticast(null, mcastInterface, mcastTtl); } if(_traceLevels.network >= 1) @@ -323,9 +321,8 @@ final class UdpTransceiver implements Transceiver // // Only for use by UdpEndpoint // - UdpTransceiver(Instance instance, Ice.UdpEndpointInfo endpointInfo, boolean connect) + UdpTransceiver(Instance instance, String host, int port, String mcastInterface, boolean connect) { - _endpointInfo = endpointInfo; _traceLevels = instance.traceLevels(); _logger = instance.initializationData().logger; _stats = instance.initializationData().stats; @@ -337,7 +334,7 @@ final class UdpTransceiver implements Transceiver _fd = Network.createUdpSocket(); setBufSize(instance); Network.setBlock(_fd, false); - _addr = Network.getAddressForServer(_endpointInfo.host, _endpointInfo.port, instance.protocolSupport()); + _addr = Network.getAddressForServer(host, port, instance.protocolSupport()); if(_traceLevels.network >= 2) { String s = "attempting to bind to udp socket " + Network.addrToString(_addr); @@ -347,12 +344,12 @@ final class UdpTransceiver implements Transceiver { Network.setReuseAddress(_fd, true); _mcastAddr = _addr; - _addr = Network.doBind(_fd, Network.getAddress("0.0.0.0", _endpointInfo.port, Network.EnableIPv4)); - if(_endpointInfo.port == 0) + _addr = Network.doBind(_fd, Network.getAddress("0.0.0.0", port, Network.EnableIPv4)); + if(port == 0) { _mcastAddr = new java.net.InetSocketAddress(_mcastAddr.getAddress(), _addr.getPort()); } - configureMulticast(_mcastAddr, _endpointInfo.mcastInterface, -1); + configureMulticast(_mcastAddr, mcastInterface, -1); } else { @@ -570,7 +567,6 @@ final class UdpTransceiver implements Transceiver super.finalize(); } - private Ice.UdpEndpointInfo _endpointInfo; private TraceLevels _traceLevels; private Ice.Logger _logger; private Ice.Stats _stats; |