Skip to content
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

quiche: update tar #12525

Merged
merged 2 commits into from
Aug 7, 2020
Merged

quiche: update tar #12525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3870318
test pass
danzh1989 Aug 6, 2020
8e5cfe7
remove debug log
danzh1989 Aug 6, 2020
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
19 changes: 19 additions & 0 deletions bazel/external/quiche.BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3731,6 +3731,25 @@ envoy_cc_test_library(
],
)

envoy_cc_test_library(
name = "quic_test_tools_session_peer_lib",
srcs = [
"quiche/quic/test_tools/quic_session_peer.cc",
],
hdrs = [
"quiche/quic/test_tools/quic_session_peer.h",
],
copts = quiche_copts,
repository = "@envoy",
tags = ["nofips"],
deps = [
":quic_core_packets_lib",
":quic_core_session_lib",
":quic_core_utils_lib",
":quic_platform",
],
)

envoy_cc_test_library(
name = "quic_test_tools_unacked_packet_map_peer_lib",
srcs = ["quiche/quic/test_tools/quic_unacked_packet_map_peer.cc"],
Expand Down
6 changes: 3 additions & 3 deletions bazel/repository_locations.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -408,9 +408,9 @@ DEPENDENCY_REPOSITORIES = dict(
cpe = "N/A",
),
com_googlesource_quiche = dict(
# Static snapshot of https://quiche.googlesource.com/quiche/+archive/b2b8ff25f5a565324b93411ca29c3403ccbca969.tar.gz
sha256 = "792924bbf27203bb0d1d08c99597a30793ef8f4cfa2df99792aea7200f1b27e3",
urls = ["https://storage.googleapis.com/quiche-envoy-integration/b2b8ff25f5a565324b93411ca29c3403ccbca969.tar.gz"],
# Static snapshot of https://quiche.googlesource.com/quiche/+archive/96bd860bec207d4b722ab7f319fa47be129a85cd.tar.gz
sha256 = "d7129a2f41f2bd00a8a38b33f9b7b955d3e7de3dec20f69b70d7000d3a856360",
urls = ["https://storage.googleapis.com/quiche-envoy-integration/96bd860bec207d4b722ab7f319fa47be129a85cd.tar.gz"],
use_category = ["dataplane"],
cpe = "N/A",
),
Expand Down
5 changes: 3 additions & 2 deletions source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,9 @@ void EnvoyQuicDispatcher::OnConnectionClosed(quic::QuicConnectionId connection_i
}

std::unique_ptr<quic::QuicSession> EnvoyQuicDispatcher::CreateQuicSession(
quic::QuicConnectionId server_connection_id, const quic::QuicSocketAddress& peer_address,
quiche::QuicheStringPiece /*alpn*/, const quic::ParsedQuicVersion& version) {
quic::QuicConnectionId server_connection_id, const quic::QuicSocketAddress& /*self_address*/,
const quic::QuicSocketAddress& peer_address, quiche::QuicheStringPiece /*alpn*/,
const quic::ParsedQuicVersion& version) {
auto quic_connection = std::make_unique<EnvoyQuicServerConnection>(
server_connection_id, peer_address, *helper(), *alarm_factory(), writer(),
/*owns_writer=*/false, quic::ParsedQuicVersionVector{version}, listen_socket_);
Expand Down
1 change: 1 addition & 0 deletions source/extensions/quic_listeners/quiche/envoy_quic_dispatcher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ class EnvoyQuicDispatcher : public quic::QuicDispatcher {
protected:
std::unique_ptr<quic::QuicSession>
CreateQuicSession(quic::QuicConnectionId server_connection_id,
const quic::QuicSocketAddress& self_address,
const quic::QuicSocketAddress& peer_address, quiche::QuicheStringPiece alpn,
const quic::ParsedQuicVersion& version) override;

Expand Down
182 changes: 104 additions & 78 deletions source/extensions/quic_listeners/quiche/platform/flags_list.h
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions test/extensions/quic_listeners/quiche/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ envoy_cc_test(
"//test/mocks/network:network_mocks",
"//test/test_common:utility_lib",
"@com_googlesource_quiche//:quic_core_http_spdy_session_lib",
"@com_googlesource_quiche//:quic_test_tools_session_peer_lib",
],
)

Expand Down
2 changes: 1 addition & 1 deletion test/extensions/quic_listeners/quiche/active_quic_listener_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class ActiveQuicListenerTest : public QuicMultiVersionTest {
return quic::CurrentSupportedVersionsWithQuicCrypto();
}
bool use_http3 = GetParam().second == QuicVersionType::Iquic;
SetQuicReloadableFlag(quic_enable_version_draft_29, use_http3);
SetQuicReloadableFlag(quic_disable_version_draft_29, !use_http3);
SetQuicReloadableFlag(quic_disable_version_draft_27, !use_http3);
SetQuicReloadableFlag(quic_disable_version_draft_25, !use_http3);
return quic::CurrentSupportedVersions();
Expand Down
2 changes: 1 addition & 1 deletion test/extensions/quic_listeners/quiche/envoy_quic_client_session_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ class EnvoyQuicClientSessionTest : public testing::TestWithParam<bool> {
: api_(Api::createApiForTest(time_system_)),
dispatcher_(api_->allocateDispatcher("test_thread")), connection_helper_(*dispatcher_),
alarm_factory_(*dispatcher_, *connection_helper_.GetClock()), quic_version_([]() {
SetQuicReloadableFlag(quic_enable_version_draft_29, GetParam());
SetQuicReloadableFlag(quic_disable_version_draft_29, !GetParam());
SetQuicReloadableFlag(quic_disable_version_draft_27, !GetParam());
SetQuicReloadableFlag(quic_disable_version_draft_25, !GetParam());
return quic::ParsedVersionOfIndex(quic::CurrentSupportedVersions(), 0);
Expand Down
2 changes: 1 addition & 1 deletion test/extensions/quic_listeners/quiche/envoy_quic_client_stream_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class EnvoyQuicClientStreamTest : public testing::TestWithParam<bool> {
: api_(Api::createApiForTest()), dispatcher_(api_->allocateDispatcher("test_thread")),
connection_helper_(*dispatcher_),
alarm_factory_(*dispatcher_, *connection_helper_.GetClock()), quic_version_([]() {
SetQuicReloadableFlag(quic_enable_version_draft_29, GetParam());
SetQuicReloadableFlag(quic_disable_version_draft_29, !GetParam());
SetQuicReloadableFlag(quic_disable_version_draft_27, !GetParam());
SetQuicReloadableFlag(quic_disable_version_draft_25, !GetParam());
return quic::CurrentSupportedVersions()[0];
Expand Down
2 changes: 1 addition & 1 deletion test/extensions/quic_listeners/quiche/envoy_quic_dispatcher_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class EnvoyQuicDispatcherTest : public QuicMultiVersionTest,
return quic::CurrentSupportedVersionsWithQuicCrypto();
}
bool use_http3 = GetParam().second == QuicVersionType::Iquic;
SetQuicReloadableFlag(quic_enable_version_draft_29, use_http3);
SetQuicReloadableFlag(quic_disable_version_draft_29, !use_http3);
SetQuicReloadableFlag(quic_disable_version_draft_27, !use_http3);
SetQuicReloadableFlag(quic_disable_version_draft_25, !use_http3);
return quic::CurrentSupportedVersions();
Expand Down
2 changes: 1 addition & 1 deletion test/extensions/quic_listeners/quiche/envoy_quic_server_session_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ class EnvoyQuicServerSessionTest : public testing::TestWithParam<bool> {
: api_(Api::createApiForTest(time_system_)),
dispatcher_(api_->allocateDispatcher("test_thread")), connection_helper_(*dispatcher_),
alarm_factory_(*dispatcher_, *connection_helper_.GetClock()), quic_version_([]() {
SetQuicReloadableFlag(quic_enable_version_draft_29, GetParam());
SetQuicReloadableFlag(quic_disable_version_draft_29, !GetParam());
SetQuicReloadableFlag(quic_disable_version_draft_27, !GetParam());
SetQuicReloadableFlag(quic_disable_version_draft_25, !GetParam());
return quic::ParsedVersionOfIndex(quic::CurrentSupportedVersions(), 0);
Expand Down
3 changes: 2 additions & 1 deletion test/extensions/quic_listeners/quiche/envoy_quic_server_stream_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
#pragma GCC diagnostic ignored "-Winvalid-offsetof"

#include "quiche/quic/test_tools/quic_connection_peer.h"
#include "quiche/quic/test_tools/quic_session_peer.h"
#pragma GCC diagnostic pop

#include "common/event/libevent_scheduler.h"
Expand Down Expand Up @@ -39,7 +40,7 @@ class EnvoyQuicServerStreamTest : public testing::TestWithParam<bool> {
: api_(Api::createApiForTest()), dispatcher_(api_->allocateDispatcher("test_thread")),
connection_helper_(*dispatcher_),
alarm_factory_(*dispatcher_, *connection_helper_.GetClock()), quic_version_([]() {
SetQuicReloadableFlag(quic_enable_version_draft_29, GetParam());
SetQuicReloadableFlag(quic_disable_version_draft_29, !GetParam());
SetQuicReloadableFlag(quic_disable_version_draft_27, !GetParam());
SetQuicReloadableFlag(quic_disable_version_draft_25, !GetParam());
return quic::CurrentSupportedVersions()[0];
Expand Down
2 changes: 1 addition & 1 deletion test/extensions/quic_listeners/quiche/integration/quic_http_integration_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class QuicHttpIntegrationTest : public HttpIntegrationTest, public QuicMultiVers
return quic::CurrentSupportedVersionsWithQuicCrypto();
}
bool use_http3 = GetParam().second == QuicVersionType::Iquic;
SetQuicReloadableFlag(quic_enable_version_draft_29, use_http3);
SetQuicReloadableFlag(quic_disable_version_draft_29, !use_http3);
SetQuicReloadableFlag(quic_disable_version_draft_27, !use_http3);
SetQuicReloadableFlag(quic_disable_version_draft_25, !use_http3);
return quic::CurrentSupportedVersions();
Expand Down