diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2009-10-16 09:38:13 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2009-10-16 09:38:13 -0230 |
| commit | b8b803f51c8ff622491d2a160663e4912f7dba03 (patch) | |
| tree | b4ded20bd5b2fa37a18943a5ac0665ce2d525128 /cpp/src/IceSSL/AcceptorI.cpp | |
| parent | Added support for per-OA ACM and fix for retry on CloseConnectionException (diff) | |
| download | ice-b8b803f51c8ff622491d2a160663e4912f7dba03.tar.bz2 ice-b8b803f51c8ff622491d2a160663e4912f7dba03.tar.xz ice-b8b803f51c8ff622491d2a160663e4912f7dba03.zip | |
Added support for EndpointInfo and ConnectionInfo to python.
Set endpoint in Connection getInfo implementations.
Removed unused _stateTime from ConnectionI.
Remove ["cpp:virtual"] from SSLEndpointInfo slice definition.
Diffstat (limited to 'cpp/src/IceSSL/AcceptorI.cpp')
| -rw-r--r-- | cpp/src/IceSSL/AcceptorI.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/cpp/src/IceSSL/AcceptorI.cpp b/cpp/src/IceSSL/AcceptorI.cpp index c82a77dc4dc..e8de9f97a87 100644 --- a/cpp/src/IceSSL/AcceptorI.cpp +++ b/cpp/src/IceSSL/AcceptorI.cpp @@ -188,7 +188,7 @@ IceSSL::AcceptorI::accept() // SSL handshaking is performed in TransceiverI::initialize, since // accept must not block. // - return new TransceiverI(_instance, fd, _adapterName); + return new TransceiverI(_instance, _endpointInfo, fd, _adapterName); } string @@ -210,11 +210,13 @@ IceSSL::AcceptorI::effectivePort() const } } -IceSSL::AcceptorI::AcceptorI(const InstancePtr& instance, const string& adapterName, const string& host, int port) : +IceSSL::AcceptorI::AcceptorI(const InstancePtr& instance, const SSLEndpointInfoPtr& endpointInfo, + const string& adapterName) : _instance(instance), + _endpointInfo(endpointInfo), _adapterName(adapterName), _logger(instance->communicator()->getLogger()), - _addr(IceInternal::getAddressForServer(host, port, instance->protocolSupport())) + _addr(IceInternal::getAddressForServer(_endpointInfo->host, _endpointInfo->port, instance->protocolSupport())) #ifdef ICE_USE_IOCP , _acceptFd(INVALID_SOCKET), _info(IceInternal::SocketOperationRead) |