ginuerzh
9fab332772
The ICMP dialer required explicit keepalive:true to send QUIC PING frames, while the regular QUIC dialer enabled keepalive by default (10s period). Without PING frames, quic-go's 30s idle timeout silently killed connections, causing HTTP+ICMP tunnels to hang after periods of inactivity. Fixes go-gost/gost#352 Also in this commit: - Release session mutex before calling GetConn() in both ICMP and QUIC dialers, so a dead session doesn't block all Dial() calls while OpenStreamSync blocks - Add 30s timeout context to OpenStreamSync to prevent indefinite blocking if the QUIC session dies between liveness check and stream open - Guard session cache deletion with pointer identity check to avoid evicting a newly created session during a race
145 lines
3.0 KiB
Go
145 lines
3.0 KiB
Go
package quic
|
|
|
|
import (
|
|
"context"
|
|
"errors"
|
|
"net"
|
|
"sync"
|
|
|
|
"github.com/go-gost/core/dialer"
|
|
"github.com/go-gost/core/logger"
|
|
md "github.com/go-gost/core/metadata"
|
|
quic_util "github.com/go-gost/x/internal/util/quic"
|
|
"github.com/go-gost/x/registry"
|
|
"github.com/quic-go/quic-go"
|
|
)
|
|
|
|
func init() {
|
|
registry.DialerRegistry().Register("quic", NewDialer)
|
|
}
|
|
|
|
type quicDialer struct {
|
|
sessions map[string]*quicSession
|
|
sessionMutex sync.Mutex
|
|
logger logger.Logger
|
|
md metadata
|
|
options dialer.Options
|
|
}
|
|
|
|
func NewDialer(opts ...dialer.Option) dialer.Dialer {
|
|
options := dialer.Options{}
|
|
for _, opt := range opts {
|
|
opt(&options)
|
|
}
|
|
|
|
return &quicDialer{
|
|
sessions: make(map[string]*quicSession),
|
|
logger: options.Logger,
|
|
options: options,
|
|
}
|
|
}
|
|
|
|
func (d *quicDialer) Init(md md.Metadata) (err error) {
|
|
if err = d.parseMetadata(md); err != nil {
|
|
return
|
|
}
|
|
|
|
return nil
|
|
}
|
|
|
|
func (d *quicDialer) Dial(ctx context.Context, addr string, opts ...dialer.DialOption) (conn net.Conn, err error) {
|
|
if _, _, err := net.SplitHostPort(addr); err != nil {
|
|
addr = net.JoinHostPort(addr, "0")
|
|
}
|
|
|
|
udpAddr, err := net.ResolveUDPAddr("udp", addr)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
d.sessionMutex.Lock()
|
|
|
|
session, ok := d.sessions[addr]
|
|
if session != nil && session.IsClosed() {
|
|
delete(d.sessions, addr) // session is dead
|
|
ok = false
|
|
}
|
|
if !ok {
|
|
options := &dialer.DialOptions{}
|
|
for _, opt := range opts {
|
|
opt(options)
|
|
}
|
|
|
|
c, err := options.Dialer.Dial(ctx, "udp", "")
|
|
if err != nil {
|
|
d.sessionMutex.Unlock()
|
|
return nil, err
|
|
}
|
|
pc, ok := c.(net.PacketConn)
|
|
if !ok {
|
|
c.Close()
|
|
d.sessionMutex.Unlock()
|
|
return nil, errors.New("quic: wrong connection type")
|
|
}
|
|
|
|
if d.md.cipherKey != nil {
|
|
pc = quic_util.CipherPacketConn(pc, d.md.cipherKey)
|
|
}
|
|
|
|
session, err = d.initSession(ctx, udpAddr, pc)
|
|
if err != nil {
|
|
d.logger.Error(err)
|
|
pc.Close()
|
|
d.sessionMutex.Unlock()
|
|
return nil, err
|
|
}
|
|
|
|
d.sessions[addr] = session
|
|
}
|
|
d.sessionMutex.Unlock()
|
|
|
|
conn, err = session.GetConn()
|
|
if err != nil {
|
|
d.sessionMutex.Lock()
|
|
if d.sessions[addr] == session {
|
|
delete(d.sessions, addr)
|
|
}
|
|
session.Close()
|
|
d.sessionMutex.Unlock()
|
|
return nil, err
|
|
}
|
|
|
|
return
|
|
}
|
|
|
|
func (d *quicDialer) initSession(ctx context.Context, addr net.Addr, conn net.PacketConn) (*quicSession, error) {
|
|
quicConfig := &quic.Config{
|
|
KeepAlivePeriod: d.md.keepAlivePeriod,
|
|
HandshakeIdleTimeout: d.md.handshakeTimeout,
|
|
MaxIdleTimeout: d.md.maxIdleTimeout,
|
|
Versions: []quic.Version{
|
|
quic.Version1,
|
|
quic.Version2,
|
|
},
|
|
MaxIncomingStreams: int64(d.md.maxStreams),
|
|
EnableDatagrams: d.md.enableDatagram,
|
|
}
|
|
|
|
tlsCfg := d.options.TLSConfig
|
|
tlsCfg = tlsCfg.Clone()
|
|
if len(tlsCfg.NextProtos) == 0 {
|
|
tlsCfg.NextProtos = []string{"h3", "quic/v1"}
|
|
}
|
|
|
|
session, err := quic.DialEarly(ctx, conn, addr, tlsCfg, quicConfig)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
return &quicSession{session: session}, nil
|
|
}
|
|
|
|
// Multiplex implements dialer.Multiplexer interface.
|
|
func (d *quicDialer) Multiplex() bool {
|
|
return true
|
|
}
|