summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDwayne Boone <dwayne@zeroc.com>2005-09-26 16:08:07 +0000
committerDwayne Boone <dwayne@zeroc.com>2005-09-26 16:08:07 +0000
commit6b7757d8db26d895f28efe4aadfd72da2b643a69 (patch)
tree54722e04275ee339f7cb041e93bf0eb2ae287a7b
parentRemoved refereneces to icej not working with 4.3 (diff)
downloadice-6b7757d8db26d895f28efe4aadfd72da2b643a69.tar.bz2
ice-6b7757d8db26d895f28efe4aadfd72da2b643a69.tar.xz
ice-6b7757d8db26d895f28efe4aadfd72da2b643a69.zip
Disable code with ifdef
-rw-r--r--cpp/src/IceSSL/SslClientTransceiver.cpp8
-rw-r--r--cpp/src/IceSSL/SslServerTransceiver.cpp6
2 files changed, 11 insertions, 3 deletions
diff --git a/cpp/src/IceSSL/SslClientTransceiver.cpp b/cpp/src/IceSSL/SslClientTransceiver.cpp
index f10eb44bcba..84da556f77f 100644
--- a/cpp/src/IceSSL/SslClientTransceiver.cpp
+++ b/cpp/src/IceSSL/SslClientTransceiver.cpp
@@ -359,9 +359,12 @@ IceSSL::SslClientTransceiver::handshake(int timeout)
void
IceSSL::SslClientTransceiver::showConnectionInfo()
{
- // Only in extreme cases do we enable this, partially because it doesn't use the Logger.
- if((_traceLevels->security >= SECURITY_PROTOCOL_DEBUG) && 0)
+ if(_traceLevels->security >= SECURITY_PROTOCOL_DEBUG)
{
+#ifdef ICE_SSL_EXTRA_TRACING
+ //
+ // Only in extreme cases do we enable this, partially because it doesn't use the Logger.
+ //
BIOJanitor bioJanitor(BIO_new_fp(stdout, BIO_NOCLOSE));
BIO* bio = bioJanitor.get();
@@ -378,6 +381,7 @@ IceSSL::SslClientTransceiver::showConnectionInfo()
showHandshakeStats(bio);
showSessionInfo(bio);
+#endif
}
}
diff --git a/cpp/src/IceSSL/SslServerTransceiver.cpp b/cpp/src/IceSSL/SslServerTransceiver.cpp
index f34ba6744a8..48a70620961 100644
--- a/cpp/src/IceSSL/SslServerTransceiver.cpp
+++ b/cpp/src/IceSSL/SslServerTransceiver.cpp
@@ -333,9 +333,12 @@ IceSSL::SslServerTransceiver::handshake(int timeout)
void
IceSSL::SslServerTransceiver::showConnectionInfo()
{
- // Only in extreme cases do we enable this, partially because it doesn't use the Logger.
if((_traceLevels->security >= IceSSL::SECURITY_PROTOCOL_DEBUG) && 0)
{
+#ifdef ICE_SSL_EXTRA_TRACING
+ //
+ // Only in extreme cases do we enable this, partially because it doesn't use the Logger.
+ //
BIOJanitor bioJanitor(BIO_new_fp(stdout, BIO_NOCLOSE));
BIO* bio = bioJanitor.get();
@@ -350,6 +353,7 @@ IceSSL::SslServerTransceiver::showConnectionInfo()
showHandshakeStats(bio);
showSessionInfo(bio);
+#endif
}
}