From b7ab22d819fb9d9650d5ffd5a0800013d15f09e4 Mon Sep 17 00:00:00 2001
From: Andy Ye <35905412+TurboTheTurtle@users.noreply.github.com>
Date: Tue, 19 May 2026 14:53:47 -0700
Subject: [PATCH] Bind local DNS before starting proxy

---
 core/src/main/java/com/github/shadowsocks/bg/BaseService.kt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/src/main/java/com/github/shadowsocks/bg/BaseService.kt b/core/src/main/java/com/github/shadowsocks/bg/BaseService.kt
index f27f259d8..673f1d3c4 100644
--- a/core/src/main/java/com/github/shadowsocks/bg/BaseService.kt
+++ b/core/src/main/java/com/github/shadowsocks/bg/BaseService.kt
@@ -244,6 +244,8 @@ object BaseService {
             val context = if (Build.VERSION.SDK_INT < 24 || Core.user.isUserUnlocked) app else Core.deviceStorage
             val configRoot = context.noBackupFilesDir
             val udpFallback = data.udpFallback
+            // ss-local can resolve the remote server hostname as soon as it starts, so bind the local DNS socket first.
+            data.localDns = LocalDnsWorker(this::rawResolver).apply { start() }
             data.proxy!!.start(this,
                     File(Core.deviceStorage.noBackupFilesDir, "stat_main"),
                     File(configRoot, CONFIG_FILE),
@@ -254,7 +256,6 @@ object BaseService {
                     File(Core.deviceStorage.noBackupFilesDir, "stat_udp"),
                     File(configRoot, CONFIG_FILE_UDP),
                     "udp_only", false)
-            data.localDns = LocalDnsWorker(this::rawResolver).apply { start() }
         }
 
         fun startRunner() {