Shorten QuicHttp3ErrorCode and QuicHttpQpackErrorCode member names; make QuicHttpQpackErrorCode enum class. Enum class members are always scoped, therefore they do not have to be long or unique. gfe-relnote: n/a, rename only. PiperOrigin-RevId: 305795214 Change-Id: I7040deb8cef0167417bec568cd25006eb9143653
diff --git a/quic/core/http/quic_spdy_session.cc b/quic/core/http/quic_spdy_session.cc index e16fede..b5d5bcd 100644 --- a/quic/core/http/quic_spdy_session.cc +++ b/quic/core/http/quic_spdy_session.cc
@@ -1152,10 +1152,9 @@ return true; } default: - SendStopSending( - static_cast<QuicApplicationErrorCode>( - QuicHttp3ErrorCode::IETF_QUIC_HTTP3_STREAM_CREATION_ERROR), - pending->id()); + SendStopSending(static_cast<QuicApplicationErrorCode>( + QuicHttp3ErrorCode::STREAM_CREATION_ERROR), + pending->id()); pending->StopReading(); } return false;
diff --git a/quic/core/http/quic_spdy_session_test.cc b/quic/core/http/quic_spdy_session_test.cc index 49d9697..f7ceaec 100644 --- a/quic/core/http/quic_spdy_session_test.cc +++ b/quic/core/http/quic_spdy_session_test.cc
@@ -2273,7 +2273,7 @@ QuicStopSendingFrame* stop_sending = frame.stop_sending_frame; EXPECT_EQ(stream_id, stop_sending->stream_id); - EXPECT_EQ(QuicHttp3ErrorCode::IETF_QUIC_HTTP3_STREAM_CREATION_ERROR, + EXPECT_EQ(QuicHttp3ErrorCode::STREAM_CREATION_ERROR, static_cast<QuicHttp3ErrorCode>( stop_sending->application_error_code));
diff --git a/quic/core/quic_error_codes.cc b/quic/core/quic_error_codes.cc index 1e75060..b330725 100644 --- a/quic/core/quic_error_codes.cc +++ b/quic/core/quic_error_codes.cc
@@ -495,67 +495,58 @@ case QUIC_TRANSPORT_INVALID_CLIENT_INDICATION: return {true, {static_cast<uint64_t>(PROTOCOL_VIOLATION)}}; case QUIC_QPACK_DECOMPRESSION_FAILED: - return { - false, - {static_cast<uint64_t>(IETF_QUIC_HTTP_QPACK_DECOMPRESSION_FAILED)}}; + return {false, + {static_cast<uint64_t>( + QuicHttpQpackErrorCode::DECOMPRESSION_FAILED)}}; case QUIC_QPACK_ENCODER_STREAM_ERROR: - return { - false, - {static_cast<uint64_t>(IETF_QUIC_HTTP_QPACK_ENCODER_STREAM_ERROR)}}; + return {false, + {static_cast<uint64_t>( + QuicHttpQpackErrorCode::ENCODER_STREAM_ERROR)}}; case QUIC_QPACK_DECODER_STREAM_ERROR: - return { - false, - {static_cast<uint64_t>(IETF_QUIC_HTTP_QPACK_DECODER_STREAM_ERROR)}}; + return {false, + {static_cast<uint64_t>( + QuicHttpQpackErrorCode::DECODER_STREAM_ERROR)}}; case QUIC_STREAM_DATA_BEYOND_CLOSE_OFFSET: return {true, {static_cast<uint64_t>(PROTOCOL_VIOLATION)}}; case QUIC_STREAM_MULTIPLE_OFFSET: return {true, {static_cast<uint64_t>(PROTOCOL_VIOLATION)}}; case QUIC_HTTP_FRAME_TOO_LARGE: return {false, - {static_cast<uint64_t>( - QuicHttp3ErrorCode::IETF_QUIC_HTTP3_EXCESSIVE_LOAD)}}; + {static_cast<uint64_t>(QuicHttp3ErrorCode::EXCESSIVE_LOAD)}}; case QUIC_HTTP_FRAME_ERROR: - return {false, - {static_cast<uint64_t>( - QuicHttp3ErrorCode::IETF_QUIC_HTTP3_FRAME_ERROR)}}; + return {false, {static_cast<uint64_t>(QuicHttp3ErrorCode::FRAME_ERROR)}}; case QUIC_HTTP_FRAME_UNEXPECTED_ON_SPDY_STREAM: return {false, - {static_cast<uint64_t>( - QuicHttp3ErrorCode::IETF_QUIC_HTTP3_FRAME_UNEXPECTED)}}; + {static_cast<uint64_t>(QuicHttp3ErrorCode::FRAME_UNEXPECTED)}}; case QUIC_HTTP_FRAME_UNEXPECTED_ON_CONTROL_STREAM: return {false, - {static_cast<uint64_t>( - QuicHttp3ErrorCode::IETF_QUIC_HTTP3_FRAME_UNEXPECTED)}}; + {static_cast<uint64_t>(QuicHttp3ErrorCode::FRAME_UNEXPECTED)}}; case QUIC_HTTP_INVALID_FRAME_SEQUENCE_ON_SPDY_STREAM: return {false, - {static_cast<uint64_t>( - QuicHttp3ErrorCode::IETF_QUIC_HTTP3_FRAME_UNEXPECTED)}}; + {static_cast<uint64_t>(QuicHttp3ErrorCode::FRAME_UNEXPECTED)}}; case QUIC_HTTP_INVALID_FRAME_SEQUENCE_ON_CONTROL_STREAM: return {false, - {static_cast<uint64_t>( - QuicHttp3ErrorCode::IETF_QUIC_HTTP3_FRAME_UNEXPECTED)}}; + {static_cast<uint64_t>(QuicHttp3ErrorCode::FRAME_UNEXPECTED)}}; case QUIC_HTTP_DUPLICATE_UNIDIRECTIONAL_STREAM: - return {false, - {static_cast<uint64_t>( - QuicHttp3ErrorCode::IETF_QUIC_HTTP3_STREAM_CREATION_ERROR)}}; + return { + false, + {static_cast<uint64_t>(QuicHttp3ErrorCode::STREAM_CREATION_ERROR)}}; case QUIC_HTTP_SERVER_INITIATED_BIDIRECTIONAL_STREAM: - return {false, - {static_cast<uint64_t>( - QuicHttp3ErrorCode::IETF_QUIC_HTTP3_STREAM_CREATION_ERROR)}}; + return { + false, + {static_cast<uint64_t>(QuicHttp3ErrorCode::STREAM_CREATION_ERROR)}}; case QUIC_HTTP_STREAM_WRONG_DIRECTION: return {true, {static_cast<uint64_t>(STREAM_STATE_ERROR)}}; case QUIC_HTTP_CLOSED_CRITICAL_STREAM: - return {false, - {static_cast<uint64_t>( - QuicHttp3ErrorCode::IETF_QUIC_HTTP3_CLOSED_CRITICAL_STREAM)}}; + return { + false, + {static_cast<uint64_t>(QuicHttp3ErrorCode::CLOSED_CRITICAL_STREAM)}}; case QUIC_HTTP_MISSING_SETTINGS_FRAME: return {false, - {static_cast<uint64_t>( - QuicHttp3ErrorCode::IETF_QUIC_HTTP3_MISSING_SETTINGS)}}; + {static_cast<uint64_t>(QuicHttp3ErrorCode::MISSING_SETTINGS)}}; case QUIC_HTTP_DUPLICATE_SETTING_IDENTIFIER: return {false, - {static_cast<uint64_t>( - QuicHttp3ErrorCode::IETF_QUIC_HTTP3_SETTINGS_ERROR)}}; + {static_cast<uint64_t>(QuicHttp3ErrorCode::SETTINGS_ERROR)}}; case QUIC_HPACK_INDEX_VARINT_ERROR: return {true, {static_cast<uint64_t>(INTERNAL_ERROR)}}; case QUIC_HPACK_NAME_LENGTH_VARINT_ERROR:
diff --git a/quic/core/quic_error_codes.h b/quic/core/quic_error_codes.h index 7051993..b3de77c 100644 --- a/quic/core/quic_error_codes.h +++ b/quic/core/quic_error_codes.h
@@ -478,30 +478,30 @@ // Wire values for HTTP/3 errors. // https://quicwg.org/base-drafts/draft-ietf-quic-http.html#http-error-codes enum class QuicHttp3ErrorCode { - IETF_QUIC_HTTP3_NO_ERROR = 0x100, - IETF_QUIC_HTTP3_GENERAL_PROTOCOL_ERROR = 0x101, - IETF_QUIC_HTTP3_INTERNAL_ERROR = 0x102, - IETF_QUIC_HTTP3_STREAM_CREATION_ERROR = 0x103, - IETF_QUIC_HTTP3_CLOSED_CRITICAL_STREAM = 0x104, - IETF_QUIC_HTTP3_FRAME_UNEXPECTED = 0x105, - IETF_QUIC_HTTP3_FRAME_ERROR = 0x106, - IETF_QUIC_HTTP3_EXCESSIVE_LOAD = 0x107, - IETF_QUIC_HTTP3_ID_ERROR = 0x108, - IETF_QUIC_HTTP3_SETTINGS_ERROR = 0x109, - IETF_QUIC_HTTP3_MISSING_SETTINGS = 0x10A, - IETF_QUIC_HTTP3_REQUEST_REJECTED = 0x10B, - IETF_QUIC_HTTP3_REQUEST_CANCELLED = 0x10C, - IETF_QUIC_HTTP3_REQUEST_INCOMPLETE = 0x10D, - IETF_QUIC_HTTP3_CONNECT_ERROR = 0x10F, - IETF_QUIC_HTTP3_VERSION_FALLBACK = 0x110, + NO_ERROR = 0x100, + GENERAL_PROTOCOL_ERROR = 0x101, + INTERNAL_ERROR = 0x102, + STREAM_CREATION_ERROR = 0x103, + CLOSED_CRITICAL_STREAM = 0x104, + FRAME_UNEXPECTED = 0x105, + FRAME_ERROR = 0x106, + EXCESSIVE_LOAD = 0x107, + ID_ERROR = 0x108, + SETTINGS_ERROR = 0x109, + MISSING_SETTINGS = 0x10A, + REQUEST_REJECTED = 0x10B, + REQUEST_CANCELLED = 0x10C, + REQUEST_INCOMPLETE = 0x10D, + CONNECT_ERROR = 0x10F, + VERSION_FALLBACK = 0x110, }; // Wire values for QPACK errors. // https://quicwg.org/base-drafts/draft-ietf-quic-qpack.html#error-code-registration -enum QuicHttpQpackErrorCode { - IETF_QUIC_HTTP_QPACK_DECOMPRESSION_FAILED = 0x200, - IETF_QUIC_HTTP_QPACK_ENCODER_STREAM_ERROR = 0x201, - IETF_QUIC_HTTP_QPACK_DECODER_STREAM_ERROR = 0x202 +enum class QuicHttpQpackErrorCode { + DECOMPRESSION_FAILED = 0x200, + ENCODER_STREAM_ERROR = 0x201, + DECODER_STREAM_ERROR = 0x202 }; QUIC_EXPORT_PRIVATE inline std::string HistogramEnumString(