SagerNet/sing-quic
1
0
Fork 0
mirror of https://github.com/SagerNet/sing-quic.git synced 2025-04-04 12:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Implement read deadline for packet connections

Browse source
This commit is contained in:
世界 2024-08-18 09:22:08 +08:00
parent b2aa8a079f
commit f1bfea7819
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
8 changed files with 62 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
go.mod
View file

@ -5,7 +5,7 @@ go 1.20
require ( require (
github.com/gofrs/uuid/v5 v5.2.0 github.com/gofrs/uuid/v5 v5.2.0
github.com/sagernet/quic-go v0.46.0-beta.4 github.com/sagernet/quic-go v0.46.0-beta.4
github.com/sagernet/sing v0.4.1 github.com/sagernet/sing v0.5.0-beta.1
golang.org/x/crypto v0.23.0 golang.org/x/crypto v0.23.0
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f
) )

4
go.sum
View file

@ -21,8 +21,8 @@ github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5
github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k= github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
github.com/sagernet/quic-go v0.46.0-beta.4 h1:k9f7VSKaM47AY6MPND0Qf1KRN7HwimPg9zdOFTXTiCk= github.com/sagernet/quic-go v0.46.0-beta.4 h1:k9f7VSKaM47AY6MPND0Qf1KRN7HwimPg9zdOFTXTiCk=
github.com/sagernet/quic-go v0.46.0-beta.4/go.mod h1:zJmVdJUNqEDXfubf4KtIOUHHerggjBduiGRLNzJspcM= github.com/sagernet/quic-go v0.46.0-beta.4/go.mod h1:zJmVdJUNqEDXfubf4KtIOUHHerggjBduiGRLNzJspcM=
github.com/sagernet/sing v0.4.1 h1:zVlpE+7k7AFoC2pv6ReqLf0PIHjihL/jsBl5k05PQFk= github.com/sagernet/sing v0.5.0-beta.1 h1:THZMZgJcDQxutE++6Ckih1HlvMtXple94RBGa6GSg2I=
github.com/sagernet/sing v0.4.1/go.mod h1:ieZHA/+Y9YZfXs2I3WtuwgyCZ6GPsIR7HdKb1SdEnls= github.com/sagernet/sing v0.5.0-beta.1/go.mod h1:ARkL0gM13/Iv5VCZmci/NuoOlePoIsW0m7BWfln/Hak=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg= github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=

24
hysteria/packet.go
View file

@ -20,6 +20,7 @@ import (
E "github.com/sagernet/sing/common/exceptions" E "github.com/sagernet/sing/common/exceptions"
M "github.com/sagernet/sing/common/metadata" M "github.com/sagernet/sing/common/metadata"
N "github.com/sagernet/sing/common/network" N "github.com/sagernet/sing/common/network"
"github.com/sagernet/sing/common/pipe"
) )
var udpMessagePool = sync.Pool{ var udpMessagePool = sync.Pool{
@ -129,18 +130,20 @@ type udpPacketConn struct {
defragger *udpDefragger defragger *udpDefragger
onDestroy func() onDestroy func()
readWaitOptions N.ReadWaitOptions readWaitOptions N.ReadWaitOptions
readDeadline pipe.Deadline
} }
func newUDPPacketConn(ctx context.Context, quicConn quic.Connection, onDestroy func()) *udpPacketConn { func newUDPPacketConn(ctx context.Context, quicConn quic.Connection, onDestroy func()) *udpPacketConn {
ctx, cancel := common.ContextWithCancelCause(ctx) ctx, cancel := common.ContextWithCancelCause(ctx)
return &udpPacketConn{ return &udpPacketConn{
ctx: ctx, ctx: ctx,
cancel: cancel, cancel: cancel,
quicConn: quicConn, quicConn: quicConn,
data: make(chan *udpMessage, 64), data: make(chan *udpMessage, 64),
udpMTU: 1200 - 3, udpMTU: 1200 - 3,
defragger: newUDPDefragger(), defragger: newUDPDefragger(),
onDestroy: onDestroy, onDestroy: onDestroy,
readDeadline: pipe.MakeDeadline(),
} }
} }
@ -153,6 +156,8 @@ func (c *udpPacketConn) ReadPacket(buffer *buf.Buffer) (destination M.Socksaddr,
return return
case <-c.ctx.Done(): case <-c.ctx.Done():
return M.Socksaddr{}, io.ErrClosedPipe return M.Socksaddr{}, io.ErrClosedPipe
case <-c.readDeadline.Wait():
return M.Socksaddr{}, os.ErrDeadlineExceeded
} }
} }
@ -170,6 +175,8 @@ func (c *udpPacketConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) {
return n, addr, nil return n, addr, nil
case <-c.ctx.Done(): case <-c.ctx.Done():
return 0, nil, io.ErrClosedPipe return 0, nil, io.ErrClosedPipe
case <-c.readDeadline.Wait():
return 0, nil, os.ErrDeadlineExceeded
} }
} }
@ -307,7 +314,8 @@ func (c *udpPacketConn) SetDeadline(t time.Time) error {
} }
func (c *udpPacketConn) SetReadDeadline(t time.Time) error { func (c *udpPacketConn) SetReadDeadline(t time.Time) error {
return os.ErrInvalid c.readDeadline.Set(t)
return nil
} }
func (c *udpPacketConn) SetWriteDeadline(t time.Time) error { func (c *udpPacketConn) SetWriteDeadline(t time.Time) error {

3
hysteria/packet_wait.go
View file

@ -2,6 +2,7 @@ package hysteria
import ( import (
"io" "io"
"os"
"github.com/sagernet/sing/common/buf" "github.com/sagernet/sing/common/buf"
M "github.com/sagernet/sing/common/metadata" M "github.com/sagernet/sing/common/metadata"
@ -33,5 +34,7 @@ func (c *udpPacketConn) WaitReadPacket() (buffer *buf.Buffer, destination M.Sock
return return
case <-c.ctx.Done(): case <-c.ctx.Done():
return nil, M.Socksaddr{}, io.ErrClosedPipe return nil, M.Socksaddr{}, io.ErrClosedPipe
case <-c.readDeadline.Wait():
return nil, M.Socksaddr{}, os.ErrDeadlineExceeded
} }
} }

24
hysteria2/packet.go
View file

@ -21,6 +21,7 @@ import (
"github.com/sagernet/sing/common/cache" "github.com/sagernet/sing/common/cache"
M "github.com/sagernet/sing/common/metadata" M "github.com/sagernet/sing/common/metadata"
N "github.com/sagernet/sing/common/network" N "github.com/sagernet/sing/common/network"
"github.com/sagernet/sing/common/pipe"
) )
var udpMessagePool = sync.Pool{ var udpMessagePool = sync.Pool{
@ -126,18 +127,20 @@ type udpPacketConn struct {
defragger *udpDefragger defragger *udpDefragger
onDestroy func() onDestroy func()
readWaitOptions N.ReadWaitOptions readWaitOptions N.ReadWaitOptions
readDeadline pipe.Deadline
} }
func newUDPPacketConn(ctx context.Context, quicConn quic.Connection, onDestroy func()) *udpPacketConn { func newUDPPacketConn(ctx context.Context, quicConn quic.Connection, onDestroy func()) *udpPacketConn {
ctx, cancel := common.ContextWithCancelCause(ctx) ctx, cancel := common.ContextWithCancelCause(ctx)
return &udpPacketConn{ return &udpPacketConn{
ctx: ctx, ctx: ctx,
cancel: cancel, cancel: cancel,
quicConn: quicConn, quicConn: quicConn,
data: make(chan *udpMessage, 64), data: make(chan *udpMessage, 64),
udpMTU: 1200 - 3, udpMTU: 1200 - 3,
defragger: newUDPDefragger(), defragger: newUDPDefragger(),
onDestroy: onDestroy, onDestroy: onDestroy,
readDeadline: pipe.MakeDeadline(),
} }
} }
@ -150,6 +153,8 @@ func (c *udpPacketConn) ReadPacket(buffer *buf.Buffer) (destination M.Socksaddr,
return return
case <-c.ctx.Done(): case <-c.ctx.Done():
return M.Socksaddr{}, io.ErrClosedPipe return M.Socksaddr{}, io.ErrClosedPipe
case <-c.readDeadline.Wait():
return M.Socksaddr{}, os.ErrDeadlineExceeded
} }
} }
@ -167,6 +172,8 @@ func (c *udpPacketConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) {
return n, addr, nil return n, addr, nil
case <-c.ctx.Done(): case <-c.ctx.Done():
return 0, nil, io.ErrClosedPipe return 0, nil, io.ErrClosedPipe
case <-c.readDeadline.Wait():
return 0, nil, os.ErrDeadlineExceeded
} }
} }
@ -301,7 +308,8 @@ func (c *udpPacketConn) SetDeadline(t time.Time) error {
} }
func (c *udpPacketConn) SetReadDeadline(t time.Time) error { func (c *udpPacketConn) SetReadDeadline(t time.Time) error {
return os.ErrInvalid c.readDeadline.Set(t)
return nil
} }
func (c *udpPacketConn) SetWriteDeadline(t time.Time) error { func (c *udpPacketConn) SetWriteDeadline(t time.Time) error {

3
hysteria2/packet_wait.go
View file

@ -2,6 +2,7 @@ package hysteria2
import ( import (
"io" "io"
"os"
"github.com/sagernet/sing/common/buf" "github.com/sagernet/sing/common/buf"
M "github.com/sagernet/sing/common/metadata" M "github.com/sagernet/sing/common/metadata"
@ -33,5 +34,7 @@ func (c *udpPacketConn) WaitReadPacket() (buffer *buf.Buffer, destination M.Sock
return return
case <-c.ctx.Done(): case <-c.ctx.Done():
return nil, M.Socksaddr{}, io.ErrClosedPipe return nil, M.Socksaddr{}, io.ErrClosedPipe
case <-c.readDeadline.Wait():
return nil, M.Socksaddr{}, os.ErrDeadlineExceeded
} }
} }

28
tuic/packet.go
View file

@ -20,6 +20,7 @@ import (
E "github.com/sagernet/sing/common/exceptions" E "github.com/sagernet/sing/common/exceptions"
M "github.com/sagernet/sing/common/metadata" M "github.com/sagernet/sing/common/metadata"
N "github.com/sagernet/sing/common/network" N "github.com/sagernet/sing/common/network"
"github.com/sagernet/sing/common/pipe"
) )
var udpMessagePool = sync.Pool{ var udpMessagePool = sync.Pool{
@ -134,20 +135,22 @@ type udpPacketConn struct {
defragger *udpDefragger defragger *udpDefragger
onDestroy func() onDestroy func()
readWaitOptions N.ReadWaitOptions readWaitOptions N.ReadWaitOptions
readDeadline pipe.Deadline
} }
func newUDPPacketConn(ctx context.Context, quicConn quic.Connection, udpStream bool, isServer bool, onDestroy func()) *udpPacketConn { func newUDPPacketConn(ctx context.Context, quicConn quic.Connection, udpStream bool, isServer bool, onDestroy func()) *udpPacketConn {
ctx, cancel := common.ContextWithCancelCause(ctx) ctx, cancel := common.ContextWithCancelCause(ctx)
return &udpPacketConn{ return &udpPacketConn{
ctx: ctx, ctx: ctx,
cancel: cancel, cancel: cancel,
quicConn: quicConn, quicConn: quicConn,
data: make(chan *udpMessage, 64), data: make(chan *udpMessage, 64),
udpStream: udpStream, udpStream: udpStream,
isServer: isServer, isServer: isServer,
defragger: newUDPDefragger(), defragger: newUDPDefragger(),
onDestroy: onDestroy, onDestroy: onDestroy,
udpMTU: 1200 - 3, udpMTU: 1200 - 3,
readDeadline: pipe.MakeDeadline(),
} }
} }
@ -160,6 +163,8 @@ func (c *udpPacketConn) ReadPacket(buffer *buf.Buffer) (destination M.Socksaddr,
return return
case <-c.ctx.Done(): case <-c.ctx.Done():
return M.Socksaddr{}, io.ErrClosedPipe return M.Socksaddr{}, io.ErrClosedPipe
case <-c.readDeadline.Wait():
return M.Socksaddr{}, os.ErrDeadlineExceeded
} }
} }
@ -176,6 +181,8 @@ func (c *udpPacketConn) ReadFrom(p []byte) (n int, addr net.Addr, err error) {
return n, addr, nil return n, addr, nil
case <-c.ctx.Done(): case <-c.ctx.Done():
return 0, nil, io.ErrClosedPipe return 0, nil, io.ErrClosedPipe
case <-c.readDeadline.Wait():
return 0, nil, os.ErrDeadlineExceeded
} }
} }
@ -350,7 +357,8 @@ func (c *udpPacketConn) SetDeadline(t time.Time) error {
} }
func (c *udpPacketConn) SetReadDeadline(t time.Time) error { func (c *udpPacketConn) SetReadDeadline(t time.Time) error {
return os.ErrInvalid c.readDeadline.Set(t)
return nil
} }
func (c *udpPacketConn) SetWriteDeadline(t time.Time) error { func (c *udpPacketConn) SetWriteDeadline(t time.Time) error {

3
tuic/packet_wait.go
View file

@ -2,6 +2,7 @@ package tuic
import ( import (
"io" "io"
"os"
"github.com/sagernet/sing/common/buf" "github.com/sagernet/sing/common/buf"
M "github.com/sagernet/sing/common/metadata" M "github.com/sagernet/sing/common/metadata"
@ -33,5 +34,7 @@ func (c *udpPacketConn) WaitReadPacket() (buffer *buf.Buffer, destination M.Sock
return return
case <-c.ctx.Done(): case <-c.ctx.Done():
return nil, M.Socksaddr{}, io.ErrClosedPipe return nil, M.Socksaddr{}, io.ErrClosedPipe
case <-c.readDeadline.Wait():
return nil, M.Socksaddr{}, os.ErrDeadlineExceeded
} }
} }