Use any address as default DNS

Mygod · Mygod · commit 3a7ab2217925 · 2020-05-16T05:27:33.000+08:00
diff --git a/core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt b/core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt
@@ -121,7 +121,7 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro
         }.let { dns ->
             cmd += arrayListOf(
                     "--dns-relay", "${DataStore.listenAddress}:${DataStore.portLocalDns}",
-                    "--remote-dns", "${dns.host!!}:${if (dns.port < 0) 53 else dns.port}")
+                    "--remote-dns", "${dns.host ?: "0.0.0.0"}:${if (dns.port < 0) 53 else dns.port}")
         }
 
         if (route != Acl.ALL) {
diff --git a/mobile/src/main/java/com/github/shadowsocks/ProfileConfigFragment.kt b/mobile/src/main/java/com/github/shadowsocks/ProfileConfigFragment.kt
@@ -99,7 +99,6 @@ class ProfileConfigFragment : PreferenceFragmentCompat(),
         findPreference<Preference>(Key.metered)!!.apply {
             if (Build.VERSION.SDK_INT >= 28) isEnabled = serviceMode == Key.modeVpn else remove()
         }
-        findPreference<Preference>(Key.udpdns)!!.isEnabled = serviceMode != Key.modeProxy
         plugin = findPreference(Key.plugin)!!
         pluginConfigure = findPreference(Key.pluginConfigure)!!
         pluginConfigure.setOnBindEditTextListener(EditTextPreferenceModifiers.Monospace)

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro`
`121`	`121`	`}.let { dns ->`
`122`	`122`	`cmd += arrayListOf(`
`123`	`123`	`"--dns-relay", "${DataStore.listenAddress}:${DataStore.portLocalDns}",`
`124`		`- "--remote-dns", "${dns.host!!}:${if (dns.port < 0) 53 else dns.port}")`
	`124`	`+ "--remote-dns", "${dns.host ?: "0.0.0.0"}:${if (dns.port < 0) 53 else dns.port}")`
`125`	`125`	`}`
`126`	`126`
`127`	`127`	`if (route != Acl.ALL) {`
Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,6 @@ class ProfileConfigFragment : PreferenceFragmentCompat(),`
`99`	`99`	`findPreference<Preference>(Key.metered)!!.apply {`
`100`	`100`	`if (Build.VERSION.SDK_INT >= 28) isEnabled = serviceMode == Key.modeVpn else remove()`
`101`	`101`	`}`
`102`		`- findPreference<Preference>(Key.udpdns)!!.isEnabled = serviceMode != Key.modeProxy`
`103`	`102`	`plugin = findPreference(Key.plugin)!!`
`104`	`103`	`pluginConfigure = findPreference(Key.pluginConfigure)!!`
`105`	`104`	`pluginConfigure.setOnBindEditTextListener(EditTextPreferenceModifiers.Monospace)`