SagerNet/sing
1
0
Fork 0
mirror of https://github.com/SagerNet/sing.git synced 2025-04-05 21:07:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix canceler

Browse source
This commit is contained in:
世界 2024-03-24 00:11:20 +08:00
parent a069af4787
commit 04152ea672
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
1 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/canceler/packet_timeout.go
View file

@ -2,6 +2,7 @@ package canceler
import ( import (
"context" "context"
"net"
"time" "time"
"github.com/sagernet/sing/common" "github.com/sagernet/sing/common"
@ -31,7 +32,7 @@ func (c *TimeoutPacketConn) ReadPacket(buffer *buf.Buffer) (destination M.Socksa
for { for {
err = c.PacketConn.SetReadDeadline(time.Now().Add(c.timeout)) err = c.PacketConn.SetReadDeadline(time.Now().Add(c.timeout))
if err != nil { if err != nil {
return M.Socksaddr{}, err return
} }
destination, err = c.PacketConn.ReadPacket(buffer) destination, err = c.PacketConn.ReadPacket(buffer)
if err == nil { if err == nil {
@ -43,7 +44,7 @@ func (c *TimeoutPacketConn) ReadPacket(buffer *buf.Buffer) (destination M.Socksa
return return
} }
} else { } else {
return M.Socksaddr{}, err return
} }
} }
} }
@ -66,6 +67,7 @@ func (c *TimeoutPacketConn) SetTimeout(timeout time.Duration) {
} }
func (c *TimeoutPacketConn) Close() error { func (c *TimeoutPacketConn) Close() error {
c.cancel(net.ErrClosed)
return c.PacketConn.Close() return c.PacketConn.Close()
} }