Batyka/v2rayNG
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Resolve remote host names in the configuration file to IP addresses

Browse Source
This commit is contained in:
2dust
2025-04-17 14:08:45 +08:00
parent f0c0e2e83a
commit 83fd6efc17
10 changed files with 63 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/FmtBase.kt
View File

@@ -4,6 +4,8 @@ import com.v2ray.ang.AppConfig
import com.v2ray.ang.dto.NetworkType
import com.v2ray.ang.dto.ProfileItem
import com.v2ray.ang.extension.isNotNullEmpty
import com.v2ray.ang.handler.MmkvManager
import com.v2ray.ang.util.HttpUtil
import com.v2ray.ang.util.Utils
import java.net.URI
@@ -148,4 +150,9 @@ open class FmtBase {
return dicQuery
}
fun resolveHostToIP(server: String?): String {
return HttpUtil.resolveHostToIP(server.orEmpty(), MmkvManager.decodeSettingsBool(AppConfig.PREF_PREFER_IPV6) == true)
}
}

2
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/HttpFmt.kt
View File

@@ -16,7 +16,7 @@ object HttpFmt : FmtBase() {
val outboundBean = OutboundBean.create(EConfigType.HTTP)
outboundBean?.settings?.servers?.first()?.let { server ->
server.address = profileItem.server.orEmpty()
server.address = resolveHostToIP(profileItem.server)
server.port = profileItem.serverPort.orEmpty().toInt()
if (profileItem.username.isNotNullEmpty()) {
val socksUsersBean = OutboundBean.OutSettingsBean.ServersBean.SocksUsersBean()

2
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/ShadowsocksFmt.kt
View File

@@ -134,7 +134,7 @@ object ShadowsocksFmt : FmtBase() {
val outboundBean = OutboundBean.create(EConfigType.SHADOWSOCKS)
outboundBean?.settings?.servers?.first()?.let { server ->
server.address = profileItem.server.orEmpty()
server.address = resolveHostToIP(profileItem.server)
server.port = profileItem.serverPort.orEmpty().toInt()
server.password = profileItem.password
server.method = profileItem.method

2
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/SocksFmt.kt
View File

@@ -63,7 +63,7 @@ object SocksFmt : FmtBase() {
val outboundBean = OutboundBean.create(EConfigType.SOCKS)
outboundBean?.settings?.servers?.first()?.let { server ->
server.address = profileItem.server.orEmpty()
server.address = resolveHostToIP(profileItem.server)
server.port = profileItem.serverPort.orEmpty().toInt()
if (profileItem.username.isNotNullEmpty()) {
val socksUsersBean = OutboundBean.OutSettingsBean.ServersBean.SocksUsersBean()

2
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/TrojanFmt.kt
View File

@@ -63,7 +63,7 @@ object TrojanFmt : FmtBase() {
val outboundBean = OutboundBean.create(EConfigType.TROJAN)
outboundBean?.settings?.servers?.first()?.let { server ->
server.address = profileItem.server.orEmpty()
server.address = resolveHostToIP(profileItem.server)
server.port = profileItem.serverPort.orEmpty().toInt()
server.password = profileItem.password
server.flow = profileItem.flow

2
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VlessFmt.kt
View File

@@ -60,7 +60,7 @@ object VlessFmt : FmtBase() {
val outboundBean = OutboundBean.create(EConfigType.VLESS)
outboundBean?.settings?.vnext?.first()?.let { vnext ->
vnext.address = profileItem.server.orEmpty()
vnext.address = resolveHostToIP(profileItem.server)
vnext.port = profileItem.serverPort.orEmpty().toInt()
vnext.users[0].id = profileItem.password.orEmpty()
vnext.users[0].encryption = profileItem.method

2
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/VmessFmt.kt
View File

@@ -171,7 +171,7 @@ object VmessFmt : FmtBase() {
val outboundBean = OutboundBean.create(EConfigType.VMESS)
outboundBean?.settings?.vnext?.first()?.let { vnext ->
vnext.address = profileItem.server.orEmpty()
vnext.address = resolveHostToIP(profileItem.server)
vnext.port = profileItem.serverPort.orEmpty().toInt()
vnext.users[0].id = profileItem.password.orEmpty()
vnext.users[0].security = profileItem.method

2
V2rayNG/app/src/main/java/com/v2ray/ang/fmt/WireguardFmt.kt
View File

@@ -113,7 +113,7 @@ object WireguardFmt : FmtBase() {
wireguard.peers?.firstOrNull()?.let { peer ->
peer.publicKey = profileItem.publicKey.orEmpty()
peer.preSharedKey = profileItem.preSharedKey?.takeIf { it.isNotEmpty() }
peer.endpoint = Utils.getIpv6Address(profileItem.server) + ":${profileItem.serverPort}"
peer.endpoint = Utils.getIpv6Address(resolveHostToIP(profileItem.server)) + ":${profileItem.serverPort}"
}
wireguard.mtu = profileItem.mtu
wireguard.reserved = profileItem.reserved?.takeIf { it.isNotBlank() }?.split(",")?.filter { it.isNotBlank() }?.map { it.trim().toInt() }

14
V2rayNG/app/src/main/java/com/v2ray/ang/ui/MainRecyclerAdapter.kt
View File

@@ -27,6 +27,7 @@ import com.v2ray.ang.handler.MmkvManager
import com.v2ray.ang.helper.ItemTouchHelperAdapter
import com.v2ray.ang.helper.ItemTouchHelperViewHolder
import com.v2ray.ang.service.V2RayServiceManager
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.delay
import kotlinx.coroutines.launch
@@ -220,10 +221,15 @@ class MainRecyclerAdapter(val activity: MainActivity) : RecyclerView.Adapter<Mai
* @param guid The server unique identifier
*/
private fun shareFullContent(guid: String) {
if (AngConfigManager.shareFullContent2Clipboard(mActivity, guid) == 0) {
mActivity.toastSuccess(R.string.toast_success)
} else {
mActivity.toastError(R.string.toast_failure)
mActivity.lifecycleScope.launch(Dispatchers.IO) {
val result = AngConfigManager.shareFullContent2Clipboard(mActivity, guid)
launch(Dispatchers.Main) {
if (result == 0) {
mActivity.toastSuccess(R.string.toast_success)
} else {
mActivity.toastError(R.string.toast_failure)
}
}
}
}

40
V2rayNG/app/src/main/java/com/v2ray/ang/util/HttpUtil.kt
View File

@@ -9,13 +9,13 @@ import com.v2ray.ang.util.Utils.urlDecode
import java.io.IOException
import java.net.HttpURLConnection
import java.net.IDN
import java.net.InetAddress
import java.net.InetSocketAddress
import java.net.Proxy
import java.net.URL
object HttpUtil {
/**
* Converts a URL string to its ASCII representation.
*
@@ -33,6 +33,44 @@ object HttpUtil {
}
}
/**
* Resolves a hostname to an IP address, returns original input if it's already an IP
*
* @param host The hostname or IP address to resolve
* @param ipv6Preferred Whether to prefer IPv6 addresses, defaults to false
* @return The resolved IP address or the original input (if it's already an IP or resolution fails)
*/
fun resolveHostToIP(host: String, ipv6Preferred: Boolean = false): String {
try {
// If it's already an IP address, return it directly
if (Utils.isPureIpAddress(host)) {
return host
}
// Get all IP addresses
val addresses = InetAddress.getAllByName(host)
if (addresses.isEmpty()) {
return host
}
// Sort addresses based on preference
val sortedAddresses = if (ipv6Preferred) {
// IPv6 preferred (size 16 first, then size 4)
addresses.sortedByDescending { it.address.size }
} else {
// IPv4 preferred (size 4 first, then size 16)
addresses.sortedBy { it.address.size }
}
Log.i(AppConfig.TAG, "Resolved IPs for $host: ${sortedAddresses.joinToString { it.hostAddress ?: "unknown" }}")
// Return the first address after sorting
return sortedAddresses.first().hostAddress ?: host
} catch (e: Exception) {
Log.e(AppConfig.TAG, "Failed to resolve host to IP", e)
return host
}
}
/**
* Retrieves the content of a URL as a string.
*