diff options
Diffstat (limited to 'chromium/net/tools/quic')
23 files changed, 55 insertions, 44 deletions
diff --git a/chromium/net/tools/quic/benchmark/run_client.py b/chromium/net/tools/quic/benchmark/run_client.py index 7df37ab7fa0..dc421018d77 100755 --- a/chromium/net/tools/quic/benchmark/run_client.py +++ b/chromium/net/tools/quic/benchmark/run_client.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# Copyright 2013 The Chromium Authors. All rights reserved. +# Copyright 2013 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/net/tools/quic/certs/generate-certs.sh b/chromium/net/tools/quic/certs/generate-certs.sh index 11dde0703a6..18799c833cd 100755 --- a/chromium/net/tools/quic/certs/generate-certs.sh +++ b/chromium/net/tools/quic/certs/generate-certs.sh @@ -1,6 +1,6 @@ #!/bin/sh -# Copyright 2015 The Chromium Authors. All rights reserved. +# Copyright 2015 The Chromium Authors # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. diff --git a/chromium/net/tools/quic/crypto_message_printer_bin.cc b/chromium/net/tools/quic/crypto_message_printer_bin.cc index 51156bd5843..ed2581634b0 100644 --- a/chromium/net/tools/quic/crypto_message_printer_bin.cc +++ b/chromium/net/tools/quic/crypto_message_printer_bin.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/quic/quic_client_message_loop_network_helper.cc b/chromium/net/tools/quic/quic_client_message_loop_network_helper.cc index fa4e7cd697f..50e90d79442 100644 --- a/chromium/net/tools/quic/quic_client_message_loop_network_helper.cc +++ b/chromium/net/tools/quic/quic_client_message_loop_network_helper.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -53,7 +53,7 @@ bool QuicClientMessageLooplNetworkHelper::CreateUDPSocketAndBind( client_address_ = quic::QuicSocketAddress(bind_to_address, client_->local_port()); } else if (server_address.host().address_family() == - quic::IpAddressFamily::IP_V4) { + quiche::IpAddressFamily::IP_V4) { client_address_ = quic::QuicSocketAddress(quic::QuicIpAddress::Any4(), bind_to_port); } else { diff --git a/chromium/net/tools/quic/quic_client_message_loop_network_helper.h b/chromium/net/tools/quic/quic_client_message_loop_network_helper.h index e11e4c5a41b..f1c09b71f4d 100644 --- a/chromium/net/tools/quic/quic_client_message_loop_network_helper.h +++ b/chromium/net/tools/quic/quic_client_message_loop_network_helper.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // diff --git a/chromium/net/tools/quic/quic_simple_client.cc b/chromium/net/tools/quic/quic_simple_client.cc index ff8703ee7e7..35c8514258c 100644 --- a/chromium/net/tools/quic/quic_simple_client.cc +++ b/chromium/net/tools/quic/quic_simple_client.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -63,8 +63,9 @@ std::unique_ptr<quic::QuicSession> QuicSimpleClient::CreateQuicClientSession( const quic::ParsedQuicVersionVector& supported_versions, quic::QuicConnection* connection) { return std::make_unique<quic::QuicSimpleClientSession>( - *config(), supported_versions, connection, server_id(), crypto_config(), - push_promise_index(), drop_response_body()); + *config(), supported_versions, connection, network_helper(), server_id(), + crypto_config(), push_promise_index(), drop_response_body(), + /*enable_web_transport=*/false); } QuicChromiumConnectionHelper* QuicSimpleClient::CreateQuicConnectionHelper() { diff --git a/chromium/net/tools/quic/quic_simple_client.h b/chromium/net/tools/quic/quic_simple_client.h index 01f8f4cc609..e307bab1ef9 100644 --- a/chromium/net/tools/quic/quic_simple_client.h +++ b/chromium/net/tools/quic/quic_simple_client.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // diff --git a/chromium/net/tools/quic/quic_simple_client_bin.cc b/chromium/net/tools/quic/quic_simple_client_bin.cc index a4c88a5fbe6..519d2ec890b 100644 --- a/chromium/net/tools/quic/quic_simple_client_bin.cc +++ b/chromium/net/tools/quic/quic_simple_client_bin.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/quic/quic_simple_client_test.cc b/chromium/net/tools/quic/quic_simple_client_test.cc index 8bc6d16a58e..500012bfbb5 100644 --- a/chromium/net/tools/quic/quic_simple_client_test.cc +++ b/chromium/net/tools/quic/quic_simple_client_test.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/quic/quic_simple_server.cc b/chromium/net/tools/quic/quic_simple_server.cc index e3fe44894c8..6a28de20020 100644 --- a/chromium/net/tools/quic/quic_simple_server.cc +++ b/chromium/net/tools/quic/quic_simple_server.cc @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -61,7 +61,8 @@ QuicSimpleServer::QuicSimpleServer( std::move(proof_source), quic::KeyExchangeSource::Default()), read_buffer_(base::MakeRefCounted<IOBufferWithSize>(kReadBufferSize)), - quic_simple_server_backend_(quic_simple_server_backend) { + quic_simple_server_backend_(quic_simple_server_backend), + connection_id_generator_(quic::kQuicDefaultConnectionIdLength) { DCHECK(quic_simple_server_backend); Initialize(); } @@ -114,7 +115,8 @@ bool QuicSimpleServer::Listen(const IPEndPoint& address) { std::make_unique<QuicSimpleServerSessionHelper>( quic::QuicRandom::GetInstance()), std::unique_ptr<quic::QuicAlarmFactory>(alarm_factory_), - quic_simple_server_backend_, quic::kQuicDefaultConnectionIdLength); + quic_simple_server_backend_, quic::kQuicDefaultConnectionIdLength, + connection_id_generator_); QuicSimpleServerPacketWriter* writer = new QuicSimpleServerPacketWriter(socket_.get(), dispatcher_.get()); dispatcher_->InitializeWithWriter(writer); diff --git a/chromium/net/tools/quic/quic_simple_server.h b/chromium/net/tools/quic/quic_simple_server.h index c6f6f4817c6..7b0647f5ee6 100644 --- a/chromium/net/tools/quic/quic_simple_server.h +++ b/chromium/net/tools/quic/quic_simple_server.h @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // @@ -16,6 +16,7 @@ #include "net/quic/quic_chromium_alarm_factory.h" #include "net/quic/quic_chromium_connection_helper.h" #include "net/third_party/quiche/src/quiche/quic/core/crypto/quic_crypto_server_config.h" +#include "net/third_party/quiche/src/quiche/quic/core/deterministic_connection_id_generator.h" #include "net/third_party/quiche/src/quiche/quic/core/quic_config.h" #include "net/third_party/quiche/src/quiche/quic/core/quic_version_manager.h" #include "net/third_party/quiche/src/quiche/quic/tools/quic_simple_server_backend.h" @@ -123,6 +124,8 @@ class QuicSimpleServer : public quic::QuicSpdyServerBase { quic::QuicSimpleServerBackend* quic_simple_server_backend_; + quic::DeterministicConnectionIdGenerator connection_id_generator_; + base::WeakPtrFactory<QuicSimpleServer> weak_factory_{this}; }; diff --git a/chromium/net/tools/quic/quic_simple_server_backend_factory.cc b/chromium/net/tools/quic/quic_simple_server_backend_factory.cc index f8d70bcab81..acaa0bf5b8e 100644 --- a/chromium/net/tools/quic/quic_simple_server_backend_factory.cc +++ b/chromium/net/tools/quic/quic_simple_server_backend_factory.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2019 The Chromium Authors. All rights reserved. +// Copyright 2019 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/quic/quic_simple_server_backend_factory.h b/chromium/net/tools/quic/quic_simple_server_backend_factory.h index 041f0f2d5fc..c6f24e38fbb 100644 --- a/chromium/net/tools/quic/quic_simple_server_backend_factory.h +++ b/chromium/net/tools/quic/quic_simple_server_backend_factory.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/quic/quic_simple_server_bin.cc b/chromium/net/tools/quic/quic_simple_server_bin.cc index 4d847f3107f..d2b3bbeed77 100644 --- a/chromium/net/tools/quic/quic_simple_server_bin.cc +++ b/chromium/net/tools/quic/quic_simple_server_bin.cc @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/quic/quic_simple_server_packet_writer.cc b/chromium/net/tools/quic/quic_simple_server_packet_writer.cc index 8d13498040c..306e01d7831 100644 --- a/chromium/net/tools/quic/quic_simple_server_packet_writer.cc +++ b/chromium/net/tools/quic/quic_simple_server_packet_writer.cc @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/quic/quic_simple_server_packet_writer.h b/chromium/net/tools/quic/quic_simple_server_packet_writer.h index 667980af838..a026df39026 100644 --- a/chromium/net/tools/quic/quic_simple_server_packet_writer.h +++ b/chromium/net/tools/quic/quic_simple_server_packet_writer.h @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/quic/quic_simple_server_session_helper.cc b/chromium/net/tools/quic/quic_simple_server_session_helper.cc index 80e0ef26882..10f1af2e26b 100644 --- a/chromium/net/tools/quic/quic_simple_server_session_helper.cc +++ b/chromium/net/tools/quic/quic_simple_server_session_helper.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/quic/quic_simple_server_session_helper.h b/chromium/net/tools/quic/quic_simple_server_session_helper.h index 664523a9642..6ac57dc2ba5 100644 --- a/chromium/net/tools/quic/quic_simple_server_session_helper.h +++ b/chromium/net/tools/quic/quic_simple_server_session_helper.h @@ -1,4 +1,4 @@ -// Copyright (c) 2012 The Chromium Authors. All rights reserved. +// Copyright 2012 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/quic/quic_simple_server_socket.cc b/chromium/net/tools/quic/quic_simple_server_socket.cc index d500012884a..86912d9594c 100644 --- a/chromium/net/tools/quic/quic_simple_server_socket.cc +++ b/chromium/net/tools/quic/quic_simple_server_socket.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2019 The Chromium Authors. All rights reserved. +// Copyright 2019 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/quic/quic_simple_server_socket.h b/chromium/net/tools/quic/quic_simple_server_socket.h index 56cf9d9ceb4..1fe11ab2308 100644 --- a/chromium/net/tools/quic/quic_simple_server_socket.h +++ b/chromium/net/tools/quic/quic_simple_server_socket.h @@ -1,4 +1,4 @@ -// Copyright (c) 2019 The Chromium Authors. All rights reserved. +// Copyright 2019 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. diff --git a/chromium/net/tools/quic/quic_simple_server_test.cc b/chromium/net/tools/quic/quic_simple_server_test.cc index 9681310e155..5bc56f8001e 100644 --- a/chromium/net/tools/quic/quic_simple_server_test.cc +++ b/chromium/net/tools/quic/quic_simple_server_test.cc @@ -1,4 +1,4 @@ -// Copyright 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -8,6 +8,7 @@ #include "net/quic/address_utils.h" #include "net/third_party/quiche/src/quiche/quic/core/crypto/quic_random.h" +#include "net/third_party/quiche/src/quiche/quic/core/deterministic_connection_id_generator.h" #include "net/third_party/quiche/src/quiche/quic/core/quic_crypto_stream.h" #include "net/third_party/quiche/src/quiche/quic/core/quic_utils.h" #include "net/third_party/quiche/src/quiche/quic/platform/api/quic_test.h" @@ -31,28 +32,32 @@ class QuicChromeServerDispatchPacketTest : public ::testing::Test { quic::test::crypto_test_utils::ProofSourceForTesting(), quic::KeyExchangeSource::Default()), version_manager_(quic::AllSupportedVersions()), - dispatcher_(&config_, - &crypto_config_, - &version_manager_, - std::make_unique<quic::test::MockQuicConnectionHelper>(), - std::make_unique<QuicSimpleServerSessionHelper>( - quic::QuicRandom::GetInstance()), - std::make_unique<quic::test::MockAlarmFactory>(), - &memory_cache_backend_) { - dispatcher_.InitializeWithWriter(nullptr); + connection_id_generator_(quic::kQuicDefaultConnectionIdLength), + dispatcher_(std::make_unique<quic::test::MockQuicDispatcher>( + &config_, + &crypto_config_, + &version_manager_, + std::make_unique<quic::test::MockQuicConnectionHelper>(), + std::make_unique<QuicSimpleServerSessionHelper>( + quic::QuicRandom::GetInstance()), + std::make_unique<quic::test::MockAlarmFactory>(), + &memory_cache_backend_, + connection_id_generator_)) { + dispatcher_->InitializeWithWriter(nullptr); } void DispatchPacket(const quic::QuicReceivedPacket& packet) { IPEndPoint client_addr, server_addr; - dispatcher_.ProcessPacket(ToQuicSocketAddress(server_addr), - ToQuicSocketAddress(client_addr), packet); + dispatcher_->ProcessPacket(ToQuicSocketAddress(server_addr), + ToQuicSocketAddress(client_addr), packet); } protected: quic::QuicConfig config_; quic::QuicCryptoServerConfig crypto_config_; quic::QuicVersionManager version_manager_; - quic::test::MockQuicDispatcher dispatcher_; + quic::DeterministicConnectionIdGenerator connection_id_generator_; + std::unique_ptr<quic::test::MockQuicDispatcher> dispatcher_; quic::QuicMemoryCacheBackend memory_cache_backend_; }; @@ -70,7 +75,7 @@ TEST_F(QuicChromeServerDispatchPacketTest, DispatchPacket) { reinterpret_cast<char*>(valid_packet), std::size(valid_packet), quic::QuicTime::Zero(), false); - EXPECT_CALL(dispatcher_, ProcessPacket(_, _, _)).Times(1); + EXPECT_CALL(*dispatcher_, ProcessPacket(_, _, _)).Times(1); DispatchPacket(encrypted_valid_packet); } diff --git a/chromium/net/tools/quic/synchronous_host_resolver.cc b/chromium/net/tools/quic/synchronous_host_resolver.cc index a205e3f7f48..722d46663c8 100644 --- a/chromium/net/tools/quic/synchronous_host_resolver.cc +++ b/chromium/net/tools/quic/synchronous_host_resolver.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2015 The Chromium Authors. All rights reserved. +// Copyright 2015 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -67,10 +67,10 @@ void ResolverThread::Run() { std::unique_ptr<net::HostResolver> resolver = net::HostResolver::CreateStandaloneResolver(NetLog::Get(), options); - // No need to use a NetworkIsolationKey here, since this is an external tool - // not used by net/ consumers. + // No need to use a NetworkAnonymizationKey here, since this is an external + // tool not used by net/ consumers. std::unique_ptr<net::HostResolver::ResolveHostRequest> request = - resolver->CreateRequest(scheme_host_port_, NetworkIsolationKey(), + resolver->CreateRequest(scheme_host_port_, NetworkAnonymizationKey(), NetLogWithSource(), absl::nullopt); base::RunLoop run_loop; diff --git a/chromium/net/tools/quic/synchronous_host_resolver.h b/chromium/net/tools/quic/synchronous_host_resolver.h index 8bb511d15ed..8b7189431f5 100644 --- a/chromium/net/tools/quic/synchronous_host_resolver.h +++ b/chromium/net/tools/quic/synchronous_host_resolver.h @@ -1,4 +1,4 @@ -// Copyright (c) 2015 The Chromium Authors. All rights reserved. +// Copyright 2015 The Chromium Authors // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. // |