From da0cd68115264186e69d766b53208d7239d1f82a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Mon, 1 Jun 2026 17:51:02 +0800 Subject: [PATCH] Fix ping timeout --- constant/timeout.go | 1 + protocol/tailscale/endpoint.go | 6 ++++-- protocol/tun/inbound.go | 1 + protocol/wireguard/endpoint.go | 13 +++++++------ transport/wireguard/device.go | 1 + transport/wireguard/device_stack.go | 2 +- transport/wireguard/device_system_stack.go | 2 +- transport/wireguard/endpoint.go | 1 + transport/wireguard/endpoint_options.go | 1 + 9 files changed, 18 insertions(+), 10 deletions(-) diff --git a/constant/timeout.go b/constant/timeout.go index e1bc7ccd..dd2e94d8 100644 --- a/constant/timeout.go +++ b/constant/timeout.go @@ -10,6 +10,7 @@ const ( ReadPayloadTimeout = 300 * time.Millisecond DNSTimeout = 10 * time.Second UDPTimeout = 5 * time.Minute + ICMPTimeout = 10 * time.Second DefaultURLTestInterval = 3 * time.Minute DefaultURLTestIdleTimeout = 30 * time.Minute StartTimeout = 10 * time.Second diff --git a/protocol/tailscale/endpoint.go b/protocol/tailscale/endpoint.go index 6120ccec..2ee4416c 100644 --- a/protocol/tailscale/endpoint.go +++ b/protocol/tailscale/endpoint.go @@ -106,7 +106,8 @@ type Endpoint struct { relayServerPort *uint16 relayServerStaticEndpoints []netip.AddrPort - udpTimeout time.Duration + udpTimeout time.Duration + icmpTimeout time.Duration systemInterface bool systemInterfaceName string @@ -258,6 +259,7 @@ func NewEndpoint(ctx context.Context, router adapter.Router, logger log.ContextL relayServerPort: options.RelayServerPort, relayServerStaticEndpoints: options.RelayServerStaticEndpoints, udpTimeout: udpTimeout, + icmpTimeout: C.ICMPTimeout, systemInterface: options.SystemInterface, systemInterfaceName: options.SystemInterfaceName, systemInterfaceMTU: options.SystemInterfaceMTU, @@ -390,7 +392,7 @@ func (t *Endpoint) postStart() error { if gErr != nil { return gonet.TranslateNetstackError(gErr) } - icmpForwarder := tun.NewICMPForwarder(t.ctx, ipStack, t, t.udpTimeout) + icmpForwarder := tun.NewICMPForwarder(t.ctx, ipStack, t, t.icmpTimeout) ipStack.SetTransportProtocolHandler(icmp.ProtocolNumber4, icmpForwarder.HandlePacket) ipStack.SetTransportProtocolHandler(icmp.ProtocolNumber6, icmpForwarder.HandlePacket) t.stack = ipStack diff --git a/protocol/tun/inbound.go b/protocol/tun/inbound.go index 6820831a..ca8f29f7 100644 --- a/protocol/tun/inbound.go +++ b/protocol/tun/inbound.go @@ -380,6 +380,7 @@ func (t *Inbound) Start(stage adapter.StartStage) error { Tun: tunInterface, TunOptions: t.tunOptions, UDPTimeout: t.udpTimeout, + ICMPTimeout: C.ICMPTimeout, Handler: t, Logger: t.logger, ForwarderBindInterface: forwarderBindInterface, diff --git a/protocol/wireguard/endpoint.go b/protocol/wireguard/endpoint.go index 2975b05c..63009bfd 100644 --- a/protocol/wireguard/endpoint.go +++ b/protocol/wireguard/endpoint.go @@ -75,12 +75,13 @@ func NewEndpoint(ctx context.Context, router adapter.Router, logger log.ContextL udpTimeout = C.UDPTimeout } wgEndpoint, err := wireguard.NewEndpoint(wireguard.EndpointOptions{ - Context: ctx, - Logger: logger, - System: options.System, - Handler: ep, - UDPTimeout: udpTimeout, - Dialer: outboundDialer, + Context: ctx, + Logger: logger, + System: options.System, + Handler: ep, + UDPTimeout: udpTimeout, + ICMPTimeout: C.ICMPTimeout, + Dialer: outboundDialer, CreateDialer: func(interfaceName string) N.Dialer { return common.Must1(dialer.NewDefault(ctx, option.DialerOptions{ BindInterface: interfaceName, diff --git a/transport/wireguard/device.go b/transport/wireguard/device.go index 4dd615c5..81d610ea 100644 --- a/transport/wireguard/device.go +++ b/transport/wireguard/device.go @@ -28,6 +28,7 @@ type DeviceOptions struct { System bool Handler tun.Handler UDPTimeout time.Duration + ICMPTimeout time.Duration CreateDialer func(interfaceName string) N.Dialer Name string MTU uint32 diff --git a/transport/wireguard/device_stack.go b/transport/wireguard/device_stack.go index 373a050d..34088501 100644 --- a/transport/wireguard/device_stack.go +++ b/transport/wireguard/device_stack.go @@ -93,7 +93,7 @@ func newStackDevice(options DeviceOptions) (*stackDevice, error) { if options.Handler != nil { ipStack.SetTransportProtocolHandler(tcp.ProtocolNumber, tun.NewTCPForwarder(options.Context, ipStack, options.Handler).HandlePacket) ipStack.SetTransportProtocolHandler(udp.ProtocolNumber, tun.NewUDPForwarder(options.Context, ipStack, options.Handler, options.UDPTimeout).HandlePacket) - icmpForwarder := tun.NewICMPForwarder(options.Context, ipStack, options.Handler, options.UDPTimeout) + icmpForwarder := tun.NewICMPForwarder(options.Context, ipStack, options.Handler, options.ICMPTimeout) icmpForwarder.SetLocalAddresses(inet4Address, inet6Address) ipStack.SetTransportProtocolHandler(icmp.ProtocolNumber4, icmpForwarder.HandlePacket) ipStack.SetTransportProtocolHandler(icmp.ProtocolNumber6, icmpForwarder.HandlePacket) diff --git a/transport/wireguard/device_system_stack.go b/transport/wireguard/device_system_stack.go index 59c5f4ab..1172e602 100644 --- a/transport/wireguard/device_system_stack.go +++ b/transport/wireguard/device_system_stack.go @@ -78,7 +78,7 @@ func newSystemStackDevice(options DeviceOptions) (*systemStackDevice, error) { if options.Handler != nil { ipStack.SetTransportProtocolHandler(tcp.ProtocolNumber, tun.NewTCPForwarder(options.Context, ipStack, options.Handler).HandlePacket) ipStack.SetTransportProtocolHandler(udp.ProtocolNumber, tun.NewUDPForwarder(options.Context, ipStack, options.Handler, options.UDPTimeout).HandlePacket) - icmpForwarder := tun.NewICMPForwarder(options.Context, ipStack, options.Handler, options.UDPTimeout) + icmpForwarder := tun.NewICMPForwarder(options.Context, ipStack, options.Handler, options.ICMPTimeout) icmpForwarder.SetLocalAddresses(inet4Address, inet6Address) ipStack.SetTransportProtocolHandler(icmp.ProtocolNumber4, icmpForwarder.HandlePacket) ipStack.SetTransportProtocolHandler(icmp.ProtocolNumber6, icmpForwarder.HandlePacket) diff --git a/transport/wireguard/endpoint.go b/transport/wireguard/endpoint.go index 84d9fe72..c8682588 100644 --- a/transport/wireguard/endpoint.go +++ b/transport/wireguard/endpoint.go @@ -109,6 +109,7 @@ func NewEndpoint(options EndpointOptions) (*Endpoint, error) { System: options.System, Handler: options.Handler, UDPTimeout: options.UDPTimeout, + ICMPTimeout: options.ICMPTimeout, CreateDialer: options.CreateDialer, Name: options.Name, MTU: options.MTU, diff --git a/transport/wireguard/endpoint_options.go b/transport/wireguard/endpoint_options.go index bb9a46e6..1f950eff 100644 --- a/transport/wireguard/endpoint_options.go +++ b/transport/wireguard/endpoint_options.go @@ -17,6 +17,7 @@ type EndpointOptions struct { System bool Handler tun.Handler UDPTimeout time.Duration + ICMPTimeout time.Duration Dialer N.Dialer CreateDialer func(interfaceName string) N.Dialer Name string