From b749357ece571526dfe873ffb371b99eb911c67e Mon Sep 17 00:00:00 2001 From: Marten Seemann Date: Wed, 25 Mar 2020 18:21:28 +0700 Subject: [PATCH] pass the same connection ID to GetLogWriter for client and server --- server.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/server.go b/server.go index f8808d8c3..c54e94b47 100644 --- a/server.go +++ b/server.go @@ -423,8 +423,13 @@ func (s *baseServer) createNewSession( ) quicSession { var qlogger qlog.Tracer if s.config.GetLogWriter != nil { - if w := s.config.GetLogWriter(origDestConnID); w != nil { - qlogger = qlog.NewTracer(w, protocol.PerspectiveServer, origDestConnID) + // Use the same connection ID that is passed to the client's GetLogWriter callback. + 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 {