trafficserver-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From masa...@apache.org
Subject [trafficserver] 02/02: Ignore PROTECTED packet on state_handshake
Date Wed, 28 Mar 2018 05:22:21 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

commit d59e78bb0f093a9d54497fb9228721e72e19bdd7
Author: Masaori Koshiba <masaori@apache.org>
AuthorDate: Wed Mar 28 14:22:03 2018 +0900

    Ignore PROTECTED packet on state_handshake
---
 iocore/net/P_QUICNetVConnection.h |  1 -
 iocore/net/QUICNetVConnection.cc  | 13 ++-----------
 2 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/iocore/net/P_QUICNetVConnection.h b/iocore/net/P_QUICNetVConnection.h
index 4714488..ba4a657 100644
--- a/iocore/net/P_QUICNetVConnection.h
+++ b/iocore/net/P_QUICNetVConnection.h
@@ -297,7 +297,6 @@ private:
   QUICErrorUPtr _state_handshake_process_initial_client_packet(QUICPacketUPtr packet);
   QUICErrorUPtr _state_handshake_process_retry_packet(QUICPacketUPtr packet);
   QUICErrorUPtr _state_handshake_process_client_cleartext_packet(QUICPacketUPtr packet);
-  QUICErrorUPtr _state_handshake_process_protected_packet(QUICPacketUPtr packet);
   QUICErrorUPtr _state_handshake_process_zero_rtt_protected_packet(QUICPacketUPtr packet);
   QUICErrorUPtr _state_connection_established_process_packet(QUICPacketUPtr packet);
   QUICErrorUPtr _state_common_receive_packet();
diff --git a/iocore/net/QUICNetVConnection.cc b/iocore/net/QUICNetVConnection.cc
index a76aca8..97a6690 100644
--- a/iocore/net/QUICNetVConnection.cc
+++ b/iocore/net/QUICNetVConnection.cc
@@ -811,15 +811,12 @@ QUICNetVConnection::_state_handshake_process_packet(QUICPacketUPtr packet)
   case QUICPacketType::HANDSHAKE:
     error = this->_state_handshake_process_client_cleartext_packet(std::move(packet));
     break;
-  case QUICPacketType::PROTECTED:
-    error = this->_state_handshake_process_protected_packet(std::move(packet));
-    break;
   case QUICPacketType::ZERO_RTT_PROTECTED:
     error = this->_state_handshake_process_zero_rtt_protected_packet(std::move(packet));
     break;
-
+  case QUICPacketType::PROTECTED:
   default:
-    QUICConDebug("Unknown packet type: %s(%" PRIu8 ")", QUICDebugNames::packet_type(packet->type()),
packet->type());
+    QUICConDebug("Ignore %s(%" PRIu8 ") packet", QUICDebugNames::packet_type(packet->type()),
packet->type());
 
     error = QUICErrorUPtr(new QUICConnectionError(QUICTransErrorCode::INTERNAL_ERROR));
     break;
@@ -871,12 +868,6 @@ QUICNetVConnection::_state_handshake_process_client_cleartext_packet(QUICPacketU
 }
 
 QUICErrorUPtr
-QUICNetVConnection::_state_handshake_process_protected_packet(QUICPacketUPtr packet)
-{
-  return this->_recv_and_ack(std::move(packet));
-}
-
-QUICErrorUPtr
 QUICNetVConnection::_state_handshake_process_zero_rtt_protected_packet(QUICPacketUPtr packet)
 {
   this->_start_application();

-- 
To stop receiving notification emails like this one, please contact
masaori@apache.org.

Mime
View raw message