diff options
| author | Dwayne Boone <dwayne@zeroc.com> | 2015-01-08 12:19:48 -0330 |
|---|---|---|
| committer | Dwayne Boone <dwayne@zeroc.com> | 2015-01-08 12:19:48 -0330 |
| commit | 4ab0b1e065a21ff4a4b39270f9898d26ac4aac0d (patch) | |
| tree | cab68796af504ee4520c3c73dabb0754cbf72d81 /cpp/src/Ice/ProtocolInstance.cpp | |
| parent | Additional fix for ICE_HAS_BZIP2 macro (diff) | |
| download | ice-4ab0b1e065a21ff4a4b39270f9898d26ac4aac0d.tar.bz2 ice-4ab0b1e065a21ff4a4b39270f9898d26ac4aac0d.tar.xz ice-4ab0b1e065a21ff4a4b39270f9898d26ac4aac0d.zip | |
ICE-6196 added ProtocolInstance::secure()
Diffstat (limited to 'cpp/src/Ice/ProtocolInstance.cpp')
| -rw-r--r-- | cpp/src/Ice/ProtocolInstance.cpp | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/cpp/src/Ice/ProtocolInstance.cpp b/cpp/src/Ice/ProtocolInstance.cpp index 237f605c4f8..c7f17a3d9c3 100644 --- a/cpp/src/Ice/ProtocolInstance.cpp +++ b/cpp/src/Ice/ProtocolInstance.cpp @@ -14,6 +14,8 @@ #include <Ice/DefaultsAndOverrides.h> #include <Ice/TraceLevels.h> +#include <IceSSL/EndpointInfo.h> + using namespace std; using namespace Ice; using namespace IceInternal; @@ -41,6 +43,12 @@ IceInternal::ProtocolInstance::ProtocolInstance(const InstancePtr& instance, Sho } bool +IceInternal::ProtocolInstance::secure() const +{ + return _type == IceSSL::EndpointType || _type == WSSEndpointType; +} + +bool IceInternal::ProtocolInstance::preferIPv6() const { return _instance->preferIPv6(); @@ -76,7 +84,6 @@ IceInternal::ProtocolInstance::defaultTimeout() const return _instance->defaultsAndOverrides()->defaultTimeout; } - NetworkProxyPtr IceInternal::ProtocolInstance::networkProxy() const { |