fix: dns

Author: hiddify-com

.github/workflows/build.yml

@@ -104,10 +104,10 @@ jobs:
           - { os: windows, arch: amd64, legacy_win7: true, legacy_name: "windows-7" }
           - { os: windows, arch: "386", legacy_win7: true, legacy_name: "windows-7" }
 
-          - { os: android, arch: arm64, ndk: "aarch64-linux-android23" }
-          - { os: android, arch: arm, ndk: "armv7a-linux-androideabi23" }
-          - { os: android, arch: amd64, ndk: "x86_64-linux-android23" }
-          - { os: android, arch: "386", ndk: "i686-linux-android23" }
+          # - { os: android, arch: arm64, ndk: "aarch64-linux-android23" }
+          # - { os: android, arch: arm, ndk: "armv7a-linux-androideabi23" }
+          # - { os: android, arch: amd64, ndk: "x86_64-linux-android23" }
+          # - { os: android, arch: "386", ndk: "i686-linux-android23" }
     steps:
       - name: Checkout
         uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5
@@ -140,22 +140,22 @@ jobs:
         run: |-
           echo "PATH=$HOME/go/go_win7/bin:$PATH" >> $GITHUB_ENV
           echo "GOROOT=$HOME/go/go_win7" >> $GITHUB_ENV
-      - name: Setup Android NDK
-        if: matrix.os == 'android'
-        uses: nttld/setup-ndk@v1
-        with:
-          ndk-version: r28
-          local-cache: true
-      - name: Clone cronet-go
-        if: matrix.naive
-        run: |
-          set -xeuo pipefail
-          CRONET_GO_VERSION=$(cat .github/CRONET_GO_VERSION)
-          git init ~/cronet-go
-          git -C ~/cronet-go remote add origin https://github.com/sagernet/cronet-go.git
-          git -C ~/cronet-go fetch --depth=1 origin "$CRONET_GO_VERSION"
-          git -C ~/cronet-go checkout FETCH_HEAD
-          git -C ~/cronet-go submodule update --init --recursive --depth=1
+      # - name: Setup Android NDK
+      #   if: matrix.os == 'android'
+      #   uses: nttld/setup-ndk@v1
+      #   with:
+      #     ndk-version: r28
+      #     local-cache: true
+      # - name: Clone cronet-go
+      #   if: matrix.naive
+      #   run: |
+      #     set -xeuo pipefail
+      #     CRONET_GO_VERSION=$(cat .github/CRONET_GO_VERSION)
+      #     git init ~/cronet-go
+      #     git -C ~/cronet-go remote add origin https://github.com/sagernet/cronet-go.git
+      #     git -C ~/cronet-go fetch --depth=1 origin "$CRONET_GO_VERSION"
+      #     git -C ~/cronet-go checkout FETCH_HEAD
+      #     git -C ~/cronet-go submodule update --init --recursive --depth=1
       - name: Cache Chromium toolchain
         if: matrix.naive
         id: cache-chromium-toolchain

dns/transport/multi/multi.go

@@ -78,13 +78,17 @@ func (m *Transport) Exchange(ctx context.Context, msg *mDNS.Msg) (*mDNS.Msg, err
 
 	return m.exchangeParallel(ctx, msg)
 }
-func (m *Transport) exchangeSerial(ctx context.Context, msg *mDNS.Msg) (*mDNS.Msg, error) {
+func (m *Transport) exchangeSerial(parent context.Context, msg *mDNS.Msg) (*mDNS.Msg, error) {
+	ctx, cancel := context.WithTimeout(parent, 10*time.Second)
+	defer cancel()
 	var lastErr error
 	var lastResp *mDNS.Msg
 
 	for _, tr := range m.transports {
-		if ctx.Err() != nil {
-			break
+		select {
+		case <-ctx.Done():
+			return nil, ctx.Err()
+		default:
 		}
 
 		resp, err := tr.Exchange(ctx, msg)
@@ -110,7 +114,7 @@ func (m *Transport) exchangeSerial(ctx context.Context, msg *mDNS.Msg) (*mDNS.Ms
 	return nil, E.New("no dns response")
 }
 func (m *Transport) exchangeParallel(parent context.Context, msg *mDNS.Msg) (*mDNS.Msg, error) {
-	ctx, cancel := context.WithTimeout(parent, 10*time.Second)
+	ctx, cancel := context.WithTimeout(parent, 5*time.Second)
 	defer cancel()
 
 	type result struct {