admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Convert LS_VERBOSE and LS_INFO logs in OpenSSLStreamAdapter to DLOG

Browse Source 
Bug: none
Change-Id: I008b76557cc928f9ceeea76927f7de4e4c6f9473
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/186580
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Tommi <tommi@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#32297}
This commit is contained in:
Tomas Gunnarsson 2020-10-02 18:28:46 +02:00 committed by Commit Bot
parent 0f1f72eba4
commit d48ff45707
1 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
rtc_base/openssl_stream_adapter.cc
View File

@ -547,7 +547,7 @@ StreamResult OpenSSLStreamAdapter::Write(const void* data,
size_t data_len,
size_t* written,
int* error) {
RTC_LOG(LS_VERBOSE) << "OpenSSLStreamAdapter::Write(" << data_len << ")";
RTC_DLOG(LS_VERBOSE) << "OpenSSLStreamAdapter::Write(" << data_len << ")";
switch (state_) {
case SSL_NONE:
@ -587,18 +587,18 @@ StreamResult OpenSSLStreamAdapter::Write(const void* data,
int ssl_error = SSL_get_error(ssl_, code);
switch (ssl_error) {
case SSL_ERROR_NONE:
RTC_LOG(LS_VERBOSE) << " -- success";
RTC_DLOG(LS_VERBOSE) << " -- success";
RTC_DCHECK_GT(code, 0);
RTC_DCHECK_LE(code, data_len);
if (written)
*written = code;
return SR_SUCCESS;
case SSL_ERROR_WANT_READ:
RTC_LOG(LS_VERBOSE) << " -- error want read";
RTC_DLOG(LS_VERBOSE) << " -- error want read";
ssl_write_needs_read_ = true;
return SR_BLOCK;
case SSL_ERROR_WANT_WRITE:
RTC_LOG(LS_VERBOSE) << " -- error want write";
RTC_DLOG(LS_VERBOSE) << " -- error want write";
return SR_BLOCK;
case SSL_ERROR_ZERO_RETURN:
@ -616,7 +616,7 @@ StreamResult OpenSSLStreamAdapter::Read(void* data,
size_t data_len,
size_t* read,
int* error) {
RTC_LOG(LS_VERBOSE) << "OpenSSLStreamAdapter::Read(" << data_len << ")";
RTC_DLOG(LS_VERBOSE) << "OpenSSLStreamAdapter::Read(" << data_len << ")";
switch (state_) {
case SSL_NONE:
// pass-through in clear text
@ -654,7 +654,7 @@ StreamResult OpenSSLStreamAdapter::Read(void* data,
switch (ssl_error) {
case SSL_ERROR_NONE:
RTC_LOG(LS_VERBOSE) << " -- success";
RTC_DLOG(LS_VERBOSE) << " -- success";
RTC_DCHECK_GT(code, 0);
RTC_DCHECK_LE(code, data_len);
if (read) {
@ -666,7 +666,7 @@ StreamResult OpenSSLStreamAdapter::Read(void* data,
unsigned int pending = SSL_pending(ssl_);
if (pending) {
RTC_LOG(LS_INFO) << " -- short DTLS read. flushing";
RTC_DLOG(LS_INFO) << " -- short DTLS read. flushing";
FlushInput(pending);
if (error) {
*error = SSE_MSG_TRUNC;
@ -676,14 +676,14 @@ StreamResult OpenSSLStreamAdapter::Read(void* data,
}
return SR_SUCCESS;
case SSL_ERROR_WANT_READ:
RTC_LOG(LS_VERBOSE) << " -- error want read";
RTC_DLOG(LS_VERBOSE) << " -- error want read";
return SR_BLOCK;
case SSL_ERROR_WANT_WRITE:
RTC_LOG(LS_VERBOSE) << " -- error want write";
RTC_DLOG(LS_VERBOSE) << " -- error want write";
ssl_read_needs_write_ = true;
return SR_BLOCK;
case SSL_ERROR_ZERO_RETURN:
RTC_LOG(LS_VERBOSE) << " -- remote side closed";
RTC_DLOG(LS_VERBOSE) << " -- remote side closed";
Close();
return SR_EOS;
default:
@ -713,7 +713,7 @@ void OpenSSLStreamAdapter::FlushInput(unsigned int left) {
return;
}
RTC_LOG(LS_VERBOSE) << " -- flushed " << code << " bytes";
RTC_DLOG(LS_VERBOSE) << " -- flushed " << code << " bytes";
left -= code;
}
}
@ -751,7 +751,7 @@ void OpenSSLStreamAdapter::OnEvent(StreamInterface* stream,
RTC_DCHECK(stream == this->stream());
if ((events & SE_OPEN)) {
RTC_LOG(LS_VERBOSE) << "OpenSSLStreamAdapter::OnEvent SE_OPEN";
RTC_DLOG(LS_VERBOSE) << "OpenSSLStreamAdapter::OnEvent SE_OPEN";
if (state_ != SSL_WAIT) {
RTC_DCHECK(state_ == SSL_NONE);
events_to_signal |= SE_OPEN;
@ -765,9 +765,9 @@ void OpenSSLStreamAdapter::OnEvent(StreamInterface* stream,
}
if ((events & (SE_READ | SE_WRITE))) {
RTC_LOG(LS_VERBOSE) << "OpenSSLStreamAdapter::OnEvent"
<< ((events & SE_READ) ? " SE_READ" : "")
<< ((events & SE_WRITE) ? " SE_WRITE" : "");
RTC_DLOG(LS_VERBOSE) << "OpenSSLStreamAdapter::OnEvent"
<< ((events & SE_READ) ? " SE_READ" : "")
<< ((events & SE_WRITE) ? " SE_WRITE" : "");
if (state_ == SSL_NONE) {
events_to_signal |= events & (SE_READ | SE_WRITE);
} else if (state_ == SSL_CONNECTING) {
@ -778,20 +778,20 @@ void OpenSSLStreamAdapter::OnEvent(StreamInterface* stream,
} else if (state_ == SSL_CONNECTED) {
if (((events & SE_READ) && ssl_write_needs_read_) ||
(events & SE_WRITE)) {
RTC_LOG(LS_VERBOSE) << " -- onStreamWriteable";
RTC_DLOG(LS_VERBOSE) << " -- onStreamWriteable";
events_to_signal |= SE_WRITE;
}
if (((events & SE_WRITE) && ssl_read_needs_write_) ||
(events & SE_READ)) {
RTC_LOG(LS_VERBOSE) << " -- onStreamReadable";
RTC_DLOG(LS_VERBOSE) << " -- onStreamReadable";
events_to_signal |= SE_READ;
}
}
}
if ((events & SE_CLOSE)) {
RTC_LOG(LS_VERBOSE) << "OpenSSLStreamAdapter::OnEvent(SE_CLOSE, " << err
<< ")";
RTC_DLOG(LS_VERBOSE) << "OpenSSLStreamAdapter::OnEvent(SE_CLOSE, " << err
<< ")";
Cleanup(0);
events_to_signal |= SE_CLOSE;
// SE_CLOSE is the only event that uses the final parameter to OnEvent().
@ -819,7 +819,7 @@ void OpenSSLStreamAdapter::SetTimeout(int delay_ms) {
owner_, webrtc::TimeDelta::Millis(delay_ms),
[flag = task_safety_.flag(), this]() {
if (flag->alive()) {
RTC_LOG(LS_INFO) << "DTLS timeout expired";
RTC_DLOG(LS_INFO) << "DTLS timeout expired";
timeout_task_.Stop();
DTLSv1_handle_timeout(ssl_);
ContinueSSL();
@ -834,7 +834,7 @@ void OpenSSLStreamAdapter::SetTimeout(int delay_ms) {
int OpenSSLStreamAdapter::BeginSSL() {
RTC_DCHECK(state_ == SSL_CONNECTING);
// The underlying stream has opened.
RTC_LOG(LS_INFO) << "BeginSSL with peer.";
RTC_DLOG(LS_INFO) << "BeginSSL with peer.";
BIO* bio = nullptr;
@ -877,7 +877,7 @@ int OpenSSLStreamAdapter::BeginSSL() {
}
int OpenSSLStreamAdapter::ContinueSSL() {
RTC_LOG(LS_VERBOSE) << "ContinueSSL";
RTC_DLOG(LS_VERBOSE) << "ContinueSSL";
RTC_DCHECK(state_ == SSL_CONNECTING);
// Clear the DTLS timer
@ -888,7 +888,7 @@ int OpenSSLStreamAdapter::ContinueSSL() {
switch (ssl_error) {
case SSL_ERROR_NONE:
RTC_LOG(LS_VERBOSE) << " -- success";
RTC_DLOG(LS_VERBOSE) << " -- success";
// By this point, OpenSSL should have given us a certificate, or errored
// out if one was missing.
RTC_DCHECK(peer_cert_chain_ || !GetClientAuthEnabled());
@ -909,7 +909,7 @@ int OpenSSLStreamAdapter::ContinueSSL() {
break;
case SSL_ERROR_WANT_READ: {
RTC_LOG(LS_VERBOSE) << " -- error want read";
RTC_DLOG(LS_VERBOSE) << " -- error want read";
struct timeval timeout;
if (DTLSv1_get_timeout(ssl_, &timeout)) {
int delay = timeout.tv_sec * 1000 + timeout.tv_usec / 1000;
@ -918,7 +918,7 @@ int OpenSSLStreamAdapter::ContinueSSL() {
} break;
case SSL_ERROR_WANT_WRITE:
RTC_LOG(LS_VERBOSE) << " -- error want write";
RTC_DLOG(LS_VERBOSE) << " -- error want write";
break;
case SSL_ERROR_ZERO_RETURN:
@ -928,8 +928,8 @@ int OpenSSLStreamAdapter::ContinueSSL() {
if (err_code != 0 && ERR_GET_REASON(err_code) == SSL_R_NO_SHARED_CIPHER) {
ssl_handshake_err = SSLHandshakeError::INCOMPATIBLE_CIPHERSUITE;
}
RTC_LOG(LS_VERBOSE) << " -- error " << code << ", " << err_code << ", "
<< ERR_GET_REASON(err_code);
RTC_DLOG(LS_VERBOSE) << " -- error " << code << ", " << err_code << ", "
<< ERR_GET_REASON(err_code);
SignalSSLHandshakeError(ssl_handshake_err);
return (ssl_error != 0) ? ssl_error : -1;
}
@ -952,7 +952,7 @@ void OpenSSLStreamAdapter::Error(const char* context,
}
void OpenSSLStreamAdapter::Cleanup(uint8_t alert) {
RTC_LOG(LS_INFO) << "Cleanup";
RTC_DLOG(LS_INFO) << "Cleanup";
if (state_ != SSL_ERROR) {
state_ = SSL_CLOSED;
@ -1103,7 +1103,7 @@ bool OpenSSLStreamAdapter::VerifyPeerCertificate() {
// Ignore any verification error if the digest matches, since there is no
// value in checking the validity of a self-signed cert issued by untrusted
// sources.
RTC_LOG(LS_INFO) << "Accepted peer certificate.";
RTC_DLOG(LS_INFO) << "Accepted peer certificate.";
peer_certificate_verified_ = true;
return true;
}
@ -1138,7 +1138,7 @@ int OpenSSLStreamAdapter::SSLVerifyCallback(X509_STORE_CTX* store, void* arg) {
// If the peer certificate digest isn't known yet, we'll wait to verify
// until it's known, and for now just return a success status.
if (stream->peer_certificate_digest_algorithm_.empty()) {
RTC_LOG(LS_INFO) << "Waiting to verify certificate until digest is known.";
RTC_DLOG(LS_INFO) << "Waiting to verify certificate until digest is known.";
return 1;
}