From 16cc0add91b92a3348136f39a249387fbce6703b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= Date: Sun, 7 Apr 2024 19:57:06 +0800 Subject: [PATCH] Fix packet id type --- hysteria/packet.go | 20 +++++--------------- hysteria2/packet.go | 20 +++++--------------- tuic/packet.go | 20 +++++--------------- 3 files changed, 15 insertions(+), 45 deletions(-) diff --git a/hysteria/packet.go b/hysteria/packet.go index a597c76..6ba8663 100644 --- a/hysteria/packet.go +++ b/hysteria/packet.go @@ -6,7 +6,6 @@ import ( "encoding/binary" "errors" "io" - "math" "net" "os" "sync" @@ -14,7 +13,6 @@ import ( "github.com/sagernet/quic-go" "github.com/sagernet/sing/common" - "github.com/sagernet/sing/common/atomic" "github.com/sagernet/sing/common/buf" "github.com/sagernet/sing/common/cache" E "github.com/sagernet/sing/common/exceptions" @@ -125,7 +123,7 @@ type udpPacketConn struct { quicConn quic.Connection data chan *udpMessage udpMTU int - packetId atomic.Uint32 + packetId uint16 closeOnce sync.Once defragger *udpDefragger onDestroy func() @@ -184,15 +182,11 @@ func (c *udpPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr) if buffer.Len() > 0xffff { return quic.ErrMessageTooLarge(0xffff) } - packetId := c.packetId.Add(1) - if packetId > math.MaxUint16 { - c.packetId.Store(0) - packetId = 0 - } + c.packetId++ message := allocMessage() *message = udpMessage{ sessionID: c.sessionID, - packetID: uint16(packetId), + packetID: c.packetId, fragmentTotal: 1, host: destination.AddrString(), port: destination.Port, @@ -224,16 +218,12 @@ func (c *udpPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) { if len(p) > 0xffff { return 0, quic.ErrMessageTooLarge(0xffff) } - packetId := c.packetId.Add(1) - if packetId > math.MaxUint16 { - c.packetId.Store(0) - packetId = 0 - } + c.packetId++ message := allocMessage() destination := M.SocksaddrFromNet(addr) *message = udpMessage{ sessionID: c.sessionID, - packetID: uint16(packetId), + packetID: uint16(c.packetId), fragmentTotal: 1, host: destination.AddrString(), port: destination.Port, diff --git a/hysteria2/packet.go b/hysteria2/packet.go index e3c1f1c..8c1522a 100644 --- a/hysteria2/packet.go +++ b/hysteria2/packet.go @@ -6,7 +6,6 @@ import ( "encoding/binary" "errors" "io" - "math" "net" "os" "sync" @@ -16,7 +15,6 @@ import ( "github.com/sagernet/quic-go/quicvarint" "github.com/sagernet/sing-quic/hysteria2/internal/protocol" "github.com/sagernet/sing/common" - "github.com/sagernet/sing/common/atomic" "github.com/sagernet/sing/common/buf" "github.com/sagernet/sing/common/cache" M "github.com/sagernet/sing/common/metadata" @@ -121,7 +119,7 @@ type udpPacketConn struct { quicConn quic.Connection data chan *udpMessage udpMTU int - packetId atomic.Uint32 + packetId uint16 closeOnce sync.Once defragger *udpDefragger onDestroy func() @@ -180,15 +178,11 @@ func (c *udpPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr) if buffer.Len() > 0xffff { return quic.ErrMessageTooLarge(0xffff) } - packetId := c.packetId.Add(1) - if packetId > math.MaxUint16 { - c.packetId.Store(0) - packetId = 0 - } + c.packetId++ message := allocMessage() *message = udpMessage{ sessionID: c.sessionID, - packetID: uint16(packetId), + packetID: uint16(c.packetId), fragmentTotal: 1, destination: destination.String(), data: buffer, @@ -219,15 +213,11 @@ func (c *udpPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) { if len(p) > 0xffff { return 0, quic.ErrMessageTooLarge(0xffff) } - packetId := c.packetId.Add(1) - if packetId > math.MaxUint16 { - c.packetId.Store(0) - packetId = 0 - } + c.packetId++ message := allocMessage() *message = udpMessage{ sessionID: c.sessionID, - packetID: uint16(packetId), + packetID: uint16(c.packetId), fragmentTotal: 1, destination: addr.String(), data: buf.As(p), diff --git a/tuic/packet.go b/tuic/packet.go index 888695f..0d6dc81 100644 --- a/tuic/packet.go +++ b/tuic/packet.go @@ -6,7 +6,6 @@ import ( "encoding/binary" "errors" "io" - "math" "net" "os" "sync" @@ -14,7 +13,6 @@ import ( "github.com/sagernet/quic-go" "github.com/sagernet/sing/common" - "github.com/sagernet/sing/common/atomic" "github.com/sagernet/sing/common/buf" "github.com/sagernet/sing/common/cache" E "github.com/sagernet/sing/common/exceptions" @@ -129,7 +127,7 @@ type udpPacketConn struct { udpStream bool udpMTU int udpMTUTime time.Time - packetId atomic.Uint32 + packetId uint16 closeOnce sync.Once isServer bool defragger *udpDefragger @@ -204,15 +202,11 @@ func (c *udpPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr) if !destination.IsValid() { return E.New("invalid destination address") } - packetId := c.packetId.Add(1) - if packetId > math.MaxUint16 { - c.packetId.Store(0) - packetId = 0 - } + c.packetId++ message := allocMessage() *message = udpMessage{ sessionID: c.sessionID, - packetID: uint16(packetId), + packetID: uint16(c.packetId), fragmentTotal: 1, destination: destination, data: buffer, @@ -249,15 +243,11 @@ func (c *udpPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) { if !destination.IsValid() { return 0, E.New("invalid destination address") } - packetId := c.packetId.Add(1) - if packetId > math.MaxUint16 { - c.packetId.Store(0) - packetId = 0 - } + c.packetId++ message := allocMessage() *message = udpMessage{ sessionID: c.sessionID, - packetID: uint16(packetId), + packetID: uint16(c.packetId), fragmentTotal: 1, destination: destination, data: buf.As(p),