mirror of
https://github.com/2dust/v2rayNG.git
synced 2026-10-29 06:31:54 +00:00
feat(wireguard): add features from the new core version (#6290)
* feat(wireguard): add features from the new core version - The `local` value is no longer allowed for `remoteDNS`. If this value is passed in the profile, the core will panic while calling `netip.MustParseAddr`. - Add the `targetStrategy` field to `OutboundBean`. - The `domainStrategy` field has been removed from `OutSettingsBean`. Any value passed for `domainStrategy` is now ignored. * update locales - ru,en - handwritten. - other - AI-generated.
This commit is contained in:
10 files changed
+11
-13
No files matched your search
@@ -259,9 +259,7 @@ object CoreOutboundBuilder {
|
|||||||
?.ifEmpty { null }
|
?.ifEmpty { null }
|
||||||
?: listOf(AppConfig.WIREGUARD_LOCAL_REMOTE_DNS)
|
?: listOf(AppConfig.WIREGUARD_LOCAL_REMOTE_DNS)
|
||||||
|
|
||||||
val remotes = if (rawDNS.size == 1 && rawDNS[0] == "local") {
|
val remotes = if (MmkvManager.decodeSettingsBool(AppConfig.PREF_IPV6_ENABLED) == true) {
|
||||||
rawDNS
|
|
||||||
} else if (MmkvManager.decodeSettingsBool(AppConfig.PREF_IPV6_ENABLED) == true) {
|
|
||||||
rawDNS
|
rawDNS
|
||||||
} else {
|
} else {
|
||||||
val ipv4Dns = rawDNS.filter { !it.contains(":") }
|
val ipv4Dns = rawDNS.filter { !it.contains(":") }
|
||||||
|
|||||||
@@ -69,7 +69,8 @@ data class V2rayConfig(
|
|||||||
var settings: OutSettingsBean? = null,
|
var settings: OutSettingsBean? = null,
|
||||||
var streamSettings: StreamSettingsBean? = null,
|
var streamSettings: StreamSettingsBean? = null,
|
||||||
val sendThrough: String? = null,
|
val sendThrough: String? = null,
|
||||||
var mux: MuxBean? = MuxBean(false)
|
var mux: MuxBean? = MuxBean(false),
|
||||||
|
var targetStrategy: String? = null
|
||||||
) {
|
) {
|
||||||
data class OutSettingsBean(
|
data class OutSettingsBean(
|
||||||
/*Common */
|
/*Common */
|
||||||
@@ -99,7 +100,6 @@ data class V2rayConfig(
|
|||||||
var reserved: List<Int>? = null,
|
var reserved: List<Int>? = null,
|
||||||
var mtu: Int? = null,
|
var mtu: Int? = null,
|
||||||
var remoteDNS: List<String>? = null,
|
var remoteDNS: List<String>? = null,
|
||||||
var domainStrategy: String? = null,
|
|
||||||
) {
|
) {
|
||||||
data class WireGuardBean(
|
data class WireGuardBean(
|
||||||
var publicKey: String = "",
|
var publicKey: String = "",
|
||||||
|
|||||||
@@ -103,7 +103,7 @@
|
|||||||
<string name="server_lab_reserved">Reserved (اختياري، مفصول بفواصل)</string>
|
<string name="server_lab_reserved">Reserved (اختياري، مفصول بفواصل)</string>
|
||||||
<string name="server_lab_local_address">العنوان المحلي (اختياري IPv4/IPv6، مفصولة بفواصل)</string>
|
<string name="server_lab_local_address">العنوان المحلي (اختياري IPv4/IPv6، مفصولة بفواصل)</string>
|
||||||
<string name="server_lab_local_mtu">MTU (اختياري، الافتراضي 1420)</string>
|
<string name="server_lab_local_mtu">MTU (اختياري، الافتراضي 1420)</string>
|
||||||
<string name="server_lab_remote_dns">remoteDNS (اختياري، عناوين IPv4/IPv6 مفصولة بفواصل، أو "local" لاستخدام DNS الجهاز)</string>
|
<string name="server_lab_remote_dns">remoteDNS (اختياري، عناوين IPv4/IPv6 مفصولة بفواصل)</string>
|
||||||
<string name="server_lab_kcp_mtu">mKCP MTU (اختياري، الافتراضي 1350)</string>
|
<string name="server_lab_kcp_mtu">mKCP MTU (اختياري، الافتراضي 1350)</string>
|
||||||
<string name="server_lab_kcp_tti">mKCP TTI (اختياري، الافتراضي 50 مللي ثانية)</string>
|
<string name="server_lab_kcp_tti">mKCP TTI (اختياري، الافتراضي 50 مللي ثانية)</string>
|
||||||
<string name="toast_success">نجاح</string>
|
<string name="toast_success">نجاح</string>
|
||||||
|
|||||||
@@ -103,7 +103,7 @@
|
|||||||
<string name="server_lab_reserved">Reserved (ঐচ্ছিক, কমা দিয়ে পৃথক)</string>
|
<string name="server_lab_reserved">Reserved (ঐচ্ছিক, কমা দিয়ে পৃথক)</string>
|
||||||
<string name="server_lab_local_address">স্থানীয় ঠিকানা (ঐচ্ছিক IPv4/IPv6, কমা দ্বারা পৃথক করা)</string>
|
<string name="server_lab_local_address">স্থানীয় ঠিকানা (ঐচ্ছিক IPv4/IPv6, কমা দ্বারা পৃথক করা)</string>
|
||||||
<string name="server_lab_local_mtu">MTU (ঐচ্ছিক, ডিফল্ট 1420)</string>
|
<string name="server_lab_local_mtu">MTU (ঐচ্ছিক, ডিফল্ট 1420)</string>
|
||||||
<string name="server_lab_remote_dns">remoteDNS (ঐচ্ছিক, কমা দ্বারা পৃথক করা IPv4/IPv6 ঠিকানা, অথবা ডিভাইসের DNS ব্যবহার করতে "local")</string>
|
<string name="server_lab_remote_dns">remoteDNS (ঐচ্ছিক, কমা দ্বারা পৃথক করা IPv4/IPv6 ঠিকানা)</string>
|
||||||
<string name="server_lab_kcp_mtu">mKCP MTU (ঐচ্ছিক, ডিফল্ট 1350)</string>
|
<string name="server_lab_kcp_mtu">mKCP MTU (ঐচ্ছিক, ডিফল্ট 1350)</string>
|
||||||
<string name="server_lab_kcp_tti">mKCP TTI (ঐচ্ছিক, ডিফল্ট 50 মিলিসেকেন্ড)</string>
|
<string name="server_lab_kcp_tti">mKCP TTI (ঐচ্ছিক, ডিফল্ট 50 মিলিসেকেন্ড)</string>
|
||||||
<string name="toast_success">সফল</string>
|
<string name="toast_success">সফল</string>
|
||||||
|
|||||||
@@ -103,7 +103,7 @@
|
|||||||
<string name="server_lab_reserved">Reserved (اختیاری، جدا شده با کاما)</string>
|
<string name="server_lab_reserved">Reserved (اختیاری، جدا شده با کاما)</string>
|
||||||
<string name="server_lab_local_address">آدرس محلی (IPv4/IPv6 اختیاری، جدا شده با کاما)</string>
|
<string name="server_lab_local_address">آدرس محلی (IPv4/IPv6 اختیاری، جدا شده با کاما)</string>
|
||||||
<string name="server_lab_local_mtu">MTU (اختیاری، پیشفرض 1420)</string>
|
<string name="server_lab_local_mtu">MTU (اختیاری، پیشفرض 1420)</string>
|
||||||
<string name="server_lab_remote_dns">remoteDNS (اختیاری، آدرسهای IPv4/IPv6 جدا شده با کاما، یا "local" برای استفاده از DNS دستگاه)</string>
|
<string name="server_lab_remote_dns">remoteDNS (اختیاری، آدرسهای IPv4/IPv6 جدا شده با کاما)</string>
|
||||||
<string name="server_lab_kcp_mtu">mKCP MTU (اختیاری، پیشفرض 1350)</string>
|
<string name="server_lab_kcp_mtu">mKCP MTU (اختیاری، پیشفرض 1350)</string>
|
||||||
<string name="server_lab_kcp_tti">mKCP TTI (اختیاری، پیشفرض 50 میلیثانیه)</string>
|
<string name="server_lab_kcp_tti">mKCP TTI (اختیاری، پیشفرض 50 میلیثانیه)</string>
|
||||||
<string name="toast_success">موفقیتآمیز</string>
|
<string name="toast_success">موفقیتآمیز</string>
|
||||||
|
|||||||
@@ -103,7 +103,7 @@
|
|||||||
<string name="server_lab_reserved">Reserved (необязательно, через запятую)</string>
|
<string name="server_lab_reserved">Reserved (необязательно, через запятую)</string>
|
||||||
<string name="server_lab_local_address">Локальный адрес (необязательно, IPv4/IPv6 через запятую)</string>
|
<string name="server_lab_local_address">Локальный адрес (необязательно, IPv4/IPv6 через запятую)</string>
|
||||||
<string name="server_lab_local_mtu">MTU (необязательно, по умолчанию 1420)</string>
|
<string name="server_lab_local_mtu">MTU (необязательно, по умолчанию 1420)</string>
|
||||||
<string name="server_lab_remote_dns">remoteDNS (необязательно, IPv4/IPv6-адреса через запятую, либо "local" для использования локального DNS)</string>
|
<string name="server_lab_remote_dns">remoteDNS (необязательно, IPv4/IPv6-адреса через запятую)</string>
|
||||||
<string name="server_lab_kcp_mtu">mKCP MTU (необязательно, по умолчанию 1350)</string>
|
<string name="server_lab_kcp_mtu">mKCP MTU (необязательно, по умолчанию 1350)</string>
|
||||||
<string name="server_lab_kcp_tti">mKCP TTI (необязательно, по умолчанию 50 мс)</string>
|
<string name="server_lab_kcp_tti">mKCP TTI (необязательно, по умолчанию 50 мс)</string>
|
||||||
<string name="toast_success">Успешно</string>
|
<string name="toast_success">Успешно</string>
|
||||||
|
|||||||
@@ -103,7 +103,7 @@
|
|||||||
<string name="server_lab_reserved">Reserved (không bắt buộc, phân cách bằng dấu phẩy)</string>
|
<string name="server_lab_reserved">Reserved (không bắt buộc, phân cách bằng dấu phẩy)</string>
|
||||||
<string name="server_lab_local_address">Địa chỉ cục bộ (IPv4/IPv6 không bắt buộc, phân cách bằng dấu phẩy)</string>
|
<string name="server_lab_local_address">Địa chỉ cục bộ (IPv4/IPv6 không bắt buộc, phân cách bằng dấu phẩy)</string>
|
||||||
<string name="server_lab_local_mtu">MTU (không bắt buộc, mặc định 1420)</string>
|
<string name="server_lab_local_mtu">MTU (không bắt buộc, mặc định 1420)</string>
|
||||||
<string name="server_lab_remote_dns">remoteDNS (tùy chọn, các địa chỉ IPv4/IPv6 cách nhau bằng dấu phẩy, hoặc "local" để dùng DNS của thiết bị)</string>
|
<string name="server_lab_remote_dns">remoteDNS (tùy chọn, các địa chỉ IPv4/IPv6 cách nhau bằng dấu phẩy)</string>
|
||||||
<string name="server_lab_kcp_mtu">mKCP MTU (không bắt buộc, mặc định 1350)</string>
|
<string name="server_lab_kcp_mtu">mKCP MTU (không bắt buộc, mặc định 1350)</string>
|
||||||
<string name="server_lab_kcp_tti">mKCP TTI (không bắt buộc, mặc định 50 ms)</string>
|
<string name="server_lab_kcp_tti">mKCP TTI (không bắt buộc, mặc định 50 ms)</string>
|
||||||
<string name="toast_success">Thành công!</string>
|
<string name="toast_success">Thành công!</string>
|
||||||
|
|||||||
@@ -103,7 +103,7 @@
|
|||||||
<string name="server_lab_reserved">Reserved (可选,逗号隔开)</string>
|
<string name="server_lab_reserved">Reserved (可选,逗号隔开)</string>
|
||||||
<string name="server_lab_local_address">本地地址 (可选 IPv4/IPv6,逗号隔开)</string>
|
<string name="server_lab_local_address">本地地址 (可选 IPv4/IPv6,逗号隔开)</string>
|
||||||
<string name="server_lab_local_mtu">MTU(可选,默认 1420)</string>
|
<string name="server_lab_local_mtu">MTU(可选,默认 1420)</string>
|
||||||
<string name="server_lab_remote_dns">remoteDNS(可选,多个 IPv4/IPv6 地址用逗号分隔,或填写 "local" 使用设备本地 DNS)</string>
|
<string name="server_lab_remote_dns">remoteDNS(可选,多个 IPv4/IPv6 地址用逗号分隔)</string>
|
||||||
<string name="server_lab_kcp_mtu">mKCP MTU(可选,默认 1350)</string>
|
<string name="server_lab_kcp_mtu">mKCP MTU(可选,默认 1350)</string>
|
||||||
<string name="server_lab_kcp_tti">mKCP TTI(可选,默认 50 毫秒)</string>
|
<string name="server_lab_kcp_tti">mKCP TTI(可选,默认 50 毫秒)</string>
|
||||||
<string name="toast_success">成功</string>
|
<string name="toast_success">成功</string>
|
||||||
|
|||||||
@@ -103,7 +103,7 @@
|
|||||||
<string name="server_lab_reserved">Reserved (可選,逗號隔開)</string>
|
<string name="server_lab_reserved">Reserved (可選,逗號隔開)</string>
|
||||||
<string name="server_lab_local_address">本機位址 (可選 IPv4/IPv6,逗號隔開)</string>
|
<string name="server_lab_local_address">本機位址 (可選 IPv4/IPv6,逗號隔開)</string>
|
||||||
<string name="server_lab_local_mtu">MTU(可選,預設 1420)</string>
|
<string name="server_lab_local_mtu">MTU(可選,預設 1420)</string>
|
||||||
<string name="server_lab_remote_dns">remoteDNS(選填,多個 IPv4/IPv6 位址以逗號分隔,或輸入 "local" 使用裝置本機 DNS)</string>
|
<string name="server_lab_remote_dns">remoteDNS(選填,多個 IPv4/IPv6 位址以逗號分隔)</string>
|
||||||
<string name="server_lab_kcp_mtu">mKCP MTU(可選,預設 1350)</string>
|
<string name="server_lab_kcp_mtu">mKCP MTU(可選,預設 1350)</string>
|
||||||
<string name="server_lab_kcp_tti">mKCP TTI(可選,預設 50 毫秒)</string>
|
<string name="server_lab_kcp_tti">mKCP TTI(可選,預設 50 毫秒)</string>
|
||||||
<string name="toast_success">成功</string>
|
<string name="toast_success">成功</string>
|
||||||
|
|||||||
@@ -103,7 +103,7 @@
|
|||||||
<string name="server_lab_reserved">Reserved (optional, separated by commas)</string>
|
<string name="server_lab_reserved">Reserved (optional, separated by commas)</string>
|
||||||
<string name="server_lab_local_address">Local address (optional IPv4/IPv6, separated by commas)</string>
|
<string name="server_lab_local_address">Local address (optional IPv4/IPv6, separated by commas)</string>
|
||||||
<string name="server_lab_local_mtu">MTU (optional, default 1420)</string>
|
<string name="server_lab_local_mtu">MTU (optional, default 1420)</string>
|
||||||
<string name="server_lab_remote_dns">remoteDNS (optional, comma-separated IPv4/IPv6, or "local" to use device DNS)</string>
|
<string name="server_lab_remote_dns">remoteDNS (optional, comma-separated IPv4/IPv6)</string>
|
||||||
<string name="server_lab_kcp_mtu">mKCP MTU (optional, default 1350)</string>
|
<string name="server_lab_kcp_mtu">mKCP MTU (optional, default 1350)</string>
|
||||||
<string name="server_lab_kcp_tti">mKCP TTI (optional, default 50 ms)</string>
|
<string name="server_lab_kcp_tti">mKCP TTI (optional, default 50 ms)</string>
|
||||||
<string name="toast_success">Success</string>
|
<string name="toast_success">Success</string>
|
||||||
|
|||||||
Reference in new issue
Block a user