You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ma...@apache.org on 2019/04/08 05:59:39 UTC
[trafficserver] branch quic-latest updated: Fix
test_QUICPacketFactory & test_QUICVersionNegotiator
This is an automated email from the ASF dual-hosted git repository.
masaori pushed a commit to branch quic-latest
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
The following commit(s) were added to refs/heads/quic-latest by this push:
new 2d2b4a3 Fix test_QUICPacketFactory & test_QUICVersionNegotiator
2d2b4a3 is described below
commit 2d2b4a32cbbc53c209cb29b105bd6dd02bf6feb8
Author: Masaori Koshiba <ma...@gmail.com>
AuthorDate: Mon Apr 8 14:58:47 2019 +0900
Fix test_QUICPacketFactory & test_QUICVersionNegotiator
---
iocore/net/quic/test/test_QUICPacketFactory.cc | 9 ++++++++-
iocore/net/quic/test/test_QUICVersionNegotiator.cc | 12 ++++++++++++
2 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/iocore/net/quic/test/test_QUICPacketFactory.cc b/iocore/net/quic/test/test_QUICPacketFactory.cc
index c93870a..ba2c1f0 100644
--- a/iocore/net/quic/test/test_QUICPacketFactory.cc
+++ b/iocore/net/quic/test/test_QUICPacketFactory.cc
@@ -37,8 +37,9 @@ TEST_CASE("QUICPacketFactory_Create_VersionNegotiationPacket", "[quic]")
QUICConnectionId scid(raw_scid, 8);
QUICPacketUPtr vn_packet = factory.create_version_negotiation_packet(scid, dcid);
- CHECK(vn_packet->type() == QUICPacketType::VERSION_NEGOTIATION);
+ REQUIRE(vn_packet != nullptr);
+ CHECK(vn_packet->type() == QUICPacketType::VERSION_NEGOTIATION);
CHECK(vn_packet->destination_cid() == scid);
CHECK(vn_packet->source_cid() == dcid);
CHECK(vn_packet->version() == 0x00);
@@ -75,6 +76,8 @@ TEST_CASE("QUICPacketFactory_Create_Retry", "[quic]")
factory.create_retry_packet(QUICConnectionId(reinterpret_cast<const uint8_t *>("\x01\x02\x03\x04"), 4),
QUICConnectionId(reinterpret_cast<const uint8_t *>("\x11\x12\x13\x14"), 4),
QUICConnectionId(reinterpret_cast<const uint8_t *>("\x04\x03\x02\x01"), 4), token);
+
+ REQUIRE(packet != nullptr);
CHECK(packet->type() == QUICPacketType::RETRY);
CHECK((packet->destination_cid() == QUICConnectionId(reinterpret_cast<const uint8_t *>("\x01\x02\x03\x04"), 4)));
CHECK(memcmp(packet->payload(), raw, sizeof(raw)) == 0);
@@ -85,6 +88,7 @@ TEST_CASE("QUICPacketFactory_Create_Retry", "[quic]")
TEST_CASE("QUICPacketFactory_Create_Handshake", "[quic]")
{
MockQUICPacketProtectionKeyInfo pp_key_info;
+ pp_key_info.set_encryption_key_available(QUICKeyPhase::HANDSHAKE);
QUICPacketFactory factory(pp_key_info);
factory.set_version(0x11223344);
@@ -96,6 +100,7 @@ TEST_CASE("QUICPacketFactory_Create_Handshake", "[quic]")
factory.create_handshake_packet(QUICConnectionId(reinterpret_cast<const uint8_t *>("\x01\x02\x03\x04"), 4),
QUICConnectionId(reinterpret_cast<const uint8_t *>("\x11\x12\x13\x14"), 4), 0,
std::move(payload), sizeof(raw), true, false, true);
+ REQUIRE(packet != nullptr);
CHECK(packet->type() == QUICPacketType::HANDSHAKE);
CHECK((packet->destination_cid() == QUICConnectionId(reinterpret_cast<const uint8_t *>("\x01\x02\x03\x04"), 4)));
CHECK(memcmp(packet->payload(), raw, sizeof(raw)) != 0);
@@ -111,6 +116,8 @@ TEST_CASE("QUICPacketFactory_Create_StatelessResetPacket", "[quic]")
QUICPacketUPtr packet =
factory.create_stateless_reset_packet(QUICConnectionId(reinterpret_cast<const uint8_t *>("\x01\x02\x03\x04"), 4), token);
+
+ REQUIRE(packet != nullptr);
CHECK(packet->type() == QUICPacketType::STATELESS_RESET);
CHECK((packet->destination_cid() == QUICConnectionId(reinterpret_cast<const uint8_t *>("\x01\x02\x03\x04"), 4)));
}
diff --git a/iocore/net/quic/test/test_QUICVersionNegotiator.cc b/iocore/net/quic/test/test_QUICVersionNegotiator.cc
index 174d50c..59d3796 100644
--- a/iocore/net/quic/test/test_QUICVersionNegotiator.cc
+++ b/iocore/net/quic/test/test_QUICVersionNegotiator.cc
@@ -30,6 +30,8 @@
TEST_CASE("QUICVersionNegotiator - Server Side", "[quic]")
{
MockQUICPacketProtectionKeyInfo pp_key_info;
+ pp_key_info.set_encryption_key_available(QUICKeyPhase::INITIAL);
+
QUICPacketFactory packet_factory(pp_key_info);
QUICVersionNegotiator vn;
ats_unique_buf dummy_payload = ats_unique_malloc(128);
@@ -44,6 +46,8 @@ TEST_CASE("QUICVersionNegotiator - Server Side", "[quic]")
packet_factory.set_version(QUIC_SUPPORTED_VERSIONS[0]);
QUICPacketUPtr initial_packet =
packet_factory.create_initial_packet({}, {}, 0, std::move(dummy_payload), dummy_payload_len, true, false, true);
+
+ REQUIRE(initial_packet != nullptr);
vn.negotiate(*initial_packet);
CHECK(vn.status() == QUICVersionNegotiationStatus::NEGOTIATED);
@@ -63,6 +67,8 @@ TEST_CASE("QUICVersionNegotiator - Server Side", "[quic]")
packet_factory.set_version(QUIC_SUPPORTED_VERSIONS[0]);
QUICPacketUPtr initial_packet =
packet_factory.create_initial_packet({}, {}, 0, std::move(dummy_payload), dummy_payload_len, true, false, true);
+
+ REQUIRE(initial_packet != nullptr);
vn.negotiate(*initial_packet);
CHECK(vn.status() == QUICVersionNegotiationStatus::NEGOTIATED);
@@ -82,6 +88,8 @@ TEST_CASE("QUICVersionNegotiator - Server Side", "[quic]")
packet_factory.set_version(QUIC_EXERCISE_VERSION);
QUICPacketUPtr initial_packet =
packet_factory.create_initial_packet({}, {}, 0, std::move(dummy_payload), dummy_payload_len, true, false, true);
+
+ REQUIRE(initial_packet != nullptr);
vn.negotiate(*initial_packet);
CHECK(vn.status() == QUICVersionNegotiationStatus::NOT_NEGOTIATED);
@@ -96,6 +104,8 @@ TEST_CASE("QUICVersionNegotiator - Server Side", "[quic]")
TEST_CASE("QUICVersionNegotiator - Client Side", "[quic]")
{
MockQUICPacketProtectionKeyInfo pp_key_info;
+ pp_key_info.set_encryption_key_available(QUICKeyPhase::INITIAL);
+
QUICPacketFactory packet_factory(pp_key_info);
QUICVersionNegotiator vn;
ats_unique_buf dummy_payload = ats_unique_malloc(128);
@@ -126,10 +136,12 @@ TEST_CASE("QUICVersionNegotiator - Client Side", "[quic]")
packet_factory.set_version(QUIC_EXERCISE_VERSION);
QUICPacketUPtr initial_packet =
packet_factory.create_initial_packet({}, {}, 0, std::move(dummy_payload), dummy_payload_len, true, false, true);
+ REQUIRE(initial_packet != nullptr);
// Server send VN packet based on Initial packet
QUICPacketUPtr vn_packet =
packet_factory.create_version_negotiation_packet(initial_packet->source_cid(), initial_packet->destination_cid());
+ REQUIRE(vn_packet != nullptr);
// Negotiate version
vn.negotiate(*vn_packet);