Shikong/Clash.Meta
1
0
Fork 0
mirror of https://gitclone.com/github.com/MetaCubeX/Clash.Meta synced 2025-02-23 07:13:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: sync hysteria2 bbr changes

Browse Source 
e0e75c4630
This commit is contained in:
wwqgtxx 2024-06-05 11:56:11 +08:00
parent 7b3c9e94e6
commit 063836fe5d
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
transport/tuic/congestion_v2/bbr_sender.go
View File

@ -62,7 +62,7 @@ const (
// Flag. // Flag.
defaultStartupFullLossCount = 8 defaultStartupFullLossCount = 8
quicBbr2DefaultLossThreshold = 0.02 quicBbr2DefaultLossThreshold = 0.02
maxBbrBurstPackets = 3 maxBbrBurstPackets = 10
) )
type bbrMode int type bbrMode int
@ -334,6 +334,8 @@ func (b *bbrSender) OnPacketSent(
} }
b.sampler.OnPacketSent(sentTime, packetNumber, bytes, bytesInFlight, isRetransmittable) b.sampler.OnPacketSent(sentTime, packetNumber, bytes, bytesInFlight, isRetransmittable)
b.maybeAppLimited(bytesInFlight)
} }
// CanSend implements the SendAlgorithm interface. // CanSend implements the SendAlgorithm interface.
@ -413,8 +415,6 @@ func (b *bbrSender) OnCongestionEventEx(priorInFlight congestion.ByteCount, even
// packet in lost_packets. // packet in lost_packets.
var lastPacketSendState sendTimeState var lastPacketSendState sendTimeState
b.maybeApplimited(priorInFlight)
// Update bytesInFlight // Update bytesInFlight
b.bytesInFlight = priorInFlight b.bytesInFlight = priorInFlight
for _, p := range ackedPackets { for _, p := range ackedPackets {
@ -541,7 +541,7 @@ func (b *bbrSender) setDrainGain(drainGain float64) {
b.drainGain = drainGain b.drainGain = drainGain
} }
// What's the current estimated bandwidth in bytes per second. // Get the current bandwidth estimate. Note that Bandwidth is in bits per second.
func (b *bbrSender) bandwidthEstimate() Bandwidth { func (b *bbrSender) bandwidthEstimate() Bandwidth {
return b.maxBandwidth.GetBest() return b.maxBandwidth.GetBest()
} }
@ -700,14 +700,13 @@ func (b *bbrSender) checkIfFullBandwidthReached(lastPacketSendState *sendTimeSta
} }
} }
func (b *bbrSender) maybeApplimited(bytesInFlight congestion.ByteCount) { func (b *bbrSender) maybeAppLimited(bytesInFlight congestion.ByteCount) {
congestionWindow := b.GetCongestionWindow() congestionWindow := b.GetCongestionWindow()
if bytesInFlight >= congestionWindow { if bytesInFlight >= congestionWindow {
return return
} }
availableBytes := congestionWindow - bytesInFlight availableBytes := congestionWindow - bytesInFlight
drainLimited := b.mode == bbrModeDrain && bytesInFlight > congestionWindow/2 if availableBytes > maxBbrBurstPackets*b.maxDatagramSize {
if !drainLimited || availableBytes > maxBbrBurstPackets*b.maxDatagramSize {
b.sampler.OnAppLimited() b.sampler.OnAppLimited()
} }
} }