Skip to content

perf: dynamically adapt datagram payload size to connection PMTU (removes 1197 hard limit) #21

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
oluceps wants to merge 1 commit into
base: main
Choose a base branch
from
Open

perf: dynamically adapt datagram payload size to connection PMTU (removes 1197 hard limit) #21

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 19 additions & 36 deletions hysteria2/packet.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"bytes"
"context"
"encoding/binary"
"errors"
"io"
"math"
"net"
Expand Down Expand Up @@ -117,12 +116,12 @@ func fragUDPMessage(message *udpMessage, maxPacketSize int) []*udpMessage {
}

type udpPacketConn struct {
ctx context.Context
cancel context.CancelCauseFunc
sessionID uint32
quicConn *quic.Conn
data chan *udpMessage
udpMTU int
ctx context.Context
cancel context.CancelCauseFunc
sessionID uint32
quicConn *quic.Conn
data chan *udpMessage

packetId atomic.Uint32
closeOnce sync.Once
defragger *udpDefragger
Expand All @@ -134,11 +133,11 @@ type udpPacketConn struct {
func newUDPPacketConn(ctx context.Context, quicConn *quic.Conn, onDestroy func()) *udpPacketConn {
ctx, cancel := context.WithCancelCause(ctx)
return &udpPacketConn{
ctx: ctx,
cancel: cancel,
quicConn: quicConn,
data: make(chan *udpMessage, 64),
udpMTU: 1200 - 3,
ctx: ctx,
cancel: cancel,
quicConn: quicConn,
data: make(chan *udpMessage, 64),

defragger: newUDPDefragger(),
onDestroy: onDestroy,
readDeadline: pipe.MakeDeadline(),
Expand Down Expand Up @@ -202,19 +201,13 @@ func (c *udpPacketConn) WritePacket(buffer *buf.Buffer, destination M.Socksaddr)
}
defer message.releaseMessage()
var err error
if c.udpMTU > message.headerSize() && buffer.Len() > c.udpMTU-message.headerSize() {
err = c.writePackets(fragUDPMessage(message, c.udpMTU))
currentMTU := int(c.quicConn.MaxDatagramPayloadSize()) - 3
if currentMTU > message.headerSize() && buffer.Len() > currentMTU-message.headerSize() {
err = c.writePackets(fragUDPMessage(message, currentMTU))
} else {
err = c.writePacket(message)
}
if err == nil {
return nil
}
var tooLargeErr *quic.DatagramTooLargeError
if !errors.As(err, &tooLargeErr) || int(tooLargeErr.MaxDatagramPayloadSize-3) <= message.headerSize() {
return err
}
return c.writePackets(fragUDPMessage(message, int(tooLargeErr.MaxDatagramPayloadSize-3)))
return err
}

func (c *udpPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
Expand All @@ -240,26 +233,16 @@ func (c *udpPacketConn) WriteTo(p []byte, addr net.Addr) (n int, err error) {
data: buf.As(p),
}
defer message.releaseMessage()
if c.udpMTU > message.headerSize() && len(p) > c.udpMTU-message.headerSize() {
err = c.writePackets(fragUDPMessage(message, c.udpMTU))
if err == nil {
return len(p), nil
}
currentMTU := int(c.quicConn.MaxDatagramPayloadSize()) - 3
if currentMTU > message.headerSize() && len(p) > currentMTU-message.headerSize() {
err = c.writePackets(fragUDPMessage(message, currentMTU))
} else {
err = c.writePacket(message)
}
if err == nil {
return len(p), nil
}
var tooLargeErr *quic.DatagramTooLargeError
if !errors.As(err, &tooLargeErr) || int(tooLargeErr.MaxDatagramPayloadSize-3) <= message.headerSize() {
return
}
err = c.writePackets(fragUDPMessage(message, int(tooLargeErr.MaxDatagramPayloadSize-3)))
if err == nil {
return len(p), nil
}
return
return 0, err
}

func (c *udpPacketConn) inputPacket(message *udpMessage) {
Expand Down