summaryrefslogtreecommitdiff
path: root/cpp/src/Ice/TcpConnector.cpp
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2009-10-16 09:38:13 -0230
committerDwayne Boone <dwayne@zeroc.com>2009-10-16 09:38:13 -0230
commitb8b803f51c8ff622491d2a160663e4912f7dba03 (patch)
treeb4ded20bd5b2fa37a18943a5ac0665ce2d525128 /cpp/src/Ice/TcpConnector.cpp
parentAdded support for per-OA ACM and fix for retry on CloseConnectionException (diff)
downloadice-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/Ice/TcpConnector.cpp')
-rw-r--r--cpp/src/Ice/TcpConnector.cpp12
1 files changed, 8 insertions, 4 deletions
diff --git a/cpp/src/Ice/TcpConnector.cpp b/cpp/src/Ice/TcpConnector.cpp
index 9d45fdf82bd..e1fdf982cdc 100644
--- a/cpp/src/Ice/TcpConnector.cpp
+++ b/cpp/src/Ice/TcpConnector.cpp
@@ -31,7 +31,8 @@ IceInternal::TcpConnector::connect()
try
{
- TransceiverPtr transceiver = new TcpTransceiver(_instance, createSocket(false, _addr.ss_family), false);
+ TransceiverPtr transceiver =
+ new TcpTransceiver(_instance, _endpointInfo, createSocket(false, _addr.ss_family), false);
dynamic_cast<TcpTransceiver*>(transceiver.get())->connect(_addr);
return transceiver;
}
@@ -120,13 +121,16 @@ IceInternal::TcpConnector::operator<(const Connector& r) const
return compareAddress(_addr, p->_addr) == -1;
}
-IceInternal::TcpConnector::TcpConnector(const InstancePtr& instance, const struct sockaddr_storage& addr,
- Ice::Int timeout, const string& connectionId) :
+IceInternal::TcpConnector::TcpConnector(const InstancePtr& instance,
+ const TcpEndpointInfoPtr& endpointInfo,
+ const struct sockaddr_storage& addr,
+ const string& connectionId) :
_instance(instance),
+ _endpointInfo(endpointInfo),
_traceLevels(instance->traceLevels()),
_logger(instance->initializationData().logger),
_addr(addr),
- _timeout(timeout),
+ _timeout(_endpointInfo->timeout),
_connectionId(connectionId)
{
}