Skip to content

Adjust ssl read loops for POST timeouts #2248

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
shinrich wants to merge 3 commits into from
+19 −12
Closed

Adjust ssl read loops for POST timeouts #2248

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f3c7936
Revert "set location for client CA cert file"
Jul 6, 2017
44029f4
Break up the ssl_read_from_net loop. Adjust UA inactivity timeout.
Jul 7, 2017
8158daf
Remove resetting the set inactivity logic
Jul 7, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions iocore/net/SSLNetVConnection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,11 +206,17 @@ ssl_read_from_net(SSLNetVConnection *sslvc, EThread *lthread, int64_t &ret)
while (sslErr == SSL_ERROR_NONE) {
int64_t block_write_avail = buf.writer()->block_write_avail();
if (block_write_avail <= 0) {
buf.writer()->add_block();
block_write_avail = buf.writer()->block_write_avail();
if (block_write_avail <= 0) {
Warning("Cannot add new block");
// If we filled up one block, give back to the event loop so we don't
// overbuffer.
if (bytes_read > 0) {
break;
} else { // Make sure there is a block to write into
buf.writer()->add_block();
block_write_avail = buf.writer()->block_write_avail();
if (block_write_avail <= 0) {
Warning("Cannot add new block");
break;
}
}
}

Expand Down Expand Up @@ -239,6 +245,8 @@ ssl_read_from_net(SSLNetVConnection *sslvc, EThread *lthread, int64_t &ret)
bytes_read += nread;
if (nread > 0) {
buf.writer()->fill(nread); // Tell the buffer, we've used the bytes
sslvc->netActivity(lthread);
//Warning("set next_inactivity %" PRId64 " current time %" PRId64, sslvc->next_inactivity_timeout_at, Thread::get_hrtime());
}
break;
case SSL_ERROR_WANT_WRITE:
Expand Down Expand Up @@ -302,6 +310,10 @@ ssl_read_from_net(SSLNetVConnection *sslvc, EThread *lthread, int64_t &ret)
ret = bytes_read;

event = (s->vio.ntodo() <= 0) ? SSL_READ_COMPLETE : SSL_READ_READY;
if (sslErr == SSL_ERROR_NONE && s->vio.ntodo() > 0) {
// We stopped with data on the wire (to avoid overbuffering). Make sure we are triggered
sslvc->read.triggered = 1;
}
} else { // if( bytes_read > 0 )
#if defined(_DEBUG)
if (bytes_read == 0) {
Expand Down Expand Up @@ -994,14 +1006,6 @@ SSLNetVConnection::sslStartHandShake(int event, int &err)
} else {
clientCTX = params->client_ctx;
}

if (this->options.clientVerificationFlag && params->clientCACertFilename != nullptr && params->clientCACertPath != nullptr) {
if (!SSL_CTX_load_verify_locations(clientCTX, params->clientCACertFilename, params->clientCACertPath)) {
SSLError("invalid client CA Certificate file (%s) or CA Certificate path (%s)", params->clientCACertFilename,
params->clientCACertPath);
return EVENT_ERROR;
}
}
this->ssl = make_ssl_connection(clientCTX, this);

if (this->ssl == nullptr) {
Expand Down
1 change: 1 addition & 0 deletions iocore/net/UnixNetVConnection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1234,6 +1234,7 @@ UnixNetVConnection::mainEvent(int event, Event *e)
// ink_assert(next_inactivity_timeout_at < Thread::get_hrtime());
if (!inactivity_timeout_in || next_inactivity_timeout_at > Thread::get_hrtime())
return EVENT_CONT;
Warning("next_inactivity %" PRId64 " current time %" PRId64, next_inactivity_timeout_at, Thread::get_hrtime());
signal_event = VC_EVENT_INACTIVITY_TIMEOUT;
signal_timeout_at = &next_inactivity_timeout_at;
} else {
Expand Down
2 changes: 2 additions & 0 deletions proxy/http/HttpSM.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3611,6 +3611,7 @@ HttpSM::tunnel_handler_post_ua(int event, HttpTunnelProducer *p)
// timeouts
ua_entry->vc_handler = &HttpSM::state_watch_for_client_abort;
ua_entry->read_vio = p->vc->do_io_read(this, INT64_MAX, ua_buffer_reader->mbuf);
//ua_session->set_inactivity_timeout(0);
break;
default:
ink_release_assert(0);
Expand Down Expand Up @@ -3697,6 +3698,7 @@ HttpSM::tunnel_handler_post_server(int event, HttpTunnelConsumer *c)
// on the user agent in order to get timeouts
// coming to the state machine and not the tunnel
ua_entry->vc_handler = &HttpSM::state_watch_for_client_abort;
//ua_session->set_inactivity_timeout(0);

// YTS Team, yamsat Plugin
// When event is VC_EVENT_ERROR,and when redirection is enabled
Expand Down