Skip to content

Commit dccece9

Browse files
committed
fix: use context
1 parent 2e86ed4 commit dccece9

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

u_conn_oscur0.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ func (s *connection) runOscur0() error {
582582
// return l.baseServer.Oscur0Accept(&net.UDPAddr{IP: net.IP{127, 0, 0, 1}, Port: 6667}, srcCID, dstCID)
583583
// }
584584

585-
func (tp *Transport) Oscur0Accept(remoteAddr net.Addr, tlsConf *tls.Config, quicConf *Config, oscur0Conf *Oscur0Config) (quicConn, error) {
585+
func (tp *Transport) Oscur0Accept(ctx context.Context, remoteAddr net.Addr, tlsConf *tls.Config, quicConf *Config, oscur0Conf *Oscur0Config) (quicConn, error) {
586586
SrcConnectionID := ConnectionIDFromBytes(oscur0Conf.ClientConnID)
587587
DestConnectionID := ConnectionIDFromBytes(oscur0Conf.ServerConnID)
588588

@@ -664,7 +664,7 @@ func (tp *Transport) Oscur0Accept(remoteAddr net.Addr, tlsConf *tls.Config, quic
664664
// if origDestConnID.Len() > 0 {
665665
// connID = origDestConnID
666666
// }
667-
tracer = quicConf.Tracer(context.WithValue(context.Background(), ConnectionTracingKey, tracingID), protocol.PerspectiveServer, SrcConnectionID)
667+
tracer = quicConf.Tracer(context.WithValue(ctx, ConnectionTracingKey, tracingID), protocol.PerspectiveServer, SrcConnectionID)
668668
}
669669
logger := utils.DefaultLogger.WithPrefix("server")
670670
if err := validateConfig(quicConf); err != nil {
@@ -684,9 +684,9 @@ func (tp *Transport) Oscur0Accept(remoteAddr net.Addr, tlsConf *tls.Config, quic
684684
tlsConf.MinVersion = tls.VersionTLS13
685685
// setTLSConfigServerName(tlsConf, addr, host)
686686

687-
ctx, cancel := context.WithCancelCause(context.Background())
687+
ctx2, cancel := context.WithCancelCause(ctx)
688688
conn = newConnection(
689-
ctx,
689+
ctx2,
690690
cancel,
691691
newSendConn(tp.conn, remoteAddr, packetInfo{}, logger),
692692
tp.handlerMap,

0 commit comments

Comments
 (0)