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 /cpp/src/IceSSL/AcceptorI.cpp | |
| 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 'cpp/src/IceSSL/AcceptorI.cpp')
| -rw-r--r-- | cpp/src/IceSSL/AcceptorI.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cpp/src/IceSSL/AcceptorI.cpp b/cpp/src/IceSSL/AcceptorI.cpp index e8de9f97a87..c82a77dc4dc 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, _endpointInfo, fd, _adapterName); + return new TransceiverI(_instance, fd, _adapterName); } string @@ -210,13 +210,11 @@ IceSSL::AcceptorI::effectivePort() const } } -IceSSL::AcceptorI::AcceptorI(const InstancePtr& instance, const SSLEndpointInfoPtr& endpointInfo, - const string& adapterName) : +IceSSL::AcceptorI::AcceptorI(const InstancePtr& instance, const string& adapterName, const string& host, int port) : _instance(instance), - _endpointInfo(endpointInfo), _adapterName(adapterName), _logger(instance->communicator()->getLogger()), - _addr(IceInternal::getAddressForServer(_endpointInfo->host, _endpointInfo->port, instance->protocolSupport())) + _addr(IceInternal::getAddressForServer(host, port, instance->protocolSupport())) #ifdef ICE_USE_IOCP , _acceptFd(INVALID_SOCKET), _info(IceInternal::SocketOperationRead) |