mirrors/uquic
1
0
Fork 0
mirror of https://github.com/refraction-networking/uquic.git synced 2025-04-04 04:37:36 +03:00
Code Issues Projects Releases Packages Wiki Activity

rename the SessionTracingKey to ConnectionTracingKey

Browse source
This commit is contained in:
Marten Seemann 2022-03-26 16:00:11 +01:00
parent a088ba4607
commit 9bc32cd021
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
client.go
View file

@ -203,10 +203,10 @@ func dialContext(
} }
c.packetHandlers = packetHandlers c.packetHandlers = packetHandlers
c.tracingID = nextSessionTracingID() c.tracingID = nextConnTracingID()
if c.config.Tracer != nil { if c.config.Tracer != nil {
c.tracer = c.config.Tracer.TracerForConnection( c.tracer = c.config.Tracer.TracerForConnection(
context.WithValue(ctx, SessionTracingKey, c.tracingID), context.WithValue(ctx, ConnectionTracingKey, c.tracingID),
protocol.PerspectiveClient, protocol.PerspectiveClient,
c.destConnID, c.destConnID,
) )

6
interface.go
View file

@ -59,12 +59,12 @@ type TokenStore interface {
// when the server rejects a 0-RTT connection attempt. // when the server rejects a 0-RTT connection attempt.
var Err0RTTRejected = errors.New("0-RTT rejected") var Err0RTTRejected = errors.New("0-RTT rejected")
// SessionTracingKey can be used to associate a ConnectionTracer with a Connection. // ConnectionTracingKey can be used to associate a ConnectionTracer with a Connection.
// It is set on the Connection.Context() context, // It is set on the Connection.Context() context,
// as well as on the context passed to logging.Tracer.NewConnectionTracer. // as well as on the context passed to logging.Tracer.NewConnectionTracer.
var SessionTracingKey = sessionTracingCtxKey{} var ConnectionTracingKey = connTracingCtxKey{}
type sessionTracingCtxKey struct{} type connTracingCtxKey struct{}
// Stream is the interface implemented by QUIC streams // Stream is the interface implemented by QUIC streams
// In addition to the errors listed on the Connection, // In addition to the errors listed on the Connection,

4
server.go
View file

@ -453,7 +453,7 @@ func (s *baseServer) handleInitialImpl(p *receivedPacket, hdr *wire.Header) erro
} }
s.logger.Debugf("Changing connection ID to %s.", connID) s.logger.Debugf("Changing connection ID to %s.", connID)
var conn quicConn var conn quicConn
tracingID := nextSessionTracingID() tracingID := nextConnTracingID()
if added := s.connHandler.AddWithConnID(hdr.DestConnectionID, connID, func() packetHandler { if added := s.connHandler.AddWithConnID(hdr.DestConnectionID, connID, func() packetHandler {
var tracer logging.ConnectionTracer var tracer logging.ConnectionTracer
if s.config.Tracer != nil { if s.config.Tracer != nil {
@ -463,7 +463,7 @@ func (s *baseServer) handleInitialImpl(p *receivedPacket, hdr *wire.Header) erro
connID = origDestConnID connID = origDestConnID
} }
tracer = s.config.Tracer.TracerForConnection( tracer = s.config.Tracer.TracerForConnection(
context.WithValue(context.Background(), SessionTracingKey, tracingID), context.WithValue(context.Background(), ConnectionTracingKey, tracingID),
protocol.PerspectiveServer, protocol.PerspectiveServer,
connID, connID,
) )

8
session.go
View file

@ -127,8 +127,8 @@ func (e *errCloseForRecreating) Error() string {
return "closing session in order to recreate it" return "closing session in order to recreate it"
} }
var sessionTracingID uint64 // to be accessed atomically var connTracingID uint64 // to be accessed atomically
func nextSessionTracingID() uint64 { return atomic.AddUint64(&sessionTracingID, 1) } func nextConnTracingID() uint64 { return atomic.AddUint64(&connTracingID, 1) }
// A Connection is a QUIC session // A Connection is a QUIC session
type session struct { type session struct {
@ -282,7 +282,7 @@ var newSession = func(
s.version, s.version,
) )
s.preSetup() s.preSetup()
s.ctx, s.ctxCancel = context.WithCancel(context.WithValue(context.Background(), SessionTracingKey, tracingID)) s.ctx, s.ctxCancel = context.WithCancel(context.WithValue(context.Background(), ConnectionTracingKey, tracingID))
s.sentPacketHandler, s.receivedPacketHandler = ackhandler.NewAckHandler( s.sentPacketHandler, s.receivedPacketHandler = ackhandler.NewAckHandler(
0, 0,
getMaxPacketSize(s.conn.RemoteAddr()), getMaxPacketSize(s.conn.RemoteAddr()),
@ -409,7 +409,7 @@ var newClientSession = func(
s.version, s.version,
) )
s.preSetup() s.preSetup()
s.ctx, s.ctxCancel = context.WithCancel(context.WithValue(context.Background(), SessionTracingKey, tracingID)) s.ctx, s.ctxCancel = context.WithCancel(context.WithValue(context.Background(), ConnectionTracingKey, tracingID))
s.sentPacketHandler, s.receivedPacketHandler = ackhandler.NewAckHandler( s.sentPacketHandler, s.receivedPacketHandler = ackhandler.NewAckHandler(
initialPacketNumber, initialPacketNumber,
getMaxPacketSize(s.conn.RemoteAddr()), getMaxPacketSize(s.conn.RemoteAddr()),