Merge pull request #1126 from apernet/wip-fix-formatspeed

fix: incorrect speed conversion base
apernet · Jun 16, 2024 · c5e7aa3 · c5e7aa3
2 parents 4c2a905 + a852feb
commit c5e7aa3
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/app/cmd/speedtest.go b/app/cmd/speedtest.go
@@ -152,8 +152,8 @@ func formatSpeed(bytes uint32, duration time.Duration, useBytes bool) string {
 		speed *= 8
 	}
 	unitIndex := 0
-	for speed > 1024 && unitIndex < len(units)-1 {
-		speed /= 1024
+	for speed > 1000 && unitIndex < len(units)-1 {
+		speed /= 1000
 		unitIndex++
 	}
 	return fmt.Sprintf("%.2f %s", speed, units[unitIndex])

diff --git a/core/internal/congestion/bbr/bbr_sender.go b/core/internal/congestion/bbr/bbr_sender.go
@@ -976,8 +976,8 @@ func formatSpeed(bw Bandwidth) string {
 	bwf := float64(bw)
 	units := []string{"bps", "Kbps", "Mbps", "Gbps"}
 	unitIndex := 0
-	for bwf > 1024 && unitIndex < len(units)-1 {
-		bwf /= 1024
+	for bwf > 1000 && unitIndex < len(units)-1 {
+		bwf /= 1000
 		unitIndex++
 	}
 	return fmt.Sprintf("%.2f %s", bwf, units[unitIndex])