Plumb original_connection_id transport parameter
This transport parameter was already parsed in TransportParameters, but was not acted on. This CL plumbs the received value through QuicConfig to QuicConnection and fails the handshake if the value is not the expected one. This CL also improves debugging in various tests.
Client-only change
PiperOrigin-RevId: 310221632
Change-Id: I75b50926034f1ee5d913c7579e4f3a5e15e97b4a
diff --git a/quic/test_tools/quic_config_peer.cc b/quic/test_tools/quic_config_peer.cc
index 2f20e95..f8f3f42 100644
--- a/quic/test_tools/quic_config_peer.cc
+++ b/quic/test_tools/quic_config_peer.cc
@@ -5,6 +5,7 @@
#include "net/third_party/quiche/src/quic/test_tools/quic_config_peer.h"
#include "net/third_party/quiche/src/quic/core/quic_config.h"
+#include "net/third_party/quiche/src/quic/core/quic_connection_id.h"
namespace quic {
namespace test {
@@ -102,5 +103,12 @@
config->negotiated_ = negotiated;
}
+// static
+void QuicConfigPeer::SetReceivedOriginalConnectionId(
+ QuicConfig* config,
+ const QuicConnectionId& original_connection_id) {
+ config->received_original_connection_id_ = original_connection_id;
+}
+
} // namespace test
} // namespace quic
diff --git a/quic/test_tools/quic_config_peer.h b/quic/test_tools/quic_config_peer.h
index 64d4d1e..94f30b4 100644
--- a/quic/test_tools/quic_config_peer.h
+++ b/quic/test_tools/quic_config_peer.h
@@ -6,6 +6,7 @@
#define QUICHE_QUIC_TEST_TOOLS_QUIC_CONFIG_PEER_H_
#include "net/third_party/quiche/src/quic/core/quic_config.h"
+#include "net/third_party/quiche/src/quic/core/quic_connection_id.h"
#include "net/third_party/quiche/src/quic/core/quic_packets.h"
#include "net/third_party/quiche/src/quic/platform/api/quic_uint128.h"
@@ -60,6 +61,10 @@
uint32_t max_packet_size);
static void SetNegotiated(QuicConfig* config, bool negotiated);
+
+ static void SetReceivedOriginalConnectionId(
+ QuicConfig* config,
+ const QuicConnectionId& original_connection_id);
};
} // namespace test
diff --git a/quic/test_tools/quic_connection_peer.cc b/quic/test_tools/quic_connection_peer.cc
index 518e6a1..09dff83 100644
--- a/quic/test_tools/quic_connection_peer.cc
+++ b/quic/test_tools/quic_connection_peer.cc
@@ -375,5 +375,13 @@
return connection->idle_network_detector_.alarm_.get();
}
+// static
+void QuicConnectionPeer::SetServerConnectionId(
+ QuicConnection* connection,
+ const QuicConnectionId& server_connection_id) {
+ connection->server_connection_id_ = server_connection_id;
+ connection->InstallInitialCrypters(server_connection_id);
+}
+
} // namespace test
} // namespace quic
diff --git a/quic/test_tools/quic_connection_peer.h b/quic/test_tools/quic_connection_peer.h
index 4126503..b66a8a2 100644
--- a/quic/test_tools/quic_connection_peer.h
+++ b/quic/test_tools/quic_connection_peer.h
@@ -144,6 +144,10 @@
static QuicTime GetBlackholeDetectionDeadline(QuicConnection* connection);
static QuicAlarm* GetIdleNetworkDetectorAlarm(QuicConnection* connection);
+
+ static void SetServerConnectionId(
+ QuicConnection* connection,
+ const QuicConnectionId& server_connection_id);
};
} // namespace test
diff --git a/quic/test_tools/quic_test_utils.h b/quic/test_tools/quic_test_utils.h
index 9c81412..cec38a1 100644
--- a/quic/test_tools/quic_test_utils.h
+++ b/quic/test_tools/quic_test_utils.h
@@ -1630,12 +1630,12 @@
// A GMock matcher that prints expected and actual QuicErrorCode strings
// upon failure. Example usage:
-// EXPECT_THAT(stream_->connection_error()), IsError(QUIC_INTERNAL_ERROR));
+// EXPECT_THAT(stream_->connection_error(), IsError(QUIC_INTERNAL_ERROR));
MATCHER_P(IsError,
expected,
quiche::QuicheStrCat(negation ? "isn't equal to " : "is equal to ",
QuicErrorCodeToString(expected))) {
- *result_listener << QuicErrorCodeToString(arg);
+ *result_listener << QuicErrorCodeToString(static_cast<QuicErrorCode>(arg));
return arg == expected;
}
