documentation: Bump version

Co-authored-by: anytls <anytls>

.github/workflows/build.yml

@@ -176,6 +176,9 @@ jobs:
           PKG_NAME="sing-box_${{ needs.calculate_version.outputs.version }}_${{ matrix.os }}_${{ matrix.arch }}${ARM_VERSION}"
           echo "DIR_NAME=${DIR_NAME}" >> "${GITHUB_ENV}"
           echo "PKG_NAME=${PKG_NAME}" >> "${GITHUB_ENV}"
+          PKG_VERSION="${{ needs.calculate_version.outputs.version }}"
+          PKG_VERSION="${PKG_VERSION//-/\~}"
+          echo "PKG_VERSION=${PKG_VERSION}" >> "${GITHUB_ENV}"
       - name: Package DEB
         if: matrix.debian != ''
         run: |
@@ -183,7 +186,7 @@ jobs:
           sudo gem install fpm
           sudo apt-get install -y debsigs
           fpm -t deb \
-            -v "${{ needs.calculate_version.outputs.version }}" \
+            -v "$PKG_VERSION" \
             -p "dist/${PKG_NAME}.deb" \
             --architecture ${{ matrix.debian }} \
             dist/sing-box=/usr/bin/sing-box
@@ -200,7 +203,7 @@ jobs:
           set -xeuo pipefail
           sudo gem install fpm
           fpm -t rpm \
-            -v "${{ needs.calculate_version.outputs.version }}" \
+            -v "$PKG_VERSION" \
             -p "dist/${PKG_NAME}.rpm" \
             --architecture ${{ matrix.rpm }} \
             dist/sing-box=/usr/bin/sing-box
@@ -219,7 +222,7 @@ jobs:
           sudo gem install fpm
           sudo apt-get install -y libarchive-tools
           fpm -t pacman \
-            -v "${{ needs.calculate_version.outputs.version }}" \
+            -v "$PKG_VERSION" \
             -p "dist/${PKG_NAME}.pkg.tar.zst" \
             --architecture ${{ matrix.pacman }} \
             dist/sing-box=/usr/bin/sing-box

.github/workflows/linux.yml

@@ -109,6 +109,11 @@ jobs:
         if: contains(needs.calculate_version.outputs.version, '-')
         run: |-
           echo "NAME=sing-box-beta" >> "$GITHUB_ENV"
+      - name: Set version
+        run: |-
+          PKG_VERSION="${{ needs.calculate_version.outputs.version }}"
+          PKG_VERSION="${PKG_VERSION//-/\~}"
+          echo "PKG_VERSION=${PKG_VERSION}" >> "${GITHUB_ENV}"
       - name: Package DEB
         if: matrix.debian != ''
         run: |
@@ -117,7 +122,7 @@ jobs:
           sudo apt-get install -y debsigs
           fpm -t deb \
             --name "${NAME}" \
-            -v "${{ needs.calculate_version.outputs.version }}" \
+            -v "$PKG_VERSION" \
             -p "dist/${NAME}_${{ needs.calculate_version.outputs.version }}_linux_${{ matrix.debian }}.deb" \
             --architecture ${{ matrix.debian }} \
             dist/sing-box=/usr/bin/sing-box
@@ -135,7 +140,7 @@ jobs:
           sudo gem install fpm
           fpm -t rpm \
             --name "${NAME}" \
-            -v "${{ needs.calculate_version.outputs.version }}" \
+            -v "$PKG_VERSION" \
             -p "dist/${NAME}_${{ needs.calculate_version.outputs.version }}_linux_${{ matrix.rpm }}.rpm" \
             --architecture ${{ matrix.rpm }} \
             dist/sing-box=/usr/bin/sing-box

clients/android

@@ -1 +1 @@
-Subproject commit aefe3c029096ddac5189a20a8203a68858152f0a
+Subproject commit 5659088bb3fe18b7095e4b9f868c181e27739617

dns/transport/quic/quic.go

@@ -140,12 +140,12 @@ func (t *Transport) exchange(ctx context.Context, message *mDNS.Msg, conn quic.C
 	if err != nil {
 		return nil, err
 	}
-	defer stream.Close()
-	defer stream.CancelRead(0)
 	err = transport.WriteMessage(stream, 0, message)
 	if err != nil {
+		stream.Close()
 		return nil, err
 	}
+	stream.Close()
 	return transport.ReadMessage(stream)
 }
 

docs/changelog.md

@@ -2,10 +2,16 @@
 icon: material/alert-decagram
 ---
 
-#### 1.12.0-alpha.20
+#### 1.12.0-alpha.21
 
 * Fixes and improvements
 
+### 1.11.6
+
+* Fixes and improvements
+
+_We are temporarily unable to update sing-box apps on the App Store because the reviewer mistakenly found that we violated the rules (TestFlight users are not affected)._
+
 #### 1.12.0-alpha.19
 
 * Update gVisor to 20250319.0

docs/configuration/inbound/anytls.md

@@ -44,10 +44,10 @@ Default padding scheme:
 
 ```
 stop=8
-0=34-120
+0=30-30
 1=100-400
-2=400-500,c,500-1000,c,400-500,c,500-1000,c,500-1000,c,400-500
+2=400-500,c,500-1000,c,500-1000,c,500-1000,c,500-1000
-3=500-1000
+3=9-9,500-1000
 4=500-1000
 5=500-1000
 6=500-1000

docs/configuration/inbound/anytls.zh.md

@@ -44,10 +44,10 @@ AnyTLS 填充方案行数组。
 
 ```
 stop=8
-0=34-120
+0=30-30
 1=100-400
-2=400-500,c,500-1000,c,400-500,c,500-1000,c,500-1000,c,400-500
+2=400-500,c,500-1000,c,500-1000,c,500-1000,c,500-1000
-3=500-1000
+3=9-9,500-1000
 4=500-1000
 5=500-1000
 6=500-1000

go.mod

@@ -3,7 +3,7 @@ module github.com/sagernet/sing-box
 go 1.23.1
 
 require (
-	github.com/anytls/sing-anytls v0.0.6
+	github.com/anytls/sing-anytls v0.0.7
 	github.com/caddyserver/certmagic v0.21.7
 	github.com/cloudflare/circl v1.6.0
 	github.com/cretz/bine v0.2.0

go.sum

@@ -8,8 +8,8 @@ github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa h1:LHTHcTQiSGT7V
 github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa/go.mod h1:cEWa1LVoE5KvSD9ONXsZrj0z6KqySlCCNKHlLzbqAt4=
 github.com/andybalholm/brotli v1.1.0 h1:eLKJA0d02Lf0mVpIDgYnqXcUn0GqVmEFny3VuID1U3M=
 github.com/andybalholm/brotli v1.1.0/go.mod h1:sms7XGricyQI9K10gOSf56VKKWS4oLer58Q+mhRPtnY=
-github.com/anytls/sing-anytls v0.0.6 h1:UatIjl/OvzWQGXQ1I2bAIkabL9WtihW0fA7G+DXGBUg=
+github.com/anytls/sing-anytls v0.0.7 h1:0Q5dHNB2sqkFAWZCyK2vjQ/ckI5Iz3V/Frf3k7mBrGc=
-github.com/anytls/sing-anytls v0.0.6/go.mod h1:7rjN6IukwysmdusYsrV51Fgu1uW6vsrdd6ctjnEAln8=
+github.com/anytls/sing-anytls v0.0.7/go.mod h1:7rjN6IukwysmdusYsrV51Fgu1uW6vsrdd6ctjnEAln8=
 github.com/bits-and-blooms/bitset v1.13.0 h1:bAQ9OPNFYbGHV6Nez0tmNI0RiEu7/hxlYJRUA0wFAVE=
 github.com/bits-and-blooms/bitset v1.13.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
 github.com/caddyserver/certmagic v0.21.7 h1:66KJioPFJwttL43KYSWk7ErSmE6LfaJgCQuhm8Sg6fg=

protocol/redirect/tproxy.go

@@ -121,14 +121,6 @@ func (t *TProxy) NewPacketEx(buffer *buf.Buffer, oob []byte, source M.Socksaddr)
 	t.udpNat.NewPacket([][]byte{buffer.Bytes()}, source, M.SocksaddrFromNetIP(destination), nil)
 }
 
-type tproxyPacketWriter struct {
-	ctx         context.Context
-	listener    *listener.Listener
-	source      netip.AddrPort
-	destination M.Socksaddr
-	conn        *net.UDPConn
-}
-
 func (t *TProxy) preparePacketConnection(source M.Socksaddr, destination M.Socksaddr, userData any) (bool, context.Context, N.PacketWriter, N.CloseHandlerFunc) {
 	ctx := log.ContextWithNewID(t.ctx)
 	writer := &tproxyPacketWriter{
@@ -142,15 +134,25 @@ func (t *TProxy) preparePacketConnection(source M.Socksaddr, destination M.Socks
 	}
 }
 
+type tproxyPacketWriter struct {
+	ctx         context.Context
+	listener    *listener.Listener
+	source      netip.AddrPort
+	destination M.Socksaddr
+	conn        *net.UDPConn
+}
+
 func (w *tproxyPacketWriter) WritePacket(buffer *buf.Buffer, destination M.Socksaddr) error {
 	defer buffer.Release()
-	conn := w.conn
+	if w.listener.ListenOptions().NetNs == "" {
-	if w.destination == destination && conn != nil {
+		conn := w.conn
-		_, err := conn.WriteToUDPAddrPort(buffer.Bytes(), w.source)
+		if w.destination == destination && conn != nil {
-		if err != nil {
+			_, err := conn.WriteToUDPAddrPort(buffer.Bytes(), w.source)
-			w.conn = nil
+			if err != nil {
+				w.conn = nil
+			}
+			return err
 		}
-		return err
 	}
 	var listenConfig net.ListenConfig
 	listenConfig.Control = control.Append(listenConfig.Control, control.ReuseAddr())
@@ -160,7 +162,7 @@ func (w *tproxyPacketWriter) WritePacket(buffer *buf.Buffer, destination M.Socks
 		return err
 	}
 	udpConn := packetConn.(*net.UDPConn)
-	if w.destination == destination {
+	if w.listener.ListenOptions().NetNs == "" && w.destination == destination {
 		w.conn = udpConn
 	} else {
 		defer udpConn.Close()