trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From masa...@apache.org
Subject [trafficserver] branch quic-latest updated: Stop Version Negotiation Packet retransmission
Date Fri, 13 Oct 2017 03:04:42 GMT
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 e72cfd9  Stop Version Negotiation Packet retransmission
e72cfd9 is described below

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

    Stop Version Negotiation Packet retransmission
---
 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 b9d3c10..41bb3fc 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" <commits@trafficserver.apache.org>'].

Mime
View raw message