You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficserver.apache.org by ma...@apache.org on 2018/01/22 14:53:42 UTC
[trafficserver] branch quic-latest updated (77badcf -> 5a36386)
This is an automated email from the ASF dual-hosted git repository.
maskit pushed a change to branch quic-latest
in repository https://gitbox.apache.org/repos/asf/trafficserver.git.
from 77badcf Fix a bug that retransmission timer wasn't reset correctly
new 163e3a7 Add QUIC CID to HQ logs
new 7581260 Add QUIC CID to quic_app logs
new 5a36386 Print server generated CID on LossDetecotr logs
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
iocore/net/quic/QUICApplication.cc | 2 +-
iocore/net/quic/QUICApplication.h | 2 +-
iocore/net/quic/QUICLossDetector.cc | 2 +-
proxy/hq/HQClientTransaction.cc | 5 ++---
proxy/hq/HQSessionAccept.cc | 3 ++-
proxy/hq/QUICSimpleApp.cc | 4 ++--
6 files changed, 9 insertions(+), 9 deletions(-)
--
To stop receiving notification emails like this one, please contact
maskit@apache.org.
[trafficserver] 01/03: Add QUIC CID to HQ logs
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
maskit pushed a commit to branch quic-latest
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 163e3a7d518bd0e71d4010636d1ec7f492b13b94
Author: Masakazu Kitajo <ma...@apache.org>
AuthorDate: Tue Jan 23 01:21:56 2018 +1100
Add QUIC CID to HQ logs
---
proxy/hq/HQClientTransaction.cc | 5 ++---
proxy/hq/HQSessionAccept.cc | 3 ++-
proxy/hq/QUICSimpleApp.cc | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/proxy/hq/HQClientTransaction.cc b/proxy/hq/HQClientTransaction.cc
index 83b88f1..52ebffe 100644
--- a/proxy/hq/HQClientTransaction.cc
+++ b/proxy/hq/HQClientTransaction.cc
@@ -28,9 +28,8 @@
#include "HQClientSession.h"
#include "HttpSM.h"
-// XXX this->parent->connection_id() is Session ID of HQClientSession. Should this be QUIC Connection ID?
#define HQTransDebug(fmt, ...) \
- Debug("hq_trans", "[%" PRId64 "] [%" PRIx32 "] " fmt, this->parent->connection_id(), this->get_transaction_id(), ##__VA_ARGS__)
+ Debug("hq_trans", "[%" PRIx64 "] [%" PRIx32 "] " fmt, static_cast<uint64_t>(static_cast<QUICConnection *>(reinterpret_cast<QUICNetVConnection*>(this->parent->get_netvc()))->connection_id()), this->get_transaction_id(), ##__VA_ARGS__)
// static void
// dump_io_buffer(IOBufferReader *reader)
@@ -126,7 +125,7 @@ HQClientTransaction::state_stream_open(int event, void *edata)
break;
}
default:
- Debug("hq_trans", "Unknown event %d", event);
+ HQTransDebug("Unknown event %d", event);
ink_assert(false);
}
diff --git a/proxy/hq/HQSessionAccept.cc b/proxy/hq/HQSessionAccept.cc
index a053398..ce1aa6a 100644
--- a/proxy/hq/HQSessionAccept.cc
+++ b/proxy/hq/HQSessionAccept.cc
@@ -52,7 +52,8 @@ HQSessionAccept::accept(NetVConnection *netvc, MIOBuffer *iobuf, IOBufferReader
if (is_debug_tag_set("quic_seq")) {
ip_port_text_buffer ipb;
- Debug("quic_seq", "[HQSessionAccept:mainEvent %p] accepted connection from %s transport type = %d", netvc,
+ Debug("quic_seq", "[%" PRIx64 "] accepted connection from %s transport type = %d",
+ static_cast<uint64_t>(static_cast<QUICConnection*>(static_cast<QUICNetVConnection*>(netvc))->connection_id()),
ats_ip_nptop(client_ip, ipb, sizeof(ipb)), netvc->attributes);
}
diff --git a/proxy/hq/QUICSimpleApp.cc b/proxy/hq/QUICSimpleApp.cc
index 3002e76..054075d 100644
--- a/proxy/hq/QUICSimpleApp.cc
+++ b/proxy/hq/QUICSimpleApp.cc
@@ -55,13 +55,13 @@ QUICSimpleApp::~QUICSimpleApp()
int
QUICSimpleApp::main_event_handler(int event, Event *data)
{
- Debug(tag, "%s (%d)", get_vc_event_name(event), event);
+ Debug(tag, "[%" PRIx64 "] %s (%d)", static_cast<uint64_t>(this->_client_qc->connection_id()), get_vc_event_name(event), event);
VIO *vio = reinterpret_cast<VIO *>(data);
QUICStreamIO *stream_io = this->_find_stream_io(vio);
if (stream_io == nullptr) {
- Debug(tag, "Unknown Stream");
+ Debug(tag, "[%" PRIx64 "] Unknown Stream", static_cast<uint64_t>(this->_client_qc->connection_id()));
return -1;
}
--
To stop receiving notification emails like this one, please contact
maskit@apache.org.
[trafficserver] 03/03: Print server generated CID on LossDetecotr
logs
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
maskit pushed a commit to branch quic-latest
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 5a363861f812bfa4b2a0ed3775a011d2334739ca
Author: Masakazu Kitajo <ma...@apache.org>
AuthorDate: Tue Jan 23 01:52:30 2018 +1100
Print server generated CID on LossDetecotr logs
---
iocore/net/quic/QUICLossDetector.cc | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/iocore/net/quic/QUICLossDetector.cc b/iocore/net/quic/QUICLossDetector.cc
index 74db01f..867408c 100644
--- a/iocore/net/quic/QUICLossDetector.cc
+++ b/iocore/net/quic/QUICLossDetector.cc
@@ -118,7 +118,7 @@ QUICLossDetector::largest_acked_packet_number()
void
QUICLossDetector::on_packet_sent(QUICPacketUPtr packet)
{
- if (this->_connection_id == 0) {
+ if (this->_connection_id == 0 && packet->type() != QUICPacketType::VERSION_NEGOTIATION) {
this->_connection_id = packet->connection_id();
}
--
To stop receiving notification emails like this one, please contact
maskit@apache.org.
[trafficserver] 02/03: Add QUIC CID to quic_app logs
Posted by ma...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
maskit pushed a commit to branch quic-latest
in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 75812607fa50f5b165159cc0f9662e65d52a0311
Author: Masakazu Kitajo <ma...@apache.org>
AuthorDate: Tue Jan 23 01:51:56 2018 +1100
Add QUIC CID to quic_app logs
---
iocore/net/quic/QUICApplication.cc | 2 +-
iocore/net/quic/QUICApplication.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/iocore/net/quic/QUICApplication.cc b/iocore/net/quic/QUICApplication.cc
index b0ab67e..2bc9775 100644
--- a/iocore/net/quic/QUICApplication.cc
+++ b/iocore/net/quic/QUICApplication.cc
@@ -156,7 +156,7 @@ QUICApplication::reenable(QUICStream *stream)
stream_io->read_reenable();
stream_io->write_reenable();
} else {
- Debug(tag, "Unknown Stream, id: %" PRIx64, stream->id());
+ Debug(tag, "[%" PRIx64 "] Unknown Stream, id: %" PRIx64, static_cast<uint64_t>(this->_client_qc->connection_id()), stream->id());
}
return;
diff --git a/iocore/net/quic/QUICApplication.h b/iocore/net/quic/QUICApplication.h
index f2a47e1..cbffb95 100644
--- a/iocore/net/quic/QUICApplication.h
+++ b/iocore/net/quic/QUICApplication.h
@@ -26,9 +26,9 @@
#include "../../eventsystem/I_EventSystem.h"
#include "../../eventsystem/I_IOBuffer.h"
#include "QUICTypes.h"
+#include "QUICConnection.h"
#include "QUICStream.h"
-class QUICConnection;
class QUICApplication;
/**
--
To stop receiving notification emails like this one, please contact
maskit@apache.org.