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
35 lines
826 B
Go
35 lines
826 B
Go
package quic
|
|
|
|
import (
|
|
"time"
|
|
|
|
mdata "github.com/go-gost/core/metadata"
|
|
mdutil "github.com/go-gost/x/metadata/util"
|
|
)
|
|
|
|
type metadata struct {
|
|
keepAlivePeriod time.Duration
|
|
maxIdleTimeout time.Duration
|
|
handshakeTimeout time.Duration
|
|
}
|
|
|
|
func (d *icmpDialer) parseMetadata(md mdata.Metadata) (err error) {
|
|
const (
|
|
keepAlive = "keepAlive"
|
|
keepAlivePeriod = "ttl"
|
|
handshakeTimeout = "handshakeTimeout"
|
|
maxIdleTimeout = "maxIdleTimeout"
|
|
)
|
|
|
|
if md == nil || !md.IsExists(keepAlive) || mdutil.GetBool(md, keepAlive) {
|
|
d.md.keepAlivePeriod = mdutil.GetDuration(md, keepAlivePeriod)
|
|
if d.md.keepAlivePeriod <= 0 {
|
|
d.md.keepAlivePeriod = 10 * time.Second
|
|
}
|
|
}
|
|
d.md.handshakeTimeout = mdutil.GetDuration(md, handshakeTimeout)
|
|
d.md.maxIdleTimeout = mdutil.GetDuration(md, maxIdleTimeout)
|
|
|
|
return
|
|
}
|