[trafficserver] branch quic-latest updated: Stop increasing nbytes on write

[ma...@apache.org]

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 fd308e0  Stop increasing nbytes on write
fd308e0 is described below

commit fd308e09a529500daada004efaffc5bd94f710e4
Author: Masaori Koshiba <ma...@apache.org>
AuthorDate: Tue Dec 12 11:35:16 2017 +0900

    Stop increasing nbytes on write
---
 iocore/net/quic/QUICApplication.cc | 11 +++--------
 iocore/net/quic/QUICHandshake.cc   |  3 ++-
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/iocore/net/quic/QUICApplication.cc b/iocore/net/quic/QUICApplication.cc
index b5b191d..83559e6 100644
--- a/iocore/net/quic/QUICApplication.cc
+++ b/iocore/net/quic/QUICApplication.cc
@@ -66,10 +66,7 @@ QUICStreamIO::write(const uint8_t *buf, int64_t len)
 {
   SCOPED_MUTEX_LOCK(lock, this->_write_vio->mutex, this_ethread());
 
-  int64_t bytes_add = this->_write_buffer->write(buf, len);
-  this->_write_vio->nbytes += bytes_add;
-
-  return bytes_add;
+  return this->_write_buffer->write(buf, len);
 }
 
 int64_t
@@ -82,10 +79,8 @@ QUICStreamIO::write(IOBufferReader *r, int64_t alen, int64_t offset)
         this->_write_vio->ndone, bytes_avail, alen);
 
   if (bytes_avail > 0) {
-    int64_t len         = std::min(bytes_avail, alen);
-    int64_t bytes_added = this->_write_buffer->write(r, len, offset);
-
-    return bytes_added;
+    int64_t len = std::min(bytes_avail, alen);
+    return this->_write_buffer->write(r, len, offset);
   } else {
     return 0;
   }
diff --git a/iocore/net/quic/QUICHandshake.cc b/iocore/net/quic/QUICHandshake.cc
index 4cb34b3..5c262c8 100644
--- a/iocore/net/quic/QUICHandshake.cc
+++ b/iocore/net/quic/QUICHandshake.cc
@@ -29,6 +29,7 @@
 #include "QUICVersionNegotiator.h"
 #include "QUICConfig.h"
 #include "P_SSLNextProtocolSet.h"
+#include "P_VConnection.h"
 
 static constexpr char dump_tag[] = "v_quic_handshake_dump_pkt";
 
@@ -271,7 +272,7 @@ QUICHandshake::state_address_validation(int event, void *data)
 int
 QUICHandshake::state_complete(int event, void *data)
 {
-  QUICHSDebug("event: %d", event);
+  QUICHSDebug("%s", get_vc_event_name(event));
   QUICHSDebug("Got an event on complete state. Ignoring it for now.");
 
   return EVENT_CONT;

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