summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/TcpConnector.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2009-10-16 15:01:08 -0230
committerDwayne Boone <dwayne@zeroc.com>2009-10-16 15:01:08 -0230
commit667cf6024bbf1950da2eecffe65f00dc2169a9d6 (patch)
treea6efa0a355f8a2b1fa8f8b15fdf1d26ed91959f1 /cpp/src/Ice/TcpConnector.cpp
parentChanged Glacier2 to enable ACM for client connections, bug 3244 and 4298 (diff)
downloadice-667cf6024bbf1950da2eecffe65f00dc2169a9d6.tar.bz2
ice-667cf6024bbf1950da2eecffe65f00dc2169a9d6.tar.xz
ice-667cf6024bbf1950da2eecffe65f00dc2169a9d6.zip
Added Ruby implemetation of EndpointInfo and ConnectionInfo
Diffstat (limited to 'cpp/src/Ice/TcpConnector.cpp')
-rw-r--r--cpp/src/Ice/TcpConnector.cpp12
1 files changed, 4 insertions, 8 deletions
diff --git a/cpp/src/Ice/TcpConnector.cpp b/cpp/src/Ice/TcpConnector.cpp
index e1fdf982cdc..9d45fdf82bd 100644
--- a/cpp/src/Ice/TcpConnector.cpp
+++ b/cpp/src/Ice/TcpConnector.cpp
@@ -31,8 +31,7 @@ IceInternal::TcpConnector::connect()
try
{
- TransceiverPtr transceiver =
- new TcpTransceiver(_instance, _endpointInfo, createSocket(false, _addr.ss_family), false);
+ TransceiverPtr transceiver = new TcpTransceiver(_instance, createSocket(false, _addr.ss_family), false);
dynamic_cast<TcpTransceiver*>(transceiver.get())->connect(_addr);
return transceiver;
}
@@ -121,16 +120,13 @@ IceInternal::TcpConnector::operator<(const Connector& r) const
return compareAddress(_addr, p->_addr) == -1;
}
-IceInternal::TcpConnector::TcpConnector(const InstancePtr& instance,
- const TcpEndpointInfoPtr& endpointInfo,
- const struct sockaddr_storage& addr,
- const string& connectionId) :
+IceInternal::TcpConnector::TcpConnector(const InstancePtr& instance, const struct sockaddr_storage& addr,
+ Ice::Int timeout, const string& connectionId) :
_instance(instance),
- _endpointInfo(endpointInfo),
_traceLevels(instance->traceLevels()),
_logger(instance->initializationData().logger),
_addr(addr),
- _timeout(_endpointInfo->timeout),
+ _timeout(timeout),
_connectionId(connectionId)
{
}