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

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

View File

@@ -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 {