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 2018/04/04 06:21:29 UTC
[trafficserver] 02/04: Remove version args from
create_initial_packet
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
commit b778c96d2cf62791168f9ac885761e79e380c090
Author: Masaori Koshiba <ma...@apache.org>
AuthorDate: Wed Apr 4 14:58:13 2018 +0900
Remove version args from create_initial_packet
To use PacketFactory's _version like other create_X_packet functions
---
iocore/net/QUICNetVConnection.cc | 2 +-
iocore/net/quic/QUICPacket.cc | 4 ++--
iocore/net/quic/QUICPacket.h | 4 ++--
iocore/net/quic/test/test_QUICVersionNegotiator.cc | 11 ++++++-----
4 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/iocore/net/QUICNetVConnection.cc b/iocore/net/QUICNetVConnection.cc
index cac33f3..a22a7b1 100644
--- a/iocore/net/QUICNetVConnection.cc
+++ b/iocore/net/QUICNetVConnection.cc
@@ -1228,7 +1228,7 @@ QUICNetVConnection::_build_packet(ats_unique_buf buf, size_t len, bool retransmi
case QUICPacketType::INITIAL:
ink_assert(this->get_context() == NET_VCONNECTION_OUT);
packet = this->_packet_factory.create_initial_packet(this->_original_quic_connection_id, this->largest_acked_packet_number(),
- QUIC_SUPPORTED_VERSIONS[0], std::move(buf), len);
+ std::move(buf), len);
this->_handshake_handler->handleEvent(QUIC_EVENT_HANDSHAKE_PACKET_WRITE_COMPLETE, nullptr);
break;
diff --git a/iocore/net/quic/QUICPacket.cc b/iocore/net/quic/QUICPacket.cc
index a195f20..61e19ba 100644
--- a/iocore/net/quic/QUICPacket.cc
+++ b/iocore/net/quic/QUICPacket.cc
@@ -800,12 +800,12 @@ QUICPacketFactory::create_version_negotiation_packet(const QUICPacket *packet_se
}
QUICPacketUPtr
-QUICPacketFactory::create_initial_packet(QUICConnectionId connection_id, QUICPacketNumber base_packet_number, QUICVersion version,
+QUICPacketFactory::create_initial_packet(QUICConnectionId connection_id, QUICPacketNumber base_packet_number,
ats_unique_buf payload, size_t len)
{
QUICPacketHeaderUPtr header =
QUICPacketHeader::build(QUICPacketType::INITIAL, connection_id, this->_packet_number_generator.next(), base_packet_number,
- version, std::move(payload), len);
+ this->_version, std::move(payload), len);
return this->_create_encrypted_packet(std::move(header), true);
}
diff --git a/iocore/net/quic/QUICPacket.h b/iocore/net/quic/QUICPacket.h
index 1bc3229..6a87d1e 100644
--- a/iocore/net/quic/QUICPacket.h
+++ b/iocore/net/quic/QUICPacket.h
@@ -340,8 +340,8 @@ public:
QUICPacketUPtr create(ats_unique_buf buf, size_t len, QUICPacketNumber base_packet_number, QUICPacketCreationResult &result);
QUICPacketUPtr create_version_negotiation_packet(const QUICPacket *packet_sent_by_client);
- QUICPacketUPtr create_initial_packet(QUICConnectionId connection_id, QUICPacketNumber base_packet_number, QUICVersion version,
- ats_unique_buf payload, size_t len);
+ QUICPacketUPtr create_initial_packet(QUICConnectionId connection_id, QUICPacketNumber base_packet_number, ats_unique_buf payload,
+ size_t len);
QUICPacketUPtr create_retry_packet(QUICConnectionId connection_id, QUICPacketNumber packet_number, ats_unique_buf payload,
size_t len, bool retransmittable);
QUICPacketUPtr create_handshake_packet(QUICConnectionId connection_id, QUICPacketNumber base_packet_number,
diff --git a/iocore/net/quic/test/test_QUICVersionNegotiator.cc b/iocore/net/quic/test/test_QUICVersionNegotiator.cc
index ea6d87b..be32502 100644
--- a/iocore/net/quic/test/test_QUICVersionNegotiator.cc
+++ b/iocore/net/quic/test/test_QUICVersionNegotiator.cc
@@ -39,8 +39,8 @@ TEST_CASE("QUICVersionNegotiator", "[quic]")
CHECK(vn.status() == QUICVersionNegotiationStatus::NOT_NEGOTIATED);
// Negotiate version
- QUICPacketUPtr initial_packet =
- packet_factory.create_initial_packet({}, 0, QUIC_SUPPORTED_VERSIONS[0], ats_unique_malloc(0), 0);
+ packet_factory.set_version(QUIC_SUPPORTED_VERSIONS[0]);
+ QUICPacketUPtr initial_packet = packet_factory.create_initial_packet({}, 0, ats_unique_malloc(0), 0);
vn.negotiate(initial_packet.get());
CHECK(vn.status() == QUICVersionNegotiationStatus::NEGOTIATED);
@@ -57,8 +57,8 @@ TEST_CASE("QUICVersionNegotiator", "[quic]")
CHECK(vn.status() == QUICVersionNegotiationStatus::NOT_NEGOTIATED);
// Negotiate version
- QUICPacketUPtr initial_packet =
- packet_factory.create_initial_packet({}, 0, QUIC_SUPPORTED_VERSIONS[0], ats_unique_malloc(0), 0);
+ packet_factory.set_version(QUIC_SUPPORTED_VERSIONS[0]);
+ QUICPacketUPtr initial_packet = packet_factory.create_initial_packet({}, 0, ats_unique_malloc(0), 0);
vn.negotiate(initial_packet.get());
CHECK(vn.status() == QUICVersionNegotiationStatus::NEGOTIATED);
@@ -75,7 +75,8 @@ TEST_CASE("QUICVersionNegotiator", "[quic]")
CHECK(vn.status() == QUICVersionNegotiationStatus::NOT_NEGOTIATED);
// Negotiate version
- QUICPacketUPtr initial_packet = packet_factory.create_initial_packet({}, 0, 0xbabababa, ats_unique_malloc(0), 0);
+ packet_factory.set_version(0xbabababa);
+ QUICPacketUPtr initial_packet = packet_factory.create_initial_packet({}, 0, ats_unique_malloc(0), 0);
vn.negotiate(initial_packet.get());
CHECK(vn.status() == QUICVersionNegotiationStatus::NOT_NEGOTIATED);
--
To stop receiving notification emails like this one, please contact
masaori@apache.org.