Skip to content

Accept Handling VIO events SSL #6764

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

Merged
a-canary merged 1 commit into from
May 13, 2020
Merged

Accept Handling VIO events SSL #6764

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 11 additions & 10 deletions iocore/net/SSLNextProtocolAccept.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ struct SSLNextProtocolTrampoline : public Continuation {
ioCompletionEvent(int event, void *edata)
{
VIO *vio;
Continuation *plugin;

SSLNetVConnection *netvc;

vio = static_cast<VIO *>(edata);
Expand All @@ -83,8 +83,6 @@ struct SSLNextProtocolTrampoline : public Continuation {
case VC_EVENT_ERROR:
case VC_EVENT_ACTIVE_TIMEOUT:
case VC_EVENT_INACTIVITY_TIMEOUT:
// Cancel the read before we have a chance to delete the continuation
netvc->do_io_read(nullptr, 0, nullptr);
netvc->do_io_close();
delete this;
return EVENT_ERROR;
Expand All @@ -99,14 +97,17 @@ struct SSLNextProtocolTrampoline : public Continuation {
// object does not care.
netvc->set_action(nullptr);

// Cancel the read before we have a chance to delete the continuation
netvc->do_io_read(nullptr, 0, nullptr);
plugin = netvc->endpoint();
if (plugin) {
send_plugin_event(plugin, NET_EVENT_ACCEPT, netvc);
} else if (npnParent->endpoint) {
Continuation *endpoint_cont = netvc->endpoint();
if (!endpoint_cont) {
// Route to the default endpoint
send_plugin_event(npnParent->endpoint, NET_EVENT_ACCEPT, netvc);
endpoint_cont = npnParent->endpoint;
}

if (endpoint_cont) {
// disable read io, send events to endpoint
netvc->do_io_read(endpoint_cont, 0, nullptr);

send_plugin_event(endpoint_cont, NET_EVENT_ACCEPT, netvc);
} else {
// No handler, what should we do? Best to just kill the VC while we can.
netvc->do_io_close();
Expand Down