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

Revert "Fix packet id type"

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

20
hysteria/packet.go
View file

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

20
hysteria2/packet.go
View file

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

20
tuic/packet.go
View file

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