diff options
| author | Anthony Neal <aneal@zeroc.com> | 2001-11-27 14:20:30 +0000 |
|---|---|---|
| committer | Anthony Neal <aneal@zeroc.com> | 2001-11-27 14:20:30 +0000 |
| commit | 69626b9aae5fa3d8d84fedb09b3c862d108edf95 (patch) | |
| tree | f6bce22d25cbfcfb6e843e2d2c49c3c2a7a35b2d /cpp/src | |
| parent | Bug fixes. Added name to NoSuchTopic & TopicExists. Attempting to subscribe (diff) | |
| download | ice-69626b9aae5fa3d8d84fedb09b3c862d108edf95.tar.bz2 ice-69626b9aae5fa3d8d84fedb09b3c862d108edf95.tar.xz ice-69626b9aae5fa3d8d84fedb09b3c862d108edf95.zip | |
Updated the SSL Connections to perform proper network tracing against
networkCat instead of securityCat. Updated AllTests.cpp in operations
to remove the output line that shows the reference.
Diffstat (limited to 'cpp/src')
| -rw-r--r-- | cpp/src/Ice/SslConnectionOpenSSL.cpp | 13 | ||||
| -rw-r--r-- | cpp/src/Ice/SslConnectionOpenSSLClient.cpp | 15 | ||||
| -rw-r--r-- | cpp/src/Ice/SslConnectionOpenSSLServer.cpp | 15 |
3 files changed, 23 insertions, 20 deletions
diff --git a/cpp/src/Ice/SslConnectionOpenSSL.cpp b/cpp/src/Ice/SslConnectionOpenSSL.cpp index a17ab2f9197..8e55d10742f 100644 --- a/cpp/src/Ice/SslConnectionOpenSSL.cpp +++ b/cpp/src/Ice/SslConnectionOpenSSL.cpp @@ -419,12 +419,13 @@ IceSecurity::Ssl::OpenSSL::Connection::readSSL(Buffer& buf, int timeout) { if (bytesRead > 0) { - ostringstream s; - - s << "received " << bytesRead << " of " << packetSize; - s << " bytes via SSL\n" << fdToString(SSL_get_fd(_sslConnection)); - - ICE_PROTOCOL(s.str()); + if (_traceLevels->network >= 3)
+ {
+ ostringstream s; + s << "received " << bytesRead << " of " << packetSize; + s << " bytes via ssl\n" << fdToString(SSL_get_fd(_sslConnection)); + _logger->trace(_traceLevels->networkCat, s.str());
+ }
totalBytesRead += bytesRead; diff --git a/cpp/src/Ice/SslConnectionOpenSSLClient.cpp b/cpp/src/Ice/SslConnectionOpenSSLClient.cpp index 9634855fd21..c5ee61236c8 100644 --- a/cpp/src/Ice/SslConnectionOpenSSLClient.cpp +++ b/cpp/src/Ice/SslConnectionOpenSSLClient.cpp @@ -289,13 +289,14 @@ IceSecurity::Ssl::OpenSSL::ClientConnection::write(Buffer& buf, int timeout) { if (bytesWritten > 0) { - ostringstream s; - - s << "sent " << bytesWritten << " of " << packetSize; - s << " bytes via SSL\n" << fdToString(SSL_get_fd(_sslConnection)); - - ICE_PROTOCOL(s.str()); - + if (_traceLevels->network >= 3)
+ {
+ ostringstream s;
+ s << "sent " << bytesWritten << " of " << packetSize;
+ s << " bytes via ssl\n" << fdToString(SSL_get_fd(_sslConnection));
+ _logger->trace(_traceLevels->networkCat, s.str());
+ }
+
totalBytesWritten += bytesWritten; buf.i += bytesWritten; diff --git a/cpp/src/Ice/SslConnectionOpenSSLServer.cpp b/cpp/src/Ice/SslConnectionOpenSSLServer.cpp index c13995e07b2..e25b8699765 100644 --- a/cpp/src/Ice/SslConnectionOpenSSLServer.cpp +++ b/cpp/src/Ice/SslConnectionOpenSSLServer.cpp @@ -314,13 +314,14 @@ IceSecurity::Ssl::OpenSSL::ServerConnection::write(Buffer& buf, int timeout) { case SSL_ERROR_NONE: { - ostringstream s; - - s << "sent " << bytesWritten << " of " << packetSize; - s << " bytes via SSL\n" << fdToString(SSL_get_fd(_sslConnection)); - - ICE_PROTOCOL(s.str()); - + if (_traceLevels->network >= 3)
+ {
+ ostringstream s;
+ s << "sent " << bytesWritten << " of " << packetSize;
+ s << " bytes via ssl\n" << fdToString(SSL_get_fd(_sslConnection));
+ _logger->trace(_traceLevels->networkCat, s.str());
+ }
+
totalBytesWritten += bytesWritten; buf.i += bytesWritten; |