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

Fix packet id type

Browse source
This commit is contained in:
世界 2024-04-07 19:57:06 +08:00
parent 766fcba388
commit 16cc0add91
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
3 changed files with 15 additions and 45 deletions
Download patch file Download diff file Expand all files Collapse all files

20
hysteria/packet.go
View file

@ -6,7 +6,6 @@ import (
"encoding/binary" "encoding/binary"
"errors" "errors"
"io" "io"
"math"
"net" "net"
"os" "os"
"sync" "sync"
@ -14,7 +13,6 @@ import (
"github.com/sagernet/quic-go" "github.com/sagernet/quic-go"
"github.com/sagernet/sing/common" "github.com/sagernet/sing/common"
"github.com/sagernet/sing/common/atomic"
"github.com/sagernet/sing/common/buf" "github.com/sagernet/sing/common/buf"
"github.com/sagernet/sing/common/cache" "github.com/sagernet/sing/common/cache"
E "github.com/sagernet/sing/common/exceptions" E "github.com/sagernet/sing/common/exceptions"
@ -125,7 +123,7 @@ type udpPacketConn struct {
quicConn quic.Connection quicConn quic.Connection
data chan *udpMessage data chan *udpMessage
udpMTU int udpMTU int
packetId atomic.Uint32 packetId uint16
closeOnce sync.Once closeOnce sync.Once
defragger *udpDefragger defragger *udpDefragger
onDestroy func() onDestroy func()
@ -184,15 +182,11 @@ func (c *udpPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr)
if buffer.Len() > 0xffff { if buffer.Len() > 0xffff {
return quic.ErrMessageTooLarge(0xffff) return quic.ErrMessageTooLarge(0xffff)
} }
packetId := c.packetId.Add(1) c.packetId++
if packetId > math.MaxUint16 {
c.packetId.Store(0)
packetId = 0
}
message := allocMessage() message := allocMessage()
*message = udpMessage{ *message = udpMessage{
sessionID: c.sessionID, sessionID: c.sessionID,
packetID: uint16(packetId), packetID: c.packetId,
fragmentTotal: 1, fragmentTotal: 1,
host: destination.AddrString(), host: destination.AddrString(),
port: destination.Port, port: destination.Port,
@ -224,16 +218,12 @@ func (c *udpPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
if len(p) > 0xffff { if len(p) > 0xffff {
return 0, quic.ErrMessageTooLarge(0xffff) return 0, quic.ErrMessageTooLarge(0xffff)
} }
packetId := c.packetId.Add(1) c.packetId++
if packetId > math.MaxUint16 {
c.packetId.Store(0)
packetId = 0
}
message := allocMessage() message := allocMessage()
destination := M.SocksaddrFromNet(addr) destination := M.SocksaddrFromNet(addr)
*message = udpMessage{ *message = udpMessage{
sessionID: c.sessionID, sessionID: c.sessionID,
packetID: uint16(packetId), packetID: uint16(c.packetId),
fragmentTotal: 1, fragmentTotal: 1,
host: destination.AddrString(), host: destination.AddrString(),
port: destination.Port, port: destination.Port,

20
hysteria2/packet.go
View file

@ -6,7 +6,6 @@ import (
"encoding/binary" "encoding/binary"
"errors" "errors"
"io" "io"
"math"
"net" "net"
"os" "os"
"sync" "sync"
@ -16,7 +15,6 @@ import (
"github.com/sagernet/quic-go/quicvarint" "github.com/sagernet/quic-go/quicvarint"
"github.com/sagernet/sing-quic/hysteria2/internal/protocol" "github.com/sagernet/sing-quic/hysteria2/internal/protocol"
"github.com/sagernet/sing/common" "github.com/sagernet/sing/common"
"github.com/sagernet/sing/common/atomic"
"github.com/sagernet/sing/common/buf" "github.com/sagernet/sing/common/buf"
"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"
@ -121,7 +119,7 @@ type udpPacketConn struct {
quicConn quic.Connection quicConn quic.Connection
data chan *udpMessage data chan *udpMessage
udpMTU int udpMTU int
packetId atomic.Uint32 packetId uint16
closeOnce sync.Once closeOnce sync.Once
defragger *udpDefragger defragger *udpDefragger
onDestroy func() onDestroy func()
@ -180,15 +178,11 @@ func (c *udpPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr)
if buffer.Len() > 0xffff { if buffer.Len() > 0xffff {
return quic.ErrMessageTooLarge(0xffff) return quic.ErrMessageTooLarge(0xffff)
} }
packetId := c.packetId.Add(1) c.packetId++
if packetId > math.MaxUint16 {
c.packetId.Store(0)
packetId = 0
}
message := allocMessage() message := allocMessage()
*message = udpMessage{ *message = udpMessage{
sessionID: c.sessionID, sessionID: c.sessionID,
packetID: uint16(packetId), packetID: uint16(c.packetId),
fragmentTotal: 1, fragmentTotal: 1,
destination: destination.String(), destination: destination.String(),
data: buffer, data: buffer,
@ -219,15 +213,11 @@ func (c *udpPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
if len(p) > 0xffff { if len(p) > 0xffff {
return 0, quic.ErrMessageTooLarge(0xffff) return 0, quic.ErrMessageTooLarge(0xffff)
} }
packetId := c.packetId.Add(1) c.packetId++
if packetId > math.MaxUint16 {
c.packetId.Store(0)
packetId = 0
}
message := allocMessage() message := allocMessage()
*message = udpMessage{ *message = udpMessage{
sessionID: c.sessionID, sessionID: c.sessionID,
packetID: uint16(packetId), packetID: uint16(c.packetId),
fragmentTotal: 1, fragmentTotal: 1,
destination: addr.String(), destination: addr.String(),
data: buf.As(p), data: buf.As(p),

20
tuic/packet.go
View file

@ -6,7 +6,6 @@ import (
"encoding/binary" "encoding/binary"
"errors" "errors"
"io" "io"
"math"
"net" "net"
"os" "os"
"sync" "sync"
@ -14,7 +13,6 @@ import (
"github.com/sagernet/quic-go" "github.com/sagernet/quic-go"
"github.com/sagernet/sing/common" "github.com/sagernet/sing/common"
"github.com/sagernet/sing/common/atomic"
"github.com/sagernet/sing/common/buf" "github.com/sagernet/sing/common/buf"
"github.com/sagernet/sing/common/cache" "github.com/sagernet/sing/common/cache"
E "github.com/sagernet/sing/common/exceptions" E "github.com/sagernet/sing/common/exceptions"
@ -129,7 +127,7 @@ type udpPacketConn struct {
udpStream bool udpStream bool
udpMTU int udpMTU int
udpMTUTime time.Time udpMTUTime time.Time
packetId atomic.Uint32 packetId uint16
closeOnce sync.Once closeOnce sync.Once
isServer bool isServer bool
defragger *udpDefragger defragger *udpDefragger
@ -204,15 +202,11 @@ func (c *udpPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr)
if !destination.IsValid() { if !destination.IsValid() {
return E.New("invalid destination address") return E.New("invalid destination address")
} }
packetId := c.packetId.Add(1) c.packetId++
if packetId > math.MaxUint16 {
c.packetId.Store(0)
packetId = 0
}
message := allocMessage() message := allocMessage()
*message = udpMessage{ *message = udpMessage{
sessionID: c.sessionID, sessionID: c.sessionID,
packetID: uint16(packetId), packetID: uint16(c.packetId),
fragmentTotal: 1, fragmentTotal: 1,
destination: destination, destination: destination,
data: buffer, data: buffer,
@ -249,15 +243,11 @@ func (c *udpPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
if !destination.IsValid() { if !destination.IsValid() {
return 0, E.New("invalid destination address") return 0, E.New("invalid destination address")
} }
packetId := c.packetId.Add(1) c.packetId++
if packetId > math.MaxUint16 {
c.packetId.Store(0)
packetId = 0
}
message := allocMessage() message := allocMessage()
*message = udpMessage{ *message = udpMessage{
sessionID: c.sessionID, sessionID: c.sessionID,
packetID: uint16(packetId), packetID: uint16(c.packetId),
fragmentTotal: 1, fragmentTotal: 1,
destination: destination, destination: destination,
data: buf.As(p), data: buf.As(p),