Added Ruby implemetation of EndpointInfo and ConnectionInfo

12 files changed, 67 insertions, 66 deletions

diff --git a/java/src/Ice/ConnectionI.java b/java/src/Ice/ConnectionI.java
index 83508d52682..da2b0b1aab6 100644
--- a/java/src/Ice/ConnectionI.java
+++ b/java/src/Ice/ConnectionI.java
@@ -1202,7 +1202,9 @@ public final class ConnectionI extends IceInternal.EventHandler implements Conne
         {
             throw (Ice.LocalException)_exception.fillInStackTrace();
         }
-        return _transceiver.getInfo();
+        ConnectionInfo info = _transceiver.getInfo();
+        info.endpoint = _endpoint.getInfo();
+        return info;
     }
 
     //
diff --git a/java/src/IceInternal/TcpAcceptor.java b/java/src/IceInternal/TcpAcceptor.java
index 74c24556065..50f46759f6f 100644
--- a/java/src/IceInternal/TcpAcceptor.java
+++ b/java/src/IceInternal/TcpAcceptor.java
@@ -66,7 +66,7 @@ class TcpAcceptor implements Acceptor
             _logger.trace(_traceLevels.networkCat, s);
         }
 
-        return new TcpTransceiver(_instance, _endpointInfo, fd, true);
+        return new TcpTransceiver(_instance, fd, true);
     }
 
     public String
@@ -81,10 +81,9 @@ class TcpAcceptor implements Acceptor
         return _addr.getPort();
     }
 
-    TcpAcceptor(Instance instance, Ice.TcpEndpointInfo endpointInfo)
+    TcpAcceptor(Instance instance, String host, int port)
     {
         _instance = instance;
-        _endpointInfo = endpointInfo;
         _traceLevels = instance.traceLevels();
         _logger = instance.initializationData().logger;
         _backlog = instance.initializationData().properties.getPropertyAsIntWithDefault("Ice.TCP.Backlog", 511);
@@ -111,7 +110,7 @@ class TcpAcceptor implements Acceptor
                 //
                 Network.setReuseAddress(_fd, true);
             }
-            _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 tcp socket " + toString();
@@ -136,7 +135,6 @@ class TcpAcceptor implements Acceptor
     }
 
     private Instance _instance;
-    private Ice.TcpEndpointInfo _endpointInfo;
     private TraceLevels _traceLevels;
     private Ice.Logger _logger;
     private java.nio.channels.ServerSocketChannel _fd;
diff --git a/java/src/IceInternal/TcpConnector.java b/java/src/IceInternal/TcpConnector.java
index b2f2e331a10..ae5d618be99 100644
--- a/java/src/IceInternal/TcpConnector.java
+++ b/java/src/IceInternal/TcpConnector.java
@@ -34,7 +34,7 @@ final class TcpConnector implements Connector
                     _logger.trace(_traceLevels.networkCat, s);
                 }
             }
-            return new TcpTransceiver(_instance, _endpointInfo, fd, connected);
+            return new TcpTransceiver(_instance, fd, connected);
         }
         catch(Ice.LocalException ex)
         {
@@ -68,19 +68,18 @@ final class TcpConnector implements Connector
     //
     // Only for use by TcpEndpoint
     //
-    TcpConnector(Instance instance, Ice.TcpEndpointInfo endpointInfo, java.net.InetSocketAddress addr, 
-                 String connectionId)
+    TcpConnector(Instance instance, java.net.InetSocketAddress addr, int timeout, String connectionId)
     {
         _instance = instance;
-        _endpointInfo = endpointInfo;
         _traceLevels = instance.traceLevels();
         _logger = instance.initializationData().logger;
         _addr = addr;
+        _timeout = timeout;
         _connectionId = connectionId;
 
         _hashCode = _addr.getAddress().getHostAddress().hashCode();
         _hashCode = 5 * _hashCode + _addr.getPort();
-        _hashCode = 5 * _hashCode + _endpointInfo.timeout;
+        _hashCode = 5 * _hashCode + _timeout;
         _hashCode = 5 * _hashCode + _connectionId.hashCode();
     }
 
@@ -103,7 +102,7 @@ final class TcpConnector implements Connector
             return true;
         }
 
-        if(_endpointInfo.timeout != p._endpointInfo.timeout)
+        if(_timeout != p._timeout)
         {
             return false;
         }
@@ -117,10 +116,10 @@ final class TcpConnector implements Connector
     } 
 
     private Instance _instance;
-    private Ice.TcpEndpointInfo _endpointInfo;
     private TraceLevels _traceLevels;
     private Ice.Logger _logger;
     private java.net.InetSocketAddress _addr;
+    private int _timeout;
     private String _connectionId = "";
     private int _hashCode;
 }
diff --git a/java/src/IceInternal/TcpEndpointI.java b/java/src/IceInternal/TcpEndpointI.java
index 65577f31365..44fc624af8d 100644
--- a/java/src/IceInternal/TcpEndpointI.java
+++ b/java/src/IceInternal/TcpEndpointI.java
@@ -394,7 +394,7 @@ final class TcpEndpointI extends EndpointI
     public Acceptor
     acceptor(EndpointIHolder endpoint, String adapterName)
     {
-        TcpAcceptor p = new TcpAcceptor(_instance, (Ice.TcpEndpointInfo)getInfo());
+        TcpAcceptor p = new TcpAcceptor(_instance, _host, _port);
         endpoint.value =
             new TcpEndpointI(_instance, _host, p.effectivePort(), _timeout, _connectionId, _compress);
         return p;
@@ -524,7 +524,7 @@ final class TcpEndpointI extends EndpointI
         java.util.List<Connector> connectors = new java.util.ArrayList<Connector>();
         for(java.net.InetSocketAddress p : addresses)
         {
-            connectors.add(new TcpConnector(_instance, (Ice.TcpEndpointInfo)getInfo(), p, _connectionId));
+            connectors.add(new TcpConnector(_instance, p, _timeout, _connectionId));
         }
         return connectors;
     }
diff --git a/java/src/IceInternal/TcpTransceiver.java b/java/src/IceInternal/TcpTransceiver.java
index 155c2b28f7b..fef0558e62c 100644
--- a/java/src/IceInternal/TcpTransceiver.java
+++ b/java/src/IceInternal/TcpTransceiver.java
@@ -226,7 +226,6 @@ final class TcpTransceiver implements Transceiver
     {
         assert(_fd != null);
         Ice.TcpConnectionInfo info = new Ice.TcpConnectionInfo();
-        info.endpoint = _endpointInfo;
         java.net.Socket socket = _fd.socket();
         info.localAddress = socket.getLocalAddress().getHostAddress();
         info.localPort = socket.getLocalPort();
@@ -255,10 +254,8 @@ final class TcpTransceiver implements Transceiver
     //
     // Only for use by TcpConnector, TcpAcceptor
     //
-    TcpTransceiver(Instance instance, Ice.TcpEndpointInfo endpointInfo, java.nio.channels.SocketChannel fd,
-                   boolean connected)
+    TcpTransceiver(Instance instance, java.nio.channels.SocketChannel fd, boolean connected)
     {
-        _endpointInfo = endpointInfo;
         _fd = fd;
         _traceLevels = instance.traceLevels();
         _logger = instance.initializationData().logger;
@@ -291,7 +288,6 @@ final class TcpTransceiver implements Transceiver
         super.finalize();
     }
 
-    private Ice.TcpEndpointInfo _endpointInfo;
     private java.nio.channels.SocketChannel _fd;
     private TraceLevels _traceLevels;
     private Ice.Logger _logger;
diff --git a/java/src/IceInternal/UdpConnector.java b/java/src/IceInternal/UdpConnector.java
index 96ab5ed69c7..edff81e92a2 100644
--- a/java/src/IceInternal/UdpConnector.java
+++ b/java/src/IceInternal/UdpConnector.java
@@ -14,7 +14,7 @@ final class UdpConnector implements Connector
     public Transceiver
     connect()
     {
-        return new UdpTransceiver(_instance, _endpointInfo, _addr);
+        return new UdpTransceiver(_instance, _addr, _mcastInterface, _mcastTtl);
     }
 
     public java.nio.channels.SelectableChannel
@@ -45,18 +45,23 @@ final class UdpConnector implements Connector
     //
     // Only for use by TcpEndpoint
     //
-    UdpConnector(Instance instance, Ice.UdpEndpointInfo endpointInfo, java.net.InetSocketAddress addr, 
-                 String connectionId)
+    UdpConnector(Instance instance, java.net.InetSocketAddress addr, String mcastInterface, int mcastTtl, 
+                 byte protocolMajor, byte protocolMinor, byte encodingMajor, byte encodingMinor, String connectionId)
     {
         _instance = instance;
-        _endpointInfo = endpointInfo;
         _addr = addr;
+        _mcastInterface = mcastInterface;
+        _mcastTtl = mcastTtl;
+        _protocolMajor = protocolMajor;
+        _protocolMinor = protocolMinor;
+        _encodingMajor = encodingMajor;
+        _encodingMinor = encodingMinor;
         _connectionId = connectionId;
 
         _hashCode = _addr.getAddress().getHostAddress().hashCode();
         _hashCode = 5 * _hashCode + _addr.getPort();
-        _hashCode = 5 * _hashCode + _endpointInfo.mcastInterface.hashCode();
-        _hashCode = 5 * _hashCode + _endpointInfo.mcastTtl;
+        _hashCode = 5 * _hashCode + _mcastInterface.hashCode();
+        _hashCode = 5 * _hashCode + _mcastTtl;
         _hashCode = 5 * _hashCode + _connectionId.hashCode();
     }
 
@@ -84,32 +89,32 @@ final class UdpConnector implements Connector
             return false;
         }
 
-        if(_endpointInfo.protocolMajor != p._endpointInfo.protocolMajor)
+        if(_protocolMajor != p._protocolMajor)
         {
             return false;
         }
 
-        if(_endpointInfo.protocolMinor != p._endpointInfo.protocolMinor)
+        if(_protocolMinor != p._protocolMinor)
         {
             return false;
         }
 
-        if(_endpointInfo.encodingMajor != p._endpointInfo.encodingMajor)
+        if(_encodingMajor != p._encodingMajor)
         {
             return false;
         }
 
-        if(_endpointInfo.encodingMinor != p._endpointInfo.encodingMinor)
+        if(_encodingMinor != p._encodingMinor)
         {
             return false;
         }
 
-        if(_endpointInfo.mcastTtl != p._endpointInfo.mcastTtl)
+        if(_mcastTtl != p._mcastTtl)
         {
             return false;
         }
 
-        if(_endpointInfo.mcastInterface.compareTo(p._endpointInfo.mcastInterface) != 0)
+        if(_mcastInterface.compareTo(p._mcastInterface) != 0)
         {
             return false;
         }
@@ -118,8 +123,13 @@ final class UdpConnector implements Connector
     } 
 
     private Instance _instance;
-    private Ice.UdpEndpointInfo _endpointInfo;
     private java.net.InetSocketAddress _addr;
+    private String _mcastInterface;
+    private int _mcastTtl;
+    private byte _protocolMajor;
+    private byte _protocolMinor;
+    private byte _encodingMajor;
+    private byte _encodingMinor;
     private String _connectionId;
     private int _hashCode;
 }
diff --git a/java/src/IceInternal/UdpEndpointI.java b/java/src/IceInternal/UdpEndpointI.java
index 0760a94f180..846b4f41c48 100644
--- a/java/src/IceInternal/UdpEndpointI.java
+++ b/java/src/IceInternal/UdpEndpointI.java
@@ -528,7 +528,7 @@ final class UdpEndpointI extends EndpointI
     public Transceiver
     transceiver(EndpointIHolder endpoint)
     {
-        UdpTransceiver p = new UdpTransceiver(_instance, (Ice.UdpEndpointInfo)getInfo(), _connect);
+        UdpTransceiver p = new UdpTransceiver(_instance, _host, _port, _mcastInterface, _connect);
         endpoint.value = new UdpEndpointI(_instance, _host, p.effectivePort(), _mcastInterface, _mcastTtl, 
                                           _protocolMajor, _protocolMinor, _encodingMajor, _encodingMinor, _connect,
                                           _connectionId, _compress);
@@ -744,7 +744,9 @@ final class UdpEndpointI extends EndpointI
         java.util.ArrayList<Connector> connectors = new java.util.ArrayList<Connector>();
         for(java.net.InetSocketAddress p : addresses)
         {
-            connectors.add(new UdpConnector(_instance, (Ice.UdpEndpointInfo)getInfo(), p, _connectionId));
+            connectors.add(
+                new UdpConnector(_instance, p, _mcastInterface, _mcastTtl, _protocolMajor, _protocolMinor,
+                                 _encodingMajor, _encodingMinor, _connectionId));
         }
         return connectors;
     }
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;
diff --git a/java/src/IceSSL/AcceptorI.java b/java/src/IceSSL/AcceptorI.java
index 432efd98985..18184b50aa2 100644
--- a/java/src/IceSSL/AcceptorI.java
+++ b/java/src/IceSSL/AcceptorI.java
@@ -88,7 +88,7 @@ final class AcceptorI implements IceInternal.Acceptor
                           IceInternal.Network.fdToString(fd));
         }
 
-        return new TransceiverI(_instance, _endpointInfo, engine, fd, true, true, _adapterName);
+        return new TransceiverI(_instance, engine, fd, "", true, true, _adapterName);
     }
 
     public String
@@ -103,10 +103,9 @@ final class AcceptorI implements IceInternal.Acceptor
         return _addr.getPort();
     }
 
-    AcceptorI(Instance instance, SSLEndpointInfo endpointInfo, String adapterName)
+    AcceptorI(Instance instance, String adapterName, String host, int port)
     {
         _instance = instance;
-        _endpointInfo = endpointInfo;
         _adapterName = adapterName;
         _logger = instance.communicator().getLogger();
         _backlog = instance.communicator().getProperties().getPropertyAsIntWithDefault("Ice.TCP.Backlog", 511);
@@ -133,8 +132,7 @@ final class AcceptorI implements IceInternal.Acceptor
                 //
                 IceInternal.Network.setReuseAddress(_fd, true);
             }
-            _addr = IceInternal.Network.getAddressForServer(_endpointInfo.host, _endpointInfo.port, 
-                                                            _instance.protocolSupport());
+            _addr = IceInternal.Network.getAddressForServer(host, port, _instance.protocolSupport());
             if(_instance.networkTraceLevel() >= 2)
             {
                 String s = "attempting to bind to ssl socket " + toString();
@@ -159,7 +157,6 @@ final class AcceptorI implements IceInternal.Acceptor
     }
 
     private Instance _instance;
-    private SSLEndpointInfo _endpointInfo;
     private String _adapterName;
     private Ice.Logger _logger;
     private java.nio.channels.ServerSocketChannel _fd;
diff --git a/java/src/IceSSL/ConnectorI.java b/java/src/IceSSL/ConnectorI.java
index 07a12015439..32e8d4cf817 100644
--- a/java/src/IceSSL/ConnectorI.java
+++ b/java/src/IceSSL/ConnectorI.java
@@ -39,7 +39,7 @@ final class ConnectorI implements IceInternal.Connector
             try
             {
                 javax.net.ssl.SSLEngine engine = _instance.createSSLEngine(false);
-                return new TransceiverI(_instance, _endpointInfo, engine, fd, connected, false, "");
+                return new TransceiverI(_instance, engine, fd, _host, connected, false, "");
             }
             catch(RuntimeException ex)
             {
@@ -79,17 +79,18 @@ final class ConnectorI implements IceInternal.Connector
     //
     // Only for use by EndpointI.
     //
-    ConnectorI(Instance instance, SSLEndpointInfo endpointInfo, java.net.InetSocketAddress addr, String connectionId)
+    ConnectorI(Instance instance, String host, java.net.InetSocketAddress addr, int timeout, String connectionId)
     {
         _instance = instance;
-        _endpointInfo = endpointInfo;
         _logger = instance.communicator().getLogger();
+        _host = host;
         _addr = addr;
+        _timeout = timeout;
         _connectionId = connectionId;
 
         _hashCode = _addr.getAddress().getHostAddress().hashCode();
         _hashCode = 5 * _hashCode + _addr.getPort();
-        _hashCode = 5 * _hashCode + _endpointInfo.timeout;
+        _hashCode = 5 * _hashCode + _timeout;
         _hashCode = 5 * _hashCode + _connectionId.hashCode();
     }
 
@@ -112,7 +113,7 @@ final class ConnectorI implements IceInternal.Connector
             return true;
         }
 
-        if(_endpointInfo.timeout != p._endpointInfo.timeout)
+        if(_timeout != p._timeout)
         {
             return false;
         }
@@ -126,9 +127,10 @@ final class ConnectorI implements IceInternal.Connector
     }
 
     private Instance _instance;
-    private SSLEndpointInfo _endpointInfo;
     private Ice.Logger _logger;
+    private String _host;
     private java.net.InetSocketAddress _addr;
+    private int _timeout;
     private String _connectionId;
     private int _hashCode;
 }
diff --git a/java/src/IceSSL/EndpointI.java b/java/src/IceSSL/EndpointI.java
index 4fc235a2c10..77e70e0671d 100644
--- a/java/src/IceSSL/EndpointI.java
+++ b/java/src/IceSSL/EndpointI.java
@@ -394,7 +394,7 @@ final class EndpointI extends IceInternal.EndpointI
     public IceInternal.Acceptor
     acceptor(IceInternal.EndpointIHolder endpoint, String adapterName)
     {
-        AcceptorI p = new AcceptorI(_instance, (SSLEndpointInfo)getInfo(), adapterName);
+        AcceptorI p = new AcceptorI(_instance, adapterName, _host, _port);
         endpoint.value = 
             new EndpointI(_instance, _host, p.effectivePort(), _timeout, _connectionId, _compress);
         return p;
@@ -525,7 +525,7 @@ final class EndpointI extends IceInternal.EndpointI
         java.util.List<IceInternal.Connector> connectors = new java.util.ArrayList<IceInternal.Connector>();
         for(java.net.InetSocketAddress p : addresses)
         {
-            connectors.add(new ConnectorI(_instance, (SSLEndpointInfo)getInfo(), p, _connectionId));
+            connectors.add(new ConnectorI(_instance, _host, p, _timeout, _connectionId));
         }
         return connectors;
     }
diff --git a/java/src/IceSSL/TransceiverI.java b/java/src/IceSSL/TransceiverI.java
index bd7a8a8a3ca..54687c5f052 100644
--- a/java/src/IceSSL/TransceiverI.java
+++ b/java/src/IceSSL/TransceiverI.java
@@ -280,7 +280,6 @@ final class TransceiverI implements IceInternal.Transceiver
         assert(_fd != null);
 
         IceSSL.SSLConnectionInfo info = new IceSSL.SSLConnectionInfo();
-        info.endpoint = _endpointInfo;
         java.net.Socket socket = _fd.socket();
         info.localAddress = socket.getLocalAddress().getHostAddress();
         info.localPort = socket.getLocalPort();
@@ -340,13 +339,13 @@ final class TransceiverI implements IceInternal.Transceiver
     //
     // Only for use by ConnectorI, AcceptorI.
     //
-    TransceiverI(Instance instance, SSLEndpointInfo endpointInfo, javax.net.ssl.SSLEngine engine,
-                 java.nio.channels.SocketChannel fd, boolean connected, boolean incoming, String adapterName)
+    TransceiverI(Instance instance, javax.net.ssl.SSLEngine engine, java.nio.channels.SocketChannel fd,
+                 String host, boolean connected, boolean incoming, String adapterName)
     {
         _instance = instance;
-        _endpointInfo = endpointInfo;
         _engine = engine;
         _fd = fd;
+        _host = host;
         _incoming = incoming;
         _adapterName = adapterName;
         _state = connected ? StateConnected : StateNeedConnect;
@@ -537,7 +536,7 @@ final class TransceiverI implements IceInternal.Transceiver
         // Additional verification.
         //
         _info = Util.populateConnectionInfo(_engine.getSession(), _fd.socket(), _adapterName, _incoming);
-        _instance.verifyPeer(_info, _fd, _endpointInfo.host, _incoming);
+        _instance.verifyPeer(_info, _fd, _host, _incoming);
 
         if(_instance.networkTraceLevel() >= 1)
         {
@@ -792,9 +791,9 @@ final class TransceiverI implements IceInternal.Transceiver
     }
 
     private Instance _instance;
-    private SSLEndpointInfo _endpointInfo;
     private java.nio.channels.SocketChannel _fd;
     private javax.net.ssl.SSLEngine _engine;
+    private String _host;
     private boolean _incoming;
     private String _adapterName;
     private int _state;