history-museum/Clash.Meta
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore: adjustable cwnd for cc in quic

Browse Source
This commit is contained in:
Larvan2
2023-06-18 00:47:26 +08:00
parent 61734e5cac
commit 6c8631d5cc
7 changed files with 101 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
transport/tuic/common/congestion.go
View File

@ -4,6 +4,7 @@ import (
"github.com/Dreamacro/clash/transport/tuic/congestion"
"github.com/metacubex/quic-go"
c "github.com/metacubex/quic-go/congestion"
)
const (
@ -11,7 +12,8 @@ const (
DefaultConnectionReceiveWindow = 67108864 // 64 MB/s
)
func SetCongestionController(quicConn quic.Connection, cc string) {
func SetCongestionController(quicConn quic.Connection, cc string, cwnd int) {
CWND := c.ByteCount(cwnd)
switch cc {
case "cubic":
quicConn.SetCongestionControl(
@ -36,7 +38,7 @@ func SetCongestionController(quicConn quic.Connection, cc string) {
congestion.NewBBRSender(
congestion.DefaultClock{},
congestion.GetInitialPacketSize(quicConn.RemoteAddr()),
congestion.InitialCongestionWindow*congestion.InitialMaxDatagramSize,
CWND*congestion.InitialMaxDatagramSize,
congestion.DefaultBBRMaxCongestionWindow*congestion.InitialMaxDatagramSize,
),
)

3
transport/tuic/v4/client.go
View File

@ -36,6 +36,7 @@ type ClientOption struct {
MaxUdpRelayPacketSize int
FastOpen bool
MaxOpenStreams int64
CWND int
}
type clientImpl struct {
@ -91,7 +92,7 @@ func (t *clientImpl) getQuicConn(ctx context.Context, dialer C.Dialer, dialFn co
return nil, err
}
common.SetCongestionController(quicConn, t.CongestionController)
common.SetCongestionController(quicConn, t.CongestionController, t.CWND)
go func() {
_ = t.sendAuthentication(quicConn)

3
transport/tuic/v4/server.go
View File

@ -33,6 +33,7 @@ type ServerOption struct {
CongestionController string
AuthenticationTimeout time.Duration
MaxUdpRelayPacketSize int
CWND int
}
type Server struct {
@ -57,7 +58,7 @@ func (s *Server) Serve() error {
if err != nil {
return err
}
common.SetCongestionController(conn, s.CongestionController)
common.SetCongestionController(conn, s.CongestionController, s.CWND)
h := &serverHandler{
Server: s,
quicConn: conn,

3
transport/tuic/v5/client.go
View File

@ -33,6 +33,7 @@ type ClientOption struct {
ReduceRtt bool
MaxUdpRelayPacketSize int
MaxOpenStreams int64
CWND int
}
type clientImpl struct {
@ -88,7 +89,7 @@ func (t *clientImpl) getQuicConn(ctx context.Context, dialer C.Dialer, dialFn co
return nil, err
}
common.SetCongestionController(quicConn, t.CongestionController)
common.SetCongestionController(quicConn, t.CongestionController, t.CWND)
go func() {
_ = t.sendAuthentication(quicConn)

4
transport/tuic/v5/server.go
View File

@ -6,6 +6,7 @@ import (
"context"
"crypto/tls"
"fmt"
"net"
"sync"
"sync/atomic"
@ -32,6 +33,7 @@ type ServerOption struct {
CongestionController string
AuthenticationTimeout time.Duration
MaxUdpRelayPacketSize int
CWND int
}
type Server struct {
@ -56,7 +58,7 @@ func (s *Server) Serve() error {
if err != nil {
return err
}
common.SetCongestionController(conn, s.CongestionController)
common.SetCongestionController(conn, s.CongestionController, s.CWND)
h := &serverHandler{
Server: s,
quicConn: conn,