package/sing-tun
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-tun.git synced 2025-09-26 20:51:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

ping: Fix not handling reject

Browse Source
This commit is contained in:
世界
2025-08-27 00:12:17 +08:00
parent 055fe13ec0
commit 4c43f4af12
3 changed files with 21 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
stack.go
View File

@@ -12,7 +12,10 @@ import (
"github.com/sagernet/sing/common/logger"
)
var ErrDrop = E.New("drop connections by rule")
var (
ErrDrop = E.New("drop by rule")
ErrReset = E.New("reset by rule")
)
type Stack interface {
Start() error

11
stack_gvisor_icmp.go
View File

@@ -4,6 +4,7 @@ package tun
import (
"context"
"errors"
"net/netip"
"sync"
"time"
@@ -73,7 +74,10 @@ func (f *ICMPForwarder) HandlePacket(id stack.TransportEndpointID, pkt *stack.Pa
timeout,
)
})
if err != nil {
if errors.Is(err, ErrReset) {
gWriteUnreachable(f.stack, pkt)
return true
} else if errors.Is(err, ErrDrop) {
return true
}
if action != nil {
@@ -132,7 +136,10 @@ func (f *ICMPForwarder) HandlePacket(id stack.TransportEndpointID, pkt *stack.Pa
timeout,
)
})
if err != nil {
if errors.Is(err, ErrReset) {
gWriteUnreachable(f.stack, pkt)
return true
} else if errors.Is(err, ErrDrop) {
return true
}
if action != nil {

8
stack_system.go
View File

@@ -668,8 +668,12 @@ func (s *System) processIPv4ICMP(ipHdr header.IPv4, icmpHdr header.ICMPv4) (bool
)
})
if err != nil {
if errors.Is(err, ErrReset) {
return false, s.rejectIPv4WithICMP(ipHdr, header.ICMPv4PortUnreachable)
} else if errors.Is(err, ErrDrop) {
return false, nil
}
}
if action != nil {
return false, action.WritePacket(buf.As(ipHdr).ToOwned())
}
@@ -739,7 +743,9 @@ func (s *System) processIPv6ICMP(ipHdr header.IPv6, icmpHdr header.ICMPv6) (bool
timeout,
)
})
if err != nil {
if errors.Is(err, ErrReset) {
return false, s.rejectIPv6WithICMP(ipHdr, header.ICMPv6PortUnreachable)
} else if errors.Is(err, ErrDrop) {
return false, nil
}
if action != nil {