summaryrefslogtreecommitdiff
path: root/cpp/src/IceSSL/OpenSSLTransceiverI.cpp
diff options
context:
space:
mode:
authorMatthew Newhook <matthew@zeroc.com>2014-11-21 14:24:49 -0330
committerMatthew Newhook <matthew@zeroc.com>2014-11-21 14:24:49 -0330
commit0189cef575eabe5eafe814568eecbc7697327122 (patch)
tree42426670a3ef6d148612869f4ddf17aebe637c52 /cpp/src/IceSSL/OpenSSLTransceiverI.cpp
parentFixed setting of library.path in test and demo scripts (diff)
downloadice-0189cef575eabe5eafe814568eecbc7697327122.tar.bz2
ice-0189cef575eabe5eafe814568eecbc7697327122.tar.xz
ice-0189cef575eabe5eafe814568eecbc7697327122.zip
ICE-5938 OSX: ssl + test/Glacier2/staticFiltering fails
Diffstat (limited to 'cpp/src/IceSSL/OpenSSLTransceiverI.cpp')
-rw-r--r--cpp/src/IceSSL/OpenSSLTransceiverI.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp
index c24ef888396..da8b01c8ddc 100644
--- a/cpp/src/IceSSL/OpenSSLTransceiverI.cpp
+++ b/cpp/src/IceSSL/OpenSSLTransceiverI.cpp
@@ -538,12 +538,12 @@ IceSSL::TransceiverI::checkSendSize(const IceInternal::Buffer&)
}
IceSSL::TransceiverI::TransceiverI(const InstancePtr& instance, const IceInternal::StreamSocketPtr& stream,
- const string& host, const std::string& adapterName) :
+ const string& hostOrAdapterName, bool incoming) :
_instance(instance),
_engine(OpenSSLEnginePtr::dynamicCast(instance->engine())),
- _host(host),
- _adapterName(adapterName),
- _incoming(_host.empty()),
+ _host(incoming ? "" : hostOrAdapterName),
+ _adapterName(incoming ? hostOrAdapterName : ""),
+ _incoming(incoming),
_stream(stream),
_ssl(0)
{