diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2014-09-17 13:50:35 -0230 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2014-09-17 13:50:35 -0230 |
| commit | a3d676c4199ff53edd458abf7ce52f6cf83213b4 (patch) | |
| tree | d6975ba5b7c3d9e58b5378f2e27ec536e4157517 /cpp/src/IceSSL/AcceptorI.cpp | |
| parent | Simplified creation of Admin facets in IceBox; simplified test for Admin enab... (diff) | |
| download | ice-a3d676c4199ff53edd458abf7ce52f6cf83213b4.tar.bz2 ice-a3d676c4199ff53edd458abf7ce52f6cf83213b4.tar.xz ice-a3d676c4199ff53edd458abf7ce52f6cf83213b4.zip | |
ICE-4891 some minor improvements
Diffstat (limited to 'cpp/src/IceSSL/AcceptorI.cpp')
| -rw-r--r-- | cpp/src/IceSSL/AcceptorI.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/cpp/src/IceSSL/AcceptorI.cpp b/cpp/src/IceSSL/AcceptorI.cpp index 2cb3f19515b..8cdcde82366 100644 --- a/cpp/src/IceSSL/AcceptorI.cpp +++ b/cpp/src/IceSSL/AcceptorI.cpp @@ -8,6 +8,7 @@ // ********************************************************************** #include <IceSSL/AcceptorI.h> +#include <IceSSL/EndpointI.h> #include <IceSSL/Instance.h> #include <IceSSL/OpenSSLTransceiverI.h> @@ -16,7 +17,6 @@ #include <IceSSL/Util.h> -#include <Ice/EndpointI.h> #include <Ice/Communicator.h> #include <Ice/Exception.h> #include <Ice/LocalException.h> @@ -33,6 +33,8 @@ using namespace std; using namespace Ice; using namespace IceSSL; +IceUtil::Shared* IceSSL::upCast(AcceptorI* p) { return p; } + IceInternal::NativeInfoPtr IceSSL::AcceptorI::getNativeInfo() { @@ -57,7 +59,7 @@ IceSSL::AcceptorI::close() } IceInternal::EndpointIPtr -IceSSL::AcceptorI::listen(const IceInternal::EndpointIPtr& endp) +IceSSL::AcceptorI::listen() { const_cast<IceInternal::Address&>(_addr) = IceInternal::doBind(_fd, _addr); @@ -71,7 +73,8 @@ IceSSL::AcceptorI::listen(const IceInternal::EndpointIPtr& endp) throw; } - return endp->endpoint(this); + _endpoint = _endpoint->endpoint(this); + return _endpoint; } #ifdef ICE_USE_IOCP @@ -205,7 +208,9 @@ IceSSL::AcceptorI::effectivePort() const } } -IceSSL::AcceptorI::AcceptorI(const InstancePtr& instance, const string& adapterName, const string& host, int port) : +IceSSL::AcceptorI::AcceptorI(const EndpointIPtr& endpoint, const InstancePtr& instance, const string& adapterName, + const string& host, int port) : + _endpoint(endpoint), _instance(instance), _adapterName(adapterName), _addr(IceInternal::getAddressForServer(host, port, instance->protocolSupport(), instance->preferIPv6())) |