lzhr/v2fly
1
0
Fork 0
mirror of https://github.com/v2fly/v2ray-core.git synced 2025-07-26 11:44:22 -04:00
Code Issues Releases Wiki Activity

fix: make sure the ctx is propagated to connections

Browse Source
This commit is contained in:
Shelikhoo 2021-04-28 15:43:43 +01:00
parent 582e9038c5
commit 2e26cf6587
No known key found for this signature in database
GPG Key ID: C4D5E79D22B25316
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/dns/nameserver_quic.go
View File

@ -330,7 +330,7 @@ func isActive(s quic.Session) bool {
} }
} }
func (s *QUICNameServer) getSession() (quic.Session, error) { func (s *QUICNameServer) getSession(ctx context.Context) (quic.Session, error) {
var session quic.Session var session quic.Session
s.RLock() s.RLock()
session = s.session session = s.session
@ -348,14 +348,14 @@ func (s *QUICNameServer) getSession() (quic.Session, error) {
defer s.Unlock() defer s.Unlock()
var err error var err error
session, err = s.openSession() session, err = s.openSession(ctx)
if err != nil { if err != nil {
// This does not look too nice, but QUIC (or maybe quic-go) // This does not look too nice, but QUIC (or maybe quic-go)
// doesn't seem stable enough. // doesn't seem stable enough.
// Maybe retransmissions aren't fully implemented in quic-go? // Maybe retransmissions aren't fully implemented in quic-go?
// Anyways, the simple solution is to make a second try when // Anyways, the simple solution is to make a second try when
// it fails to open the QUIC session. // it fails to open the QUIC session.
session, err = s.openSession() session, err = s.openSession(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -364,13 +364,13 @@ func (s *QUICNameServer) getSession() (quic.Session, error) {
return session, nil return session, nil
} }
func (s *QUICNameServer) openSession() (quic.Session, error) { func (s *QUICNameServer) openSession(ctx context.Context) (quic.Session, error) {
tlsConfig := tls.Config{} tlsConfig := tls.Config{}
quicConfig := &quic.Config{ quicConfig := &quic.Config{
HandshakeIdleTimeout: handshakeIdleTimeout, HandshakeIdleTimeout: handshakeIdleTimeout,
} }
session, err := quic.DialAddrContext(context.Background(), s.destination.NetAddr(), tlsConfig.GetTLSConfig(tls.WithNextProto("http/1.1", http2.NextProtoTLS, NextProtoDQ)), quicConfig) session, err := quic.DialAddrContext(ctx, s.destination.NetAddr(), tlsConfig.GetTLSConfig(tls.WithNextProto("http/1.1", http2.NextProtoTLS, NextProtoDQ)), quicConfig)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -379,7 +379,7 @@ func (s *QUICNameServer) openSession() (quic.Session, error) {
} }
func (s *QUICNameServer) openStream(ctx context.Context) (quic.Stream, error) { func (s *QUICNameServer) openStream(ctx context.Context) (quic.Stream, error) {
session, err := s.getSession() session, err := s.getSession(ctx)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
app/dns/nameserver_udp.go
View File

@ -192,7 +192,7 @@ func (s *ClassicNameServer) sendQuery(ctx context.Context, domain string, client
for _, req := range reqs { for _, req := range reqs {
s.addPendingRequest(req) s.addPendingRequest(req)
b, _ := dns.PackMessage(req.msg) b, _ := dns.PackMessage(req.msg)
udpCtx := context.Background() udpCtx := ctx
if inbound := session.InboundFromContext(ctx); inbound != nil { if inbound := session.InboundFromContext(ctx); inbound != nil {
udpCtx = session.ContextWithInbound(udpCtx, inbound) udpCtx = session.ContextWithInbound(udpCtx, inbound)
} }