[trafficserver] 01/03: Stop Version Negotiation Packet retransmission

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

maskit pushed a commit to branch quic-05
in repository https://gitbox.apache.org/repos/asf/trafficserver.git

commit 0ae9f8bab6a3719cc2f607f2f030feb6bbfe941f
Author: Masaori Koshiba <ma...@apache.org>
AuthorDate: Fri Oct 13 12:02:30 2017 +0900

    Stop Version Negotiation Packet retransmission
    
    (cherry picked from commit e72cfd9c10b940971ff2643d46417ab4098656fa)
---
 iocore/net/QUICNetVConnection.cc    | 2 ++
 iocore/net/quic/QUICLossDetector.cc | 5 +++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/iocore/net/QUICNetVConnection.cc b/iocore/net/QUICNetVConnection.cc
index a941336..4229c56 100644
--- a/iocore/net/QUICNetVConnection.cc
+++ b/iocore/net/QUICNetVConnection.cc
@@ -228,6 +228,8 @@ QUICNetVConnection::transmit_packet(QUICPacketUPtr packet)
 void
 QUICNetVConnection::retransmit_packet(const QUICPacket &packet)
 {
+  ink_assert(packet.type() != QUICPacketType::VERSION_NEGOTIATION && packet.type() != QUICPacketType::UNINITIALIZED);
+
   uint16_t size          = packet.payload_size();
   const uint8_t *payload = packet.payload();
 
diff --git a/iocore/net/quic/QUICLossDetector.cc b/iocore/net/quic/QUICLossDetector.cc
index 82d3ab9..1103aff 100644
--- a/iocore/net/quic/QUICLossDetector.cc
+++ b/iocore/net/quic/QUICLossDetector.cc
@@ -145,8 +145,9 @@ QUICLossDetector::on_packet_sent(QUICPacketUPtr packet)
 
   bool is_handshake   = false;
   QUICPacketType type = packet->type();
-  if (type != QUICPacketType::ZERO_RTT_PROTECTED && type != QUICPacketType::ONE_RTT_PROTECTED_KEY_PHASE_0 &&
-      type != QUICPacketType::ONE_RTT_PROTECTED_KEY_PHASE_1) {
+  // XXX: Should QUICPacketType::SERVER_STATELESS_RETRY be included?
+  if (type == QUICPacketType::CLIENT_INITIAL || type == QUICPacketType::SERVER_CLEARTEXT ||
+      type == QUICPacketType::CLIENT_CLEARTEXT) {
     is_handshake = true;
   }
 

-- 
To stop receiving notification emails like this one, please contact
"commits@trafficserver.apache.org" <co...@trafficserver.apache.org>.