Skip to content

Fix crash in Http2ClientSession::release_netvc #4174

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
zwoop merged 1 commit into from
Aug 30, 2018
Merged

Fix crash in Http2ClientSession::release_netvc #4174

Show file tree
Hide file tree
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
1 change: 0 additions & 1 deletion proxy/ProxyClientSession.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,6 @@ ProxyClientSession::handle_api_return(int event)
NetVConnection *vc = this->get_netvc();
if (vc) {
vc->do_io_close();
this->release_netvc();
}
free(); // You can now clean things up
break;
Expand Down
1 change: 0 additions & 1 deletion proxy/ProxyClientSession.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,6 @@ class ProxyClientSession : public VConnection
virtual void new_connection(NetVConnection *new_vc, MIOBuffer *iobuf, IOBufferReader *reader, bool backdoor) = 0;

virtual NetVConnection *get_netvc() const = 0;
virtual void release_netvc() = 0;

virtual int get_transact_count() const = 0;

Expand Down
13 changes: 0 additions & 13 deletions proxy/http/Http1ClientSession.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,19 +93,6 @@ class Http1ClientSession : public ProxyClientSession
return client_vc;
}

virtual void
release_netvc()
{
// Make sure the vio's are also released to avoid
// later surprises in inactivity timeout
if (client_vc) {
client_vc->do_io_read(NULL, 0, NULL);
client_vc->do_io_write(NULL, 0, NULL);
client_vc->set_action(NULL);
client_vc = NULL;
}
}

int
get_transact_count() const
{
Expand Down
2 changes: 0 additions & 2 deletions proxy/http2/Http2ClientSession.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ Http2ClientSession::free()
}

if (client_vc) {
release_netvc();
client_vc->do_io_close();
client_vc = nullptr;
}
Expand Down Expand Up @@ -275,7 +274,6 @@ Http2ClientSession::do_io_close(int alerrno)
// Don't send the SSN_CLOSE_HOOK until we got rid of all the streams
// And handled all the TXN_CLOSE_HOOK's
if (client_vc) {
this->release_netvc();
client_vc->do_io_close();
client_vc = nullptr;
}
Expand Down
11 changes: 0 additions & 11 deletions proxy/http2/Http2ClientSession.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,17 +182,6 @@ class Http2ClientSession : public ProxyClientSession
return client_vc;
}

void
release_netvc() override
{
// Make sure the vio's are also released to avoid later surprises in inactivity timeout
if (client_vc) {
client_vc->do_io_read(NULL, 0, NULL);
client_vc->do_io_write(NULL, 0, NULL);
client_vc->set_action(NULL);
}
}

sockaddr const *
get_client_addr()
{
Expand Down