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

Fix packet id race

Browse source
This commit is contained in:
世界 2024-04-08 10:51:57 +08:00
parent a2f8cb2bea
commit 97a8f2ab1c
No known key found for this signature in database
GPG key ID: CD109927C34A63C4
3 changed files with 12 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

16
hysteria/packet.go
View file

@ -184,15 +184,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
}
packetId := uint16(c.packetId.Add(1) % math.MaxUint16)
message := allocMessage()
*message = udpMessage{
sessionID: c.sessionID,
packetID: uint16(packetId),
packetID: packetId,
fragmentTotal: 1,
host: destination.AddrString(),
port: destination.Port,
@ -224,16 +220,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
}
packetId := uint16(c.packetId.Add(1) % math.MaxUint16)
message := allocMessage()
destination := M.SocksaddrFromNet(addr)
*message = udpMessage{
sessionID: c.sessionID,
packetID: uint16(packetId),
packetID: packetId,
fragmentTotal: 1,
host: destination.AddrString(),
port: destination.Port,

16
hysteria2/packet.go
View file

@ -180,15 +180,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
}
packetId := uint16(c.packetId.Add(1) % math.MaxUint16)
message := allocMessage()
*message = udpMessage{
sessionID: c.sessionID,
packetID: uint16(packetId),
packetID: packetId,
fragmentTotal: 1,
destination: destination.String(),
data: buffer,
@ -219,15 +215,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
}
packetId := uint16(c.packetId.Add(1) % math.MaxUint16)
message := allocMessage()
*message = udpMessage{
sessionID: c.sessionID,
packetID: uint16(packetId),
packetID: packetId,
fragmentTotal: 1,
destination: addr.String(),
data: buf.As(p),

16
tuic/packet.go
View file

@ -204,15 +204,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
}
packetId := uint16(c.packetId.Add(1) % math.MaxUint16)
message := allocMessage()
*message = udpMessage{
sessionID: c.sessionID,
packetID: uint16(packetId),
packetID: packetId,
fragmentTotal: 1,
destination: destination,
data: buffer,
@ -249,15 +245,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
}
packetId := uint16(c.packetId.Add(1) % math.MaxUint16)
message := allocMessage()
*message = udpMessage{
sessionID: c.sessionID,
packetID: uint16(packetId),
packetID: packetId,
fragmentTotal: 1,
destination: destination,
data: buf.As(p),