Skip to content

Commit

Permalink
quic: possibly resolve flaky assertion failure in ipv6only test
Browse files Browse the repository at this point in the history
PR-URL: #34033
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
  • Loading branch information
jasnell committed Jun 24, 2020
1 parent f5343d1 commit 99f7c4b
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions src/quic/node_quic_session.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1663,10 +1663,8 @@ void QuicSession::AddStream(BaseObjectPtr<QuicStream> stream) {
// not immediately torn down, but is allowed to drain
// properly per the QUIC spec description of "immediate close".
void QuicSession::ImmediateClose() {
// Calling either ImmediateClose or SilentClose will cause
// the QUICSESSION_FLAG_CLOSING to be set. In either case,
// we should never re-enter ImmediateClose or SilentClose.
CHECK(!is_flag_set(QUICSESSION_FLAG_CLOSING));
if (is_flag_set(QUICSESSION_FLAG_CLOSING))
return;
set_flag(QUICSESSION_FLAG_CLOSING);

QuicError err = last_error();
Expand Down Expand Up @@ -2368,10 +2366,7 @@ void QuicSession::ResetStream(int64_t stream_id, uint64_t code) {
// notify the JavaScript side and destroy the connection with
// a flag set that indicates stateless reset.
void QuicSession::SilentClose() {
// Calling either ImmediateClose or SilentClose will cause
// the QUICSESSION_FLAG_CLOSING to be set. In either case,
// we should never re-enter ImmediateClose or SilentClose.
CHECK(!is_flag_set(QUICSESSION_FLAG_CLOSING));
CHECK(!is_flag_set(QUICSESSION_FLAG_SILENT_CLOSE));
set_flag(QUICSESSION_FLAG_SILENT_CLOSE);
set_flag(QUICSESSION_FLAG_CLOSING);

Expand Down

0 comments on commit 99f7c4b

Please sign in to comment.