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/Ice/TcpAcceptor.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/Ice/TcpAcceptor.cpp')
| -rw-r--r-- | cpp/src/Ice/TcpAcceptor.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/cpp/src/Ice/TcpAcceptor.cpp b/cpp/src/Ice/TcpAcceptor.cpp index 9574f7bce0a..1b0e4251ba5 100644 --- a/cpp/src/Ice/TcpAcceptor.cpp +++ b/cpp/src/Ice/TcpAcceptor.cpp @@ -9,7 +9,6 @@ #include <Ice/TcpAcceptor.h> #include <Ice/TcpTransceiver.h> -#include <Ice/Endpoint.h> #include <Ice/Instance.h> #include <Ice/TraceLevels.h> #include <Ice/LoggerUtil.h> @@ -169,7 +168,7 @@ IceInternal::TcpAcceptor::accept() Trace out(_logger, _traceLevels->networkCat); out << "accepted tcp connection\n" << fdToString(fd); } - return new TcpTransceiver(_instance, _endpointInfo, fd, true); + return new TcpTransceiver(_instance, fd, true); } string @@ -184,12 +183,11 @@ IceInternal::TcpAcceptor::effectivePort() const return getPort(_addr); } -IceInternal::TcpAcceptor::TcpAcceptor(const InstancePtr& instance, const TcpEndpointInfoPtr& endpointInfo) : +IceInternal::TcpAcceptor::TcpAcceptor(const InstancePtr& instance, const string& host, int port) : _instance(instance), - _endpointInfo(endpointInfo), _traceLevels(instance->traceLevels()), _logger(instance->initializationData().logger), - _addr(getAddressForServer(endpointInfo->host, endpointInfo->port, instance->protocolSupport())) + _addr(getAddressForServer(host, port, instance->protocolSupport())) #ifdef ICE_USE_IOCP , _acceptFd(INVALID_SOCKET), _info(SocketOperationRead) |