Fix unbounded ICMP sockets in direct outbound

The direct outbound opens one ICMP socket for each echo flow. The
sockets were kept for one minute after the last packet and their
number was not limited, so scanning hosts through the outbound could
accumulate an unbounded number of sockets, which has been reported to
panic the kernel on macOS.

Close idle flows after ICMPTimeout as the stacks do, and keep at most
1024 flows, closing a least recently active one when the limit is
reached.
This commit is contained in:
世界 2026-11-16 06:46:49 +00:00
parent 56bf27b23d
commit 9e27f3413b
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
4 changed files with 6 additions and 4 deletions

View file

@ -5,6 +5,8 @@ import (
F "github.com/sagernet/sing/common/format"
)
const ICMPFlowMax = 1024
type InterfaceType uint8
const (

2
go.mod
View file

@ -55,7 +55,7 @@ require (
github.com/sagernet/sing-shadowsocks2 v0.2.2-0.20261110092058-52ade8ab7e95
github.com/sagernet/sing-shadowtls v0.2.2-0.20261114073233-97863830a3b3
github.com/sagernet/sing-snell v0.0.0-20261110094602-04667b0a321c
github.com/sagernet/sing-tun v0.9.7-0.20261114080500-78e734ea0994
github.com/sagernet/sing-tun v0.9.7-0.20261116064316-e7af358a2cc9
github.com/sagernet/sing-usbip v0.0.0-20260817040617-28bd42667eca
github.com/sagernet/sing-vmess v0.2.9-0.20261110093549-d800eb57f96c
github.com/sagernet/smux v1.5.50-sing-box-mod.1

4
go.sum
View file

@ -338,8 +338,8 @@ github.com/sagernet/sing-shadowtls v0.2.2-0.20261114073233-97863830a3b3 h1:UY+nv
github.com/sagernet/sing-shadowtls v0.2.2-0.20261114073233-97863830a3b3/go.mod h1:sWqKnGlMipCHaGsw1sTTlimyUpgzP4WP3pjhCsYt9oA=
github.com/sagernet/sing-snell v0.0.0-20261110094602-04667b0a321c h1:OODxu54K5ZvgnS97t8HlN3tily8Oj+s6ygOJ1ZzyfFQ=
github.com/sagernet/sing-snell v0.0.0-20261110094602-04667b0a321c/go.mod h1:Na4U54WiSQxWD/KEFIIdr+rPE9Qnr/kk8EtKXa18pRk=
github.com/sagernet/sing-tun v0.9.7-0.20261114080500-78e734ea0994 h1:nrivq/RdNSFDFEv91aKO3Vw3m1e075PtlRmJbjIejM8=
github.com/sagernet/sing-tun v0.9.7-0.20261114080500-78e734ea0994/go.mod h1:NqRKOzmp+umzkKtiSRa+AIP6pmCtdCGTUZLb1zscf4I=
github.com/sagernet/sing-tun v0.9.7-0.20261116064316-e7af358a2cc9 h1:Z3yiRxPm+qgbJPmdjJSwqzDzQXqlCKRKBuoSy8Ts4Aw=
github.com/sagernet/sing-tun v0.9.7-0.20261116064316-e7af358a2cc9/go.mod h1:NqRKOzmp+umzkKtiSRa+AIP6pmCtdCGTUZLb1zscf4I=
github.com/sagernet/sing-usbip v0.0.0-20260817040617-28bd42667eca h1:5wA+IE0Fq1CGVLOgSpm0gKKZ03HzugcJ2JyhmDqeX6A=
github.com/sagernet/sing-usbip v0.0.0-20260817040617-28bd42667eca/go.mod h1:ADAZZU85MnM91XNhd2TdZRTaIbA7RjTZuQ1KCHcUbNg=
github.com/sagernet/sing-vmess v0.2.9-0.20261110093549-d800eb57f96c h1:3svsvOhs6e7BcHY8o9+Fo0qGJ+enoLTdPIaRbqwsiaE=

View file

@ -87,7 +87,7 @@ func NewOutbound(ctx context.Context, router adapter.Router, logger log.ContextL
icmpControl := defaultDialer.ICMPControl()
outbound.icmpPort = ping.NewPort(ctx, logger, func(destination netip.Addr) control.Func {
return icmpControl
}, 0)
}, C.ICMPTimeout, C.ICMPFlowMax)
}
return outbound, nil
}