chore: add new bbr implementation

xishang0128 · Sep 30, 2023 · 828b5ad · 828b5ad
1 parent fedad26
commit 828b5ad
Show file tree

Hide file tree

Showing 15 changed files with 2,439 additions and 694 deletions.
diff --git a/transport/tuic/common/congestion.go b/transport/tuic/common/congestion.go
@@ -2,6 +2,7 @@ package common
 
 import (
 	"github.com/Dreamacro/clash/transport/tuic/congestion"
+	congestionv2 "github.com/Dreamacro/clash/transport/tuic/congestion_v2"
 
 	"github.com/metacubex/quic-go"
 	c "github.com/metacubex/quic-go/congestion"
@@ -17,29 +18,23 @@ func SetCongestionController(quicConn quic.Connection, cc string, cwnd int) {
 		cwnd = 32
 	}
 	switch cc {
-	case "cubic":
+	case "bbr_meta_v1":
 		quicConn.SetCongestionControl(
-			congestion.NewCubicSender(
-				congestion.DefaultClock{},
-				congestion.GetInitialPacketSize(quicConn.RemoteAddr()),
-				false,
-			),
-		)
-	case "new_reno":
-		quicConn.SetCongestionControl(
-			congestion.NewCubicSender(
+			congestion.NewBBRSender(
 				congestion.DefaultClock{},
 				congestion.GetInitialPacketSize(quicConn.RemoteAddr()),
-				true,
+				c.ByteCount(cwnd)*congestion.InitialMaxDatagramSize,
+				congestion.DefaultBBRMaxCongestionWindow*congestion.InitialMaxDatagramSize,
 			),
 		)
+	case "bbr_meta_v2":
+		fallthrough
 	case "bbr":
 		quicConn.SetCongestionControl(
-			congestion.NewBBRSender(
-				congestion.DefaultClock{},
-				congestion.GetInitialPacketSize(quicConn.RemoteAddr()),
-				c.ByteCount(cwnd)*congestion.InitialMaxDatagramSize,
-				congestion.DefaultBBRMaxCongestionWindow*congestion.InitialMaxDatagramSize,
+			congestionv2.NewBbrSender(
+				congestionv2.DefaultClock{},
+				congestionv2.GetInitialPacketSize(quicConn.RemoteAddr()),
+				c.ByteCount(cwnd),
 			),
 		)
 	}

diff --git a/transport/tuic/congestion/cubic.go b/transport/tuic/congestion/cubic.go