v3.3.1 release

1. Fix an issue that v3.3.0 deb installation package can't be installed to Debian 11 and below (issue #154).
enfein · Aug 11, 2024 · c2f63c2 · c2f63c2
1 parent b32b39c
commit c2f63c2
Show file tree

Hide file tree

Showing 13 changed files with 31 additions and 61 deletions.
diff --git a/Makefile b/Makefile
@@ -32,7 +32,7 @@ PROJECT_NAME=$(shell basename "${ROOT}")
 # - pkg/version/current.go
 #
 # Use `tools/bump_version.sh` script to change all those files at one shot.
-VERSION="3.3.0"
+VERSION="3.3.1"
 
 # Build binaries and installation packages.
 .PHONY: build
@@ -224,7 +224,7 @@ deb-client-amd64: client-linux-amd64
 		mkdir -p build/package/mieru/amd64/debian/usr/bin;\
 		cp release/linux/amd64/mieru build/package/mieru/amd64/debian/usr/bin/;\
 		cd build/package/mieru/amd64;\
-		fakeroot dpkg-deb --build debian .;\
+		fakeroot dpkg-deb -Zxz --build debian .;\
 		cd "${ROOT}";\
 		mv build/package/mieru/amd64/mieru_${VERSION}_amd64.deb release/;\
 		cd release;\
@@ -239,7 +239,7 @@ deb-client-arm64: client-linux-arm64
 		mkdir -p build/package/mieru/arm64/debian/usr/bin;\
 		cp release/linux/arm64/mieru build/package/mieru/arm64/debian/usr/bin/;\
 		cd build/package/mieru/arm64;\
-		fakeroot dpkg-deb --build debian .;\
+		fakeroot dpkg-deb -Zxz --build debian .;\
 		cd "${ROOT}";\
 		mv build/package/mieru/arm64/mieru_${VERSION}_arm64.deb release/;\
 		cd release;\
@@ -254,7 +254,7 @@ deb-server-amd64: server-linux-amd64
 		mkdir -p build/package/mita/amd64/debian/usr/bin;\
 		cp release/linux/amd64/mita build/package/mita/amd64/debian/usr/bin/;\
 		cd build/package/mita/amd64;\
-		fakeroot dpkg-deb --build debian .;\
+		fakeroot dpkg-deb -Zxz --build debian .;\
 		cd "${ROOT}";\
 		mv build/package/mita/amd64/mita_${VERSION}_amd64.deb release/;\
 		cd release;\
@@ -269,7 +269,7 @@ deb-server-arm64: server-linux-arm64
 		mkdir -p build/package/mita/arm64/debian/usr/bin;\
 		cp release/linux/arm64/mita build/package/mita/arm64/debian/usr/bin/;\
 		cd build/package/mita/arm64;\
-		fakeroot dpkg-deb --build debian .;\
+		fakeroot dpkg-deb -Zxz --build debian .;\
 		cd "${ROOT}";\
 		mv build/package/mita/arm64/mita_${VERSION}_arm64.deb release/;\
 		cd release;\

diff --git a/build/package/mieru/amd64/debian/DEBIAN/control b/build/package/mieru/amd64/debian/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: mieru
-Version: 3.3.0
+Version: 3.3.1
 Section: net
 Priority: optional
 Architecture: amd64

diff --git a/build/package/mieru/amd64/rpm/mieru.spec b/build/package/mieru/amd64/rpm/mieru.spec
@@ -1,5 +1,5 @@
 Name: mieru
-Version: 3.3.0
+Version: 3.3.1
 Release: 1%{?dist}
 Summary: Mieru proxy client
 License: GPLv3+

diff --git a/build/package/mieru/arm64/debian/DEBIAN/control b/build/package/mieru/arm64/debian/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: mieru
-Version: 3.3.0
+Version: 3.3.1
 Section: net
 Priority: optional
 Architecture: arm64

diff --git a/build/package/mieru/arm64/rpm/mieru.spec b/build/package/mieru/arm64/rpm/mieru.spec
@@ -1,5 +1,5 @@
 Name: mieru
-Version: 3.3.0
+Version: 3.3.1
 Release: 1%{?dist}
 Summary: Mieru proxy client
 License: GPLv3+

diff --git a/build/package/mita/amd64/debian/DEBIAN/control b/build/package/mita/amd64/debian/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: mita
-Version: 3.3.0
+Version: 3.3.1
 Section: net
 Priority: optional
 Architecture: amd64

diff --git a/build/package/mita/amd64/rpm/mita.spec b/build/package/mita/amd64/rpm/mita.spec
@@ -1,5 +1,5 @@
 Name: mita
-Version: 3.3.0
+Version: 3.3.1
 Release: 1%{?dist}
 Summary: Mieru proxy server
 License: GPLv3+

diff --git a/build/package/mita/arm64/debian/DEBIAN/control b/build/package/mita/arm64/debian/DEBIAN/control
@@ -1,5 +1,5 @@
 Package: mita
-Version: 3.3.0
+Version: 3.3.1
 Section: net
 Priority: optional
 Architecture: arm64

diff --git a/build/package/mita/arm64/rpm/mita.spec b/build/package/mita/arm64/rpm/mita.spec
@@ -1,5 +1,5 @@
 Name: mita
-Version: 3.3.0
+Version: 3.3.1
 Release: 1%{?dist}
 Summary: Mieru proxy server
 License: GPLv3+

diff --git a/docs/server-install.md b/docs/server-install.md
@@ -8,32 +8,32 @@ Before installation and configuration, connect to the server via SSH and then ex
 
 ```sh
 # Debian / Ubuntu - X86_64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.3.0/mita_3.3.0_amd64.deb
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.3.1/mita_3.3.1_amd64.deb
 
 # Debian / Ubuntu - ARM 64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.3.0/mita_3.3.0_arm64.deb
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.3.1/mita_3.3.1_arm64.deb
 
 # RedHat / CentOS / Rocky Linux - X86_64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.3.0/mita-3.3.0-1.x86_64.rpm
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.3.1/mita-3.3.1-1.x86_64.rpm
 
 # RedHat / CentOS / Rocky Linux - ARM 64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.3.0/mita-3.3.0-1.aarch64.rpm
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.3.1/mita-3.3.1-1.aarch64.rpm
 ```
 
 ## Install mita package
 
 ```sh
 # Debian / Ubuntu - X86_64
-sudo dpkg -i mita_3.3.0_amd64.deb
+sudo dpkg -i mita_3.3.1_amd64.deb
 
 # Debian / Ubuntu - ARM 64
-sudo dpkg -i mita_3.3.0_arm64.deb
+sudo dpkg -i mita_3.3.1_arm64.deb
 
 # RedHat / CentOS / Rocky Linux - X86_64
-sudo rpm -Uvh --force mita-3.3.0-1.x86_64.rpm
+sudo rpm -Uvh --force mita-3.3.1-1.x86_64.rpm
 
 # RedHat / CentOS / Rocky Linux - ARM 64
-sudo rpm -Uvh --force mita-3.3.0-1.aarch64.rpm
+sudo rpm -Uvh --force mita-3.3.1-1.aarch64.rpm
 ```
 
 Those instructions can also be used to upgrade the version of mita software package.

diff --git a/docs/server-install.zh_CN.md b/docs/server-install.zh_CN.md
@@ -8,32 +8,32 @@
 
 ```sh
 # Debian / Ubuntu - X86_64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.3.0/mita_3.3.0_amd64.deb
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.3.1/mita_3.3.1_amd64.deb
 
 # Debian / Ubuntu - ARM 64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.3.0/mita_3.3.0_arm64.deb
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.3.1/mita_3.3.1_arm64.deb
 
 # RedHat / CentOS / Rocky Linux - X86_64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.3.0/mita-3.3.0-1.x86_64.rpm
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.3.1/mita-3.3.1-1.x86_64.rpm
 
 # RedHat / CentOS / Rocky Linux - ARM 64
-curl -LSO https://github.com/enfein/mieru/releases/download/v3.3.0/mita-3.3.0-1.aarch64.rpm
+curl -LSO https://github.com/enfein/mieru/releases/download/v3.3.1/mita-3.3.1-1.aarch64.rpm
 ```
 
 ## 安装 mita 软件包
 
 ```sh
 # Debian / Ubuntu - X86_64
-sudo dpkg -i mita_3.3.0_amd64.deb
+sudo dpkg -i mita_3.3.1_amd64.deb
 
 # Debian / Ubuntu - ARM 64
-sudo dpkg -i mita_3.3.0_arm64.deb
+sudo dpkg -i mita_3.3.1_arm64.deb
 
 # RedHat / CentOS / Rocky Linux - X86_64
-sudo rpm -Uvh --force mita-3.3.0-1.x86_64.rpm
+sudo rpm -Uvh --force mita-3.3.1-1.x86_64.rpm
 
 # RedHat / CentOS / Rocky Linux - ARM 64
-sudo rpm -Uvh --force mita-3.3.0-1.aarch64.rpm
+sudo rpm -Uvh --force mita-3.3.1-1.aarch64.rpm
 ```
 
 上述指令也可以用来升级 mita 软件包的版本。

diff --git a/pkg/congestion/bbr_sender.go b/pkg/congestion/bbr_sender.go
@@ -349,17 +349,14 @@ func (b *BBRSender) OnPacketSent(sentTime time.Time, bytesInFlight int64, packet
 	b.sampler.OnPacketSent(sentTime, packetNumber, bytes, bytesInFlight, hasRetransmittableData)
 	b.pacer.OnPacketSent(sentTime, bytes, b.PacingRate(bytesInFlight))
 	if log.IsLevelEnabled(log.TraceLevel) {
-		log.Tracef("[BBRSender %s] OnPacketSent(bytesInFlight=%d, packetNumber=%d, bytes=%d) => pacingBudget=%d", b.loggingContext, bytesInFlight, packetNumber, bytes, b.pacer.Budget(sentTime, b.PacingRate(bytesInFlight)))
+		log.Tracef("[BBRSender %s] OnPacketSent(bytesInFlight=%d, packetNumber=%d, bytes=%d), pacingRate=%d => pacingBudget=%d", b.loggingContext, bytesInFlight, packetNumber, bytes, b.PacingRate(bytesInFlight), b.pacer.Budget(sentTime, b.PacingRate(bytesInFlight)))
 	}
 }
 
 func (b *BBRSender) CanSend(bytesInFlight, bytes int64) bool {
 	b.mu.Lock()
 	defer b.mu.Unlock()
 	pacerCanSend := b.pacer.CanSend(time.Now(), bytes, b.PacingRate(bytesInFlight))
-	if log.IsLevelEnabled(log.TraceLevel) {
-		log.Tracef("[BBRSender %s] bytesInFlight=%d, congestionWindow=%d, pacerCanSend=%v", b.loggingContext, bytesInFlight, b.GetCongestionWindow(), pacerCanSend)
-	}
 	return bytesInFlight < b.GetCongestionWindow() && pacerCanSend
 }
 
@@ -395,17 +392,6 @@ func (b *BBRSender) IsProbingForMoreBandwidth() bool {
 }
 
 func (b *BBRSender) OnCongestionEvent(priorInFlight int64, eventTime time.Time, ackedPackets []AckedPacketInfo, lostPackets []LostPacketInfo) {
-	for _, ack := range ackedPackets {
-		if log.IsLevelEnabled(log.TraceLevel) {
-			log.Tracef("[BBRSender %s] OnCongestionEvent(priorInFlight=%d, ackedPacket=%v)", b.loggingContext, priorInFlight, ack)
-		}
-	}
-	for _, lost := range lostPackets {
-		if log.IsLevelEnabled(log.TraceLevel) {
-			log.Tracef("[BBRSender %s] OnCongestionEvent(priorInFlight=%d, lostPacket=%v)", b.loggingContext, priorInFlight, lost)
-		}
-	}
-
 	b.mu.Lock()
 	defer b.mu.Unlock()
 
@@ -559,10 +545,6 @@ func (b *BBRSender) UpdateBandwidthAndMinRTT(now time.Time, ackedPackets []Acked
 		if log.IsLevelEnabled(log.TraceLevel) {
 			log.Tracef("[BBRSender %s] Acknowledged packet %d => %v", b.loggingContext, acked.PacketNumber, bandwidthSample)
 		}
-		if bandwidthSample.bandwidth < 0 {
-			log.Debugf("[BBRSender %s] Acknowledged packet %d => negative bandwidth %d B/s. Sample is dropped.", b.loggingContext, acked.PacketNumber, bandwidthSample.bandwidth)
-			continue
-		}
 		b.lastSampleIsAppLimited = bandwidthSample.isAppLimited
 		if bandwidthSample.rtt > 0 {
 			sampleMinRTT = mathext.Min(sampleMinRTT, bandwidthSample.rtt)
@@ -809,18 +791,6 @@ func (b *BBRSender) CalculateCongestionWindow(bytesAcked int64) {
 	if log.IsLevelEnabled(log.TraceLevel) {
 		log.Tracef("[BBRSender %s] targetCongestionWindow=%d", b.loggingContext, targetWindow)
 	}
-	// if b.rttVarianceWeight > 0 && b.BandwidthEstimate() > 0 {
-	// 	targetWindow += int64(b.rttVarianceWeight * float64(b.rttStats.MeanDeviation()) * float64(b.BandwidthEstimate()) / float64(time.Second))
-	// } else if b.maxAggregationBytesMultiplier > 0 && b.isAtFullBandwidth {
-	// 	// Subtracting only half the bytesAckedSinceQueueDrained ensures sending
-	// 	// doesn't completely stop for a long period of time if the queue hasn't
-	// 	// been drained recently.
-	// 	if b.maxAggregationBytesMultiplier*float64(b.maxAckHeight.GetBest()) > float64(b.bytesAckedSinceQueueDrained)/2 {
-	// 		targetWindow += int64(b.maxAggregationBytesMultiplier*float64(b.maxAckHeight.GetBest()) - float64(b.bytesAckedSinceQueueDrained)/2)
-	// 	}
-	// } else if b.isAtFullBandwidth {
-	// 	targetWindow += b.maxAckHeight.GetBest()
-	// }
 
 	// Instead of immediately setting the target CWND as the new one, BBR grows
 	// the CWND towards targetWindow by only increasing it bytesAcked at a time.

diff --git a/pkg/version/current.go b/pkg/version/current.go
@@ -16,5 +16,5 @@
 package version
 
 const (
-	AppVersion = "3.3.0"
+	AppVersion = "3.3.1"
 )