walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

nghttpx: Add SSL_read/write error logging

This commit is contained in:
Tatsuhiro Tsujikawa 2015-01-06 21:56:19 +09:00
parent f6097ce6d0
commit a6cf6c00ea
2 changed files with 33 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/shrpx_client_handler.cc
View File

@ -250,6 +250,9 @@ int ClientHandler::read_tls() {
ev_timer_again(loop_, &wt_); ev_timer_again(loop_, &wt_);
goto fin; goto fin;
default: default:
if (LOG_ENABLED(INFO)) {
CLOG(INFO, this) << "SSL_read: SSL_get_error returned " << err;
}
return -1; return -1;
} }
} }
@ -298,6 +301,9 @@ int ClientHandler::write_tls() {
ev_timer_again(loop_, &wt_); ev_timer_again(loop_, &wt_);
return 0; return 0;
default: default:
if (LOG_ENABLED(INFO)) {
CLOG(INFO, this) << "SSL_write: SSL_get_error returned " << err;
}
return -1; return -1;
} }
} }

46
src/shrpx_http2_session.cc
View File

@ -1668,29 +1668,34 @@ int Http2Session::read_tls() {
rb_.reset(); rb_.reset();
struct iovec iov[2]; struct iovec iov[2];
auto iovcnt = rb_.wiovec(iov); auto iovcnt = rb_.wiovec(iov);
if (iovcnt > 0) { if (iovcnt == 0) {
auto rv = SSL_read(ssl_, iov[0].iov_base, iov[0].iov_len); return 0;
}
if (rv == 0) { auto rv = SSL_read(ssl_, iov[0].iov_base, iov[0].iov_len);
if (rv == 0) {
return -1;
}
if (rv < 0) {
auto err = SSL_get_error(ssl_, rv);
switch (err) {
case SSL_ERROR_WANT_READ:
return 0;
case SSL_ERROR_WANT_WRITE:
ev_io_start(loop_, &wev_);
ev_timer_again(loop_, &wt_);
return 0;
default:
if (LOG_ENABLED(INFO)) {
SSLOG(INFO, this) << "SSL_read: SSL_get_error returned " << err;
}
return -1; return -1;
} }
if (rv < 0) {
auto err = SSL_get_error(ssl_, rv);
switch (err) {
case SSL_ERROR_WANT_READ:
return 0;
case SSL_ERROR_WANT_WRITE:
ev_io_start(loop_, &wev_);
ev_timer_again(loop_, &wt_);
return 0;
default:
return -1;
}
}
rb_.write(rv);
} }
rb_.write(rv);
} }
} }
@ -1721,6 +1726,9 @@ int Http2Session::write_tls() {
ev_timer_again(loop_, &wt_); ev_timer_again(loop_, &wt_);
return 0; return 0;
default: default:
if (LOG_ENABLED(INFO)) {
SSLOG(INFO, this) << "SSL_write: SSL_get_error returned " << err;
}
return -1; return -1;
} }
} }