gr1ffon/quic-go
1
0
Fork 0
forked from quic-go/quic-go
Code Pull Requests Activity

Merge pull request #2437 from lucas-clemente/qlog-callback-conn-id

Browse Source 
pass the same connection ID to GetLogWriter for client and server
This commit is contained in:
Marten Seemann
2020-03-26 17:44:06 +07:00
committed by GitHub
parent 5dfe08d4a7 b749357ece
commit 3ea4a66d63
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server.go
View File

@@ -423,8 +423,13 @@ func (s *baseServer) createNewSession(
) quicSession { ) quicSession {
var qlogger qlog.Tracer var qlogger qlog.Tracer
if s.config.GetLogWriter != nil { if s.config.GetLogWriter != nil {
if w := s.config.GetLogWriter(origDestConnID); w != nil { // Use the same connection ID that is passed to the client's GetLogWriter callback.
qlogger = qlog.NewTracer(w, protocol.PerspectiveServer, origDestConnID) connID := clientDestConnID
if origDestConnID.Len() > 0 {
connID = origDestConnID
}
if w := s.config.GetLogWriter(connID); w != nil {
qlogger = qlog.NewTracer(w, protocol.PerspectiveServer, connID)
} }
} }
if qlogger != nil { if qlogger != nil {