[trafficserver] branch quic-latest updated: QUIC: clean the inactive timeout in closing and draining state

[sc...@apache.org]

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

scw00 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 29cb752  QUIC: clean the inactive timeout in closing and draining state
29cb752 is described below

commit 29cb75274ebb23ed37d1c370c70a9468a6231e24
Author: scw00 <sc...@apache.org>
AuthorDate: Fri Feb 23 13:40:18 2018 +0800

    QUIC: clean the inactive timeout in closing and draining state
---
 iocore/net/QUICNetVConnection.cc | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/iocore/net/QUICNetVConnection.cc b/iocore/net/QUICNetVConnection.cc
index 708a3e0..50f4dc2 100644
--- a/iocore/net/QUICNetVConnection.cc
+++ b/iocore/net/QUICNetVConnection.cc
@@ -522,6 +522,7 @@ QUICNetVConnection::state_handshake(int event, Event *data)
   switch (event) {
   case QUIC_EVENT_PACKET_READ_READY: {
     QUICPacketCreationResult result;
+    net_activity(this, this_ethread());
     do {
       QUICPacketUPtr packet = this->_dequeue_recv_packet(result);
       if (result == QUICPacketCreationResult::NOT_READY) {
@@ -828,6 +829,7 @@ QUICNetVConnection::_state_common_receive_packet()
   QUICPacketCreationResult result;
 
   // Receive a QUIC packet
+  net_activity(this, this_ethread());
   do {
     QUICPacketUPtr p = this->_dequeue_recv_packet(result);
     if (result == QUICPacketCreationResult::FAILED) {
@@ -838,8 +840,6 @@ QUICNetVConnection::_state_common_receive_packet()
       continue;
     }
 
-    net_activity(this, this_ethread());
-
     // Check connection migration
     if (this->_handshake_handler->is_completed() && p->connection_id() != this->_quic_connection_id) {
       for (unsigned int i = 0; i < countof(this->_alt_quic_connection_ids); ++i) {
@@ -1182,8 +1182,6 @@ QUICNetVConnection::_dequeue_recv_packet(QUICPacketCreationResult &result)
     }
   }
 
-  net_activity(this, this_ethread());
-
   // Create a QUIC packet
   ats_unique_buf pkt = ats_unique_malloc(udp_packet->getPktLength());
   IOBufferBlock *b   = udp_packet->getIOBlockChain();

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