diff options
| author | Benoit Foucher <benoit@zeroc.com> | 2014-09-10 08:47:19 +0200 |
|---|---|---|
| committer | Benoit Foucher <benoit@zeroc.com> | 2014-09-10 08:47:19 +0200 |
| commit | b6c9d9a880f6f1a6908a3c62dfccdce3e68dad80 (patch) | |
| tree | d3e9e9340064538a8dc7a645260d0eb3cdf55d63 /cpp/src/IceSSL/ConnectorI.cpp | |
| parent | Undo bogus change from an earlier commit. (diff) | |
| download | ice-b6c9d9a880f6f1a6908a3c62dfccdce3e68dad80.tar.bz2 ice-b6c9d9a880f6f1a6908a3c62dfccdce3e68dad80.tar.xz ice-b6c9d9a880f6f1a6908a3c62dfccdce3e68dad80.zip | |
ICE-5582 (SOCKs test), ICE-5314 (HTTP proxies), major refactoring of networking code (addition of StreamSocket class abstraction)
Diffstat (limited to 'cpp/src/IceSSL/ConnectorI.cpp')
| -rw-r--r-- | cpp/src/IceSSL/ConnectorI.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/cpp/src/IceSSL/ConnectorI.cpp b/cpp/src/IceSSL/ConnectorI.cpp index e7914663088..a31b25fee01 100644 --- a/cpp/src/IceSSL/ConnectorI.cpp +++ b/cpp/src/IceSSL/ConnectorI.cpp @@ -18,7 +18,9 @@ #include <IceSSL/Util.h> #include <Ice/Communicator.h> #include <Ice/LocalException.h> +#include <Ice/StreamSocket.h> #include <Ice/LoggerUtil.h> +#include <Ice/NetworkProxy.h> using namespace std; using namespace Ice; @@ -36,7 +38,9 @@ IceSSL::ConnectorI::connect() ex.reason = "IceSSL: plug-in is not initialized"; throw ex; } - return new TransceiverI(_instance, IceInternal::createSocket(false, _addr), _proxy, _host, _addr, _sourceAddr); + + IceInternal::StreamSocketPtr stream = new IceInternal::StreamSocket(_instance, _proxy, _addr, _sourceAddr); + return new TransceiverI(_instance, stream, _host, ""); } Short |