Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 491f354

Browse files
neildneild
committed
quic: log packets and frames
For golang/go#58547 Change-Id: I601f1e74417c0de206f71da58cef5938bba6e860 Reviewed-on: https://go-review.googlesource.com/c/net/+/543084 Reviewed-by: Jonathan Amsterdam <[email protected]> LUCI-TryBot-Result: Go LUCI <[email protected]>
1 parent f812076 commit 491f354

File tree

9 files changed

+616
-52
lines changed

9 files changed

+616
-52
lines changed

‎internal/quic/conn_recv.go‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,9 @@ func (c *Conn) handleLongHeader(now time.Time, ptype packetType, space numberSpa
101101
if logPackets {
102102
logInboundLongPacket(c, p)
103103
}
104+
if c.logEnabled(QLogLevelPacket) {
105+
c.logLongPacketReceived(p, buf[:n])
106+
}
104107
c.connIDState.handlePacket(c, p.ptype, p.srcConnID)
105108
ackEliciting := c.handleFrames(now, ptype, space, p.payload)
106109
c.acks[space].receive(now, space, p.num, ackEliciting)
@@ -149,6 +152,9 @@ func (c *Conn) handle1RTT(now time.Time, buf []byte) int {
149152
if logPackets {
150153
logInboundShortPacket(c, p)
151154
}
155+
if c.logEnabled(QLogLevelPacket) {
156+
c.log1RTTPacketReceived(p, buf)
157+
}
152158
ackEliciting := c.handleFrames(now, packetType1RTT, appDataSpace, p.payload)
153159
c.acks[appDataSpace].receive(now, appDataSpace, p.num, ackEliciting)
154160
return len(buf)

‎internal/quic/conn_send.go‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,9 @@ func (c *Conn) maybeSend(now time.Time) (next time.Time) {
7575
if logPackets {
7676
logSentPacket(c, packetTypeInitial, pnum, p.srcConnID, p.dstConnID, c.w.payload())
7777
}
78+
if c.logEnabled(QLogLevelPacket) && len(c.w.payload()) > 0 {
79+
c.logPacketSent(packetTypeInitial, pnum, p.srcConnID, p.dstConnID, c.w.payload())
80+
}
7881
sentInitial = c.w.finishProtectedLongHeaderPacket(pnumMaxAcked, c.keysInitial.w, p)
7982
if sentInitial != nil {
8083
c.idleHandlePacketSent(now, sentInitial)
@@ -104,6 +107,9 @@ func (c *Conn) maybeSend(now time.Time) (next time.Time) {
104107
if logPackets {
105108
logSentPacket(c, packetTypeHandshake, pnum, p.srcConnID, p.dstConnID, c.w.payload())
106109
}
110+
if c.logEnabled(QLogLevelPacket) && len(c.w.payload()) > 0 {
111+
c.logPacketSent(packetTypeHandshake, pnum, p.srcConnID, p.dstConnID, c.w.payload())
112+
}
107113
if sent := c.w.finishProtectedLongHeaderPacket(pnumMaxAcked, c.keysHandshake.w, p); sent != nil {
108114
c.idleHandlePacketSent(now, sent)
109115
c.loss.packetSent(now, handshakeSpace, sent)
@@ -132,6 +138,9 @@ func (c *Conn) maybeSend(now time.Time) (next time.Time) {
132138
if logPackets {
133139
logSentPacket(c, packetType1RTT, pnum, nil, dstConnID, c.w.payload())
134140
}
141+
if c.logEnabled(QLogLevelPacket) && len(c.w.payload()) > 0 {
142+
c.logPacketSent(packetType1RTT, pnum, nil, dstConnID, c.w.payload())
143+
}
135144
if sent := c.w.finish1RTTPacket(pnum, pnumMaxAcked, dstConnID, &c.keysAppData); sent != nil {
136145
c.idleHandlePacketSent(now, sent)
137146
c.loss.packetSent(now, appDataSpace, sent)

0 commit comments

Comments
 (0)