Skip to content

Commit

Permalink
Roll src/net/third_party/quiche/src/ bb003dd7b..29ce0bde7 (5 commits)
Browse files Browse the repository at this point in the history
https://quiche.googlesource.com/quiche.git/+log/bb003dd7b64e..29ce0bde7aa7

$ git log bb003dd7b..29ce0bde7 --date=short --no-merges --format='%ad %ae %s'
2020-10-29 fayang Do not send control frames (by session) until encryption gets established.
2020-10-29 quiche-dev Update s-maxage separately from max-age for CACHE_ALL_STATIC client_ttl
2020-10-29 quiche-dev Project import generated by Copybara.
2020-10-28 haoyuewang Internal QUICHE change
2020-10-27 vasilvv Repalce QuicheTextUtils::HexEncode/Decode with Abseil equivalents.

Created with:
  roll-dep src/net/third_party/quiche/src src/third_party/quic_trace/src

Change-Id: Ic3cf6a4e0e89f03b20cc40f9a4dd31c69a9489c9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2508970
Auto-Submit: Haoyue Wang <haoyuewang@chromium.org>
Commit-Queue: Bence Béky <bnc@chromium.org>
Reviewed-by: Bence Béky <bnc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#822587}
  • Loading branch information
Haoyue Wang authored and Commit Bot committed Oct 30, 2020
1 parent 7aeed1c commit 5228632
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 39 deletions.
2 changes: 1 addition & 1 deletion DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,7 @@ vars = {
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling feed
# and whatever else without interference from each other.
'quiche_revision': 'bb003dd7b64eacffd85cb795cdabbc7305162ada',
'quiche_revision': '29ce0bde7aa71bdf36936a0a6a6b7be0919db7cc',
# Three lines of non-changing comments so that
# the commit queue can handle CLs rolling ios_webkit
# and whatever else without interference from each other.
Expand Down
2 changes: 1 addition & 1 deletion net/http2/platform/impl/http2_string_utils_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ inline std::string Http2HexEncodeImpl(const void* bytes, size_t size) {
}

inline std::string Http2HexDecodeImpl(absl::string_view data) {
return quiche::QuicheTextUtils::HexDecode(data);
return absl::HexStringToBytes(data);
}

inline std::string Http2HexDumpImpl(absl::string_view data) {
Expand Down
3 changes: 1 addition & 2 deletions net/quic/quic_client_session_cache_unittests.cc
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,7 @@ class QuicClientSessionCacheTest : public testing::Test {

protected:
bssl::UniquePtr<SSL_SESSION> NewSSLSession() {
std::string cached_session =
quiche::QuicheTextUtils::HexDecode(kCachedSession);
std::string cached_session = absl::HexStringToBytes(kCachedSession);
SSL_SESSION* session = SSL_SESSION_from_bytes(
reinterpret_cast<const uint8_t*>(cached_session.data()),
cached_session.size(), ssl_ctx_.get());
Expand Down
31 changes: 3 additions & 28 deletions net/quic/quic_flags_list.h
Original file line number Diff line number Diff line change
Expand Up @@ -134,25 +134,9 @@ QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_enable_mtu_discovery_at_server, false)
// of the packet.
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_start_peer_migration_earlier, false)

// If true, neuter initial packet in the coalescer when discarding initial keys.
QUIC_FLAG(
FLAGS_quic_reloadable_flag_quic_neuter_initial_packet_in_coalescer_with_initial_key_discarded,
true)

// If true, convert bytes_left_for_batch_write_ to unsigned int.
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_fix_bytes_left_for_batch_write, true)

// If true, add missing connected checks.
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_add_missing_connected_checks, true)

// If true, QuicStream::kDefaultUrgency is 3, otherwise 1.
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_http3_new_default_urgency_value, true)

// If true, close connection on packet serialization failures
QUIC_FLAG(
FLAGS_quic_reloadable_flag_quic_close_connection_on_serialization_failure,
true)

// If true, send PATH_RESPONSE upon receiving PATH_CHALLENGE regardless
// of perspective.
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_send_path_response, false)
Expand Down Expand Up @@ -207,9 +191,6 @@ QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_abort_qpack_on_stream_close, true)
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_fix_arm_pto_for_application_data,
true)

// If true, cap client suggested initial RTT to 1s if it is longer than 1s.
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_cap_large_client_initial_rtt, true)

// If true, fix a potential out of order sending caused by handshake gets
// confirmed while the coalescer is not empty.
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_fix_out_of_order_sending2, true)
Expand All @@ -231,10 +212,6 @@ QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_bbr2_use_tcp_inflight_hi_headroom,
// If true, HTTP/3 will treat HTTP/2 specific SETTINGS as error.
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_reject_spdy_settings, true)

// If true, discard 0-RTT keys after installing 1-RTT keys on the client side.
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_postpone_discarding_zero_rtt_keys,
true)

// If true, for IETF QUIC, uses 2 * RTTVAR when calculating PTO delay.
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_default_to_2_rttvar, true)

Expand Down Expand Up @@ -267,11 +244,6 @@ QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_connection_set_initial_self_address,
// If true, let QUIC connection handle PINGs instead of going through session.
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_let_connection_handle_pings, true)

// If true, BBRv2 will 1) change the default STARTUP and DRAIN cwnd gain to 2.0,
// and 2) change the meaning of connection option BBQ2 to use 2.885 for STARTUP
// and DRAIN cwnd gain.
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_bbr2_flip_bbq2, true)

// If true, use http2::HuffmanEncodeFast() instead of HuffmanEncode() and
// eliminate one string copy for QPACK encoding used in IETF QUIC.
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_use_fast_huffman_encoder, true)
Expand Down Expand Up @@ -343,3 +315,6 @@ QUIC_FLAG(
// If true, fix QuicSession::WillingAndAbleToWrite to check write keys when
// using CRYPTO frames.
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_fix_willing_and_able_to_write2, true)

// If true, do not send control frames before encryption is established.
QUIC_FLAG(FLAGS_quic_reloadable_flag_quic_encrypted_control_frames, false)
8 changes: 4 additions & 4 deletions net/quic/quic_test_packet_printer.cc
Original file line number Diff line number Diff line change
Expand Up @@ -72,16 +72,16 @@ class QuicPacketPrinter : public QuicFramerVisitorInterface {
bool OnStreamFrame(const QuicStreamFrame& frame) override {
*output_ << "OnStreamFrame: " << frame;
*output_ << " data: { "
<< quiche::QuicheTextUtils::HexEncode(frame.data_buffer,
frame.data_length)
<< absl::BytesToHexString(
absl::string_view(frame.data_buffer, frame.data_length))
<< " }\n";
return true;
}
bool OnCryptoFrame(const QuicCryptoFrame& frame) override {
*output_ << "OnCryptoFrame: " << frame;
*output_ << " data: { "
<< quiche::QuicheTextUtils::HexEncode(frame.data_buffer,
frame.data_length)
<< absl::BytesToHexString(
absl::string_view(frame.data_buffer, frame.data_length))
<< " }\n";
return true;
}
Expand Down
4 changes: 2 additions & 2 deletions net/spdy/platform/impl/spdy_string_utils_impl.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,14 @@ inline char SpdyHexDigitToIntImpl(char c) {
}

inline std::string SpdyHexDecodeImpl(absl::string_view data) {
return quiche::QuicheTextUtils::HexDecode(data);
return absl::HexStringToBytes(data);
}

NET_EXPORT_PRIVATE bool SpdyHexDecodeToUInt32Impl(absl::string_view data,
uint32_t* out);

inline std::string SpdyHexEncodeImpl(const char* bytes, size_t size) {
return quiche::QuicheTextUtils::HexEncode(bytes, size);
return absl::BytesToHexString(absl::string_view(bytes, size));
}

inline std::string SpdyHexEncodeUInt32AndTrimImpl(uint32_t data) {
Expand Down
2 changes: 1 addition & 1 deletion net/tools/quic/crypto_message_printer_bin.cc
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ int main(int argc, char* argv[]) {
quic::CryptoFramer framer;
framer.set_visitor(&printer);
framer.set_process_truncated_messages(true);
std::string input = quiche::QuicheTextUtils::HexDecode(argv[1]);
std::string input = absl::HexStringToBytes(argv[1]);
if (!framer.ProcessInput(input)) {
return 1;
}
Expand Down

0 comments on commit 5228632

Please sign in to comment.