From 2fdf8165aee6882cd1540d1f1b746985372b28f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=96=E7=95=8C?= <i@sekai.icu>
Date: Sat, 10 Feb 2024 11:29:20 +0800
Subject: [PATCH] Update quic-go to v0.42.0
---
go.mod | 2 +-
go.sum | 4 ++--
hysteria/packet.go | 12 ++++++------
hysteria2/packet.go | 12 ++++++------
tuic/packet.go | 12 ++++++------
5 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/go.mod b/go.mod
index bc83f37..169c2a7 100644
--- a/go.mod
+++ b/go.mod
@@ -4,7 +4,7 @@ go 1.20
require (
github.com/gofrs/uuid/v5 v5.1.0
- github.com/sagernet/quic-go v0.40.1
+ github.com/sagernet/quic-go v0.42.0-beta.3
github.com/sagernet/sing v0.3.8
golang.org/x/crypto v0.22.0
golang.org/x/exp v0.0.0-20240416160154-fe59bbe5cc7f
diff --git a/go.sum b/go.sum
index 725c67b..fa6d261 100644
--- a/go.sum
+++ b/go.sum
@@ -21,8 +21,8 @@ github.com/quic-go/qpack v0.4.0 h1:Cr9BXA1sQS2SmDUWjSofMPNKmvF6IiIfDRmgU0w1ZCo=
github.com/quic-go/qpack v0.4.0/go.mod h1:UZVnYIfi5GRk+zI9UMaCPsmZ2xKJP7XBUvVyT1Knj9A=
github.com/quic-go/qtls-go1-20 v0.4.1 h1:D33340mCNDAIKBqXuAvexTNMUByrYmFYVfKfDN5nfFs=
github.com/quic-go/qtls-go1-20 v0.4.1/go.mod h1:X9Nh97ZL80Z+bX/gUXMbipO6OxdiDi58b/fMC9mAL+k=
-github.com/sagernet/quic-go v0.40.1 h1:qLeTIJR0d0JWRmDWo346nLsVN6EWihd1kalJYPEd0TM=
-github.com/sagernet/quic-go v0.40.1/go.mod h1:CcKTpzTAISxrM4PA5M20/wYuz9Tj6Tx4DwGbNl9UQrU=
+github.com/sagernet/quic-go v0.42.0-beta.3 h1:cspu1Uh1KriiDmW42OaPYokeGZT2OyfIcRMV2BdNtEo=
+github.com/sagernet/quic-go v0.42.0-beta.3/go.mod h1:lf8OYop+fMxIlrfM/ZHpENt/7ZD4JaVNqMhOlq2QMwg=
github.com/sagernet/sing v0.3.8 h1:gm4JKalPhydMYX2zFOTnnd4TXtM/16WFRqSjMepYQQk=
github.com/sagernet/sing v0.3.8/go.mod h1:+60H3Cm91RnL9dpVGWDPHt0zTQImO9Vfqt9a4rSambI=
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
diff --git a/hysteria/packet.go b/hysteria/packet.go
index 772d63b..d19bbc3 100644
--- a/hysteria/packet.go
+++ b/hysteria/packet.go
@@ -182,7 +182,7 @@ func (c *udpPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr)
default:
}
if buffer.Len() > 0xffff {
- return quic.ErrMessageTooLarge(0xffff)
+ return &quic.DatagramTooLargeError{PeerMaxDatagramFrameSize: 0xffff}
}
packetId := uint16(c.packetId.Add(1) % math.MaxUint16)
message := allocMessage()
@@ -204,11 +204,11 @@ func (c *udpPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr)
if err == nil {
return nil
}
- var tooLargeErr quic.ErrMessageTooLarge
+ var tooLargeErr *quic.DatagramTooLargeError
if !errors.As(err, &tooLargeErr) {
return err
}
- return c.writePackets(fragUDPMessage(message, int(tooLargeErr)-3))
+ return c.writePackets(fragUDPMessage(message, int(tooLargeErr.PeerMaxDatagramFrameSize-3)))
}
func (c *udpPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
@@ -218,7 +218,7 @@ func (c *udpPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
default:
}
if len(p) > 0xffff {
- return 0, quic.ErrMessageTooLarge(0xffff)
+ return 0, &quic.DatagramTooLargeError{PeerMaxDatagramFrameSize: 0xffff}
}
packetId := uint16(c.packetId.Add(1) % math.MaxUint16)
message := allocMessage()
@@ -242,11 +242,11 @@ func (c *udpPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
if err == nil {
return len(p), nil
}
- var tooLargeErr quic.ErrMessageTooLarge
+ var tooLargeErr *quic.DatagramTooLargeError
if !errors.As(err, &tooLargeErr) {
return
}
- err = c.writePackets(fragUDPMessage(message, int(tooLargeErr)-3))
+ err = c.writePackets(fragUDPMessage(message, int(tooLargeErr.PeerMaxDatagramFrameSize-3)))
if err == nil {
return len(p), nil
}
diff --git a/hysteria2/packet.go b/hysteria2/packet.go
index 89a6409..dc51dfc 100644
--- a/hysteria2/packet.go
+++ b/hysteria2/packet.go
@@ -178,7 +178,7 @@ func (c *udpPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr)
default:
}
if buffer.Len() > 0xffff {
- return quic.ErrMessageTooLarge(0xffff)
+ return &quic.DatagramTooLargeError{PeerMaxDatagramFrameSize: 0xffff}
}
packetId := uint16(c.packetId.Add(1) % math.MaxUint16)
message := allocMessage()
@@ -199,11 +199,11 @@ func (c *udpPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr)
if err == nil {
return nil
}
- var tooLargeErr quic.ErrMessageTooLarge
+ var tooLargeErr *quic.DatagramTooLargeError
if !errors.As(err, &tooLargeErr) {
return err
}
- return c.writePackets(fragUDPMessage(message, int(tooLargeErr)-3))
+ return c.writePackets(fragUDPMessage(message, int(tooLargeErr.PeerMaxDatagramFrameSize-3)))
}
func (c *udpPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
@@ -213,7 +213,7 @@ func (c *udpPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
default:
}
if len(p) > 0xffff {
- return 0, quic.ErrMessageTooLarge(0xffff)
+ return 0, &quic.DatagramTooLargeError{PeerMaxDatagramFrameSize: 0xffff}
}
packetId := uint16(c.packetId.Add(1) % math.MaxUint16)
message := allocMessage()
@@ -235,11 +235,11 @@ func (c *udpPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
if err == nil {
return len(p), nil
}
- var tooLargeErr quic.ErrMessageTooLarge
+ var tooLargeErr *quic.DatagramTooLargeError
if !errors.As(err, &tooLargeErr) {
return
}
- err = c.writePackets(fragUDPMessage(message, int(tooLargeErr)-3))
+ err = c.writePackets(fragUDPMessage(message, int(tooLargeErr.PeerMaxDatagramFrameSize-3)))
if err == nil {
return len(p), nil
}
diff --git a/tuic/packet.go b/tuic/packet.go
index ecb43e4..5b49591 100644
--- a/tuic/packet.go
+++ b/tuic/packet.go
@@ -187,7 +187,7 @@ func (c *udpPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr)
default:
}
if buffer.Len() > 0xffff {
- return quic.ErrMessageTooLarge(0xffff)
+ return &quic.DatagramTooLargeError{PeerMaxDatagramFrameSize: 0xffff}
}
if !destination.IsValid() {
return E.New("invalid destination address")
@@ -211,11 +211,11 @@ func (c *udpPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr)
if err == nil {
return nil
}
- var tooLargeErr quic.ErrMessageTooLarge
+ var tooLargeErr *quic.DatagramTooLargeError
if !errors.As(err, &tooLargeErr) {
return err
}
- c.udpMTU = int(tooLargeErr) - 3
+ c.udpMTU = int(tooLargeErr.PeerMaxDatagramFrameSize) - 3
return c.writePackets(fragUDPMessage(message, c.udpMTU))
}
@@ -226,7 +226,7 @@ func (c *udpPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
default:
}
if len(p) > 0xffff {
- return 0, quic.ErrMessageTooLarge(0xffff)
+ return 0, &quic.DatagramTooLargeError{PeerMaxDatagramFrameSize: 0xffff}
}
destination := M.SocksaddrFromNet(addr)
if !destination.IsValid() {
@@ -252,11 +252,11 @@ func (c *udpPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
if err == nil {
return len(p), nil
}
- var tooLargeErr quic.ErrMessageTooLarge
+ var tooLargeErr *quic.DatagramTooLargeError
if !errors.As(err, &tooLargeErr) {
return
}
- c.udpMTU = int(tooLargeErr) - 3
+ c.udpMTU = int(tooLargeErr.PeerMaxDatagramFrameSize) - 3
err = c.writePackets(fragUDPMessage(message, c.udpMTU))
if err == nil {
return len(p), nil