ppn/olcng
3
0
Fork 0
mirror of https://github.com/openlibrecommunity/olcng.git synced 2026-07-03 14:05:17 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Refactor hev tunnel timeout settings

Browse Source 
Changed hev tunnel read/write timeout preference to accept separate TCP and UDP values in seconds (default 300,60). Updated related keys, default values, and UI strings across multiple languages to reflect the new format and units.
https://github.com/2dust/v2rayNG/issues/5057
This commit is contained in:
2dust
2025-12-24 20:07:34 +08:00
parent 60ddf5ba6b
commit cfae051109
12 changed files with 23 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
V2rayNG/app/src/main/java/com/v2ray/ang/AppConfig.kt
+2 -2
View File
@@ -65,7 +65,7 @@ object AppConfig {
const val PREF_GEO_FILES_SOURCES = "pref_geo_files_sources"
const val PREF_USE_HEV_TUNNEL = "pref_use_hev_tunnel"
const val PREF_HEV_TUNNEL_LOGLEVEL = "pref_hev_tunnel_loglevel"
const val PREF_HEV_TUNNEL_RW_TIMEOUT = "pref_hev_tunnel_rw_timeout"
const val PREF_HEV_TUNNEL_RW_TIMEOUT = "pref_hev_tunnel_rw_timeout_v2"
/** Cache keys. */
const val CACHE_SUBSCRIPTION_ID = "cache_subscription_id"
@@ -173,7 +173,7 @@ object AppConfig {
const val VPN_MTU = 1500
/** hev-sock5-tunnel read-write-timeout value */
const val HEVTUN_RW_TIMEOUT = "300000"
const val HEVTUN_RW_TIMEOUT = "300,60"
// Google API rule constants
const val GOOGLEAPIS_CN_DOMAIN = "domain:googleapis.cn"
V2rayNG/app/src/main/java/com/v2ray/ang/service/TProxyService.kt
+10 -2
View File
@@ -71,9 +71,17 @@ class TProxyService(
appendLine(" address: ${AppConfig.LOOPBACK}")
appendLine(" udp: 'udp'")
// Read-write timeout settings
val timeoutSetting = MmkvManager.decodeSettingsString(AppConfig.PREF_HEV_TUNNEL_RW_TIMEOUT) ?: AppConfig.HEVTUN_RW_TIMEOUT
val parts = timeoutSetting.split(",")
.map { it.trim() }
.filter { it.isNotEmpty() }
val tcpTimeout = parts.getOrNull(0)?.toIntOrNull() ?: 300
val udpTimeout = parts.getOrNull(1)?.toIntOrNull() ?: 60
appendLine("misc:")
appendLine(" tcp-read-write-timeout: ${MmkvManager.decodeSettingsString(AppConfig.PREF_HEV_TUNNEL_RW_TIMEOUT) ?: AppConfig.HEVTUN_RW_TIMEOUT}")
appendLine(" udp-read-write-timeout: ${MmkvManager.decodeSettingsString(AppConfig.PREF_HEV_TUNNEL_RW_TIMEOUT) ?: AppConfig.HEVTUN_RW_TIMEOUT}")
appendLine(" tcp-read-write-timeout: ${tcpTimeout * 1000}")
appendLine(" udp-read-write-timeout: ${udpTimeout * 1000}")
appendLine(" log-level: ${MmkvManager.decodeSettingsString(AppConfig.PREF_HEV_TUNNEL_LOGLEVEL) ?: "warn"}")
}
}
V2rayNG/app/src/main/res/values-ar/strings.xml
+1 -1
View File
@@ -253,7 +253,7 @@
<string name="title_pref_use_hev_tunnel">Enable New TUN Feature</string>
<string name="summary_pref_use_hev_tunnel">When enabled, TUN will use hev-socks5-tunnel; otherwise, it will use badvpn-tun2socks.</string>
<string name="title_pref_hev_tunnel_loglevel">Hev Tun Log Level</string>
<string name="title_pref_hev_tunnel_rw_timeout">Hev Tun Read/Write Timeout (ms, default 300000)</string>
<string name="title_pref_hev_tunnel_rw_timeout">Hev Tun read/write timeout (seconds) (tcp,udp default 300,60)</string>
<string name="title_logcat">Logcat</string>
<string name="logcat_copy">نسخ</string>
V2rayNG/app/src/main/res/values-bn/strings.xml
+1 -1
View File
@@ -253,7 +253,7 @@
<string name="title_pref_use_hev_tunnel">Enable New TUN Feature</string>
<string name="summary_pref_use_hev_tunnel">When enabled, TUN will use hev-socks5-tunnel; otherwise, it will use badvpn-tun2socks.</string>
<string name="title_pref_hev_tunnel_loglevel">Hev Tun Log Level</string>
<string name="title_pref_hev_tunnel_rw_timeout">Hev Tun Read/Write Timeout (ms, default 300000)</string>
<string name="title_pref_hev_tunnel_rw_timeout">Hev Tun read/write timeout (seconds) (tcp,udp default 300,60)</string>
<string name="title_logcat">লগক্যাট</string>
<string name="logcat_copy">কপি করুন</string>
V2rayNG/app/src/main/res/values-bqi-rIR/strings.xml
+1 -1
View File
@@ -253,7 +253,7 @@
<string name="title_pref_use_hev_tunnel">فعال کردن ویژیی نۊ TUN</string>
<string name="summary_pref_use_hev_tunnel">ٱر ک فعال بۊ، TUN ایا hev-socks5-tunnel ن و کار اگره؛ ٱندی ز badvpn-tun2socks.</string>
<string name="title_pref_hev_tunnel_loglevel">Hev Tun سئت گوزارشا</string>
<string name="title_pref_hev_tunnel_rw_timeout">Hev Tun زمووݩ مندیر بیڌن خوندن وو هؽل کردن (میلی سانیه، پؽش فرز 300000)</string>
<string name="title_pref_hev_tunnel_rw_timeout">Hev Tun read/write timeout (seconds) (tcp,udp default 300,60)</string>
<string name="title_logcat">گوزارشا</string>
<string name="logcat_copy">لف گیری</string>
V2rayNG/app/src/main/res/values-fa/strings.xml
+1 -1
View File
@@ -250,7 +250,7 @@
<string name="title_pref_use_hev_tunnel">فعالسازی قابلیت TUN جدید</string>
<string name="summary_pref_use_hev_tunnel">در صورت فعال بودن، TUN از hev-socks5-tunnel استفاده می‌کند؛ در غیر این صورت از badvpn-tun2socks.</string>
<string name="title_pref_hev_tunnel_loglevel">سطح گزارشات Hev Tun</string>
<string name="title_pref_hev_tunnel_rw_timeout">زمان انتظار خواندن/نوشتن (میلی‌ثانیه، پیش‌فرض ۳۰۰۰۰۰) Hev Tun</string>
<string name="title_pref_hev_tunnel_rw_timeout">Hev Tun read/write timeout (seconds) (tcp,udp default 300,60)</string>
<string name="title_logcat">گزارشات</string>
<string name="logcat_copy">کپی</string>
V2rayNG/app/src/main/res/values-ru/strings.xml
+1 -1
View File
@@ -252,7 +252,7 @@
<string name="title_pref_use_hev_tunnel">Использовать новую версию TUN</string>
<string name="summary_pref_use_hev_tunnel">Если включено, TUN будет использовать hev-socks5-tunnel, иначе будет использоваться badvpn-tun2socks</string>
<string name="title_pref_hev_tunnel_loglevel">Подробность журнала HevTun</string>
<string name="title_pref_hev_tunnel_rw_timeout">Время ожидания чтения/записи HevTun (мс, по умолчанию 300000)</string>
<string name="title_pref_hev_tunnel_rw_timeout">Hev Tun read/write timeout (seconds) (tcp,udp default 300,60)</string>
<string name="title_logcat">Журнал</string>
<string name="logcat_copy">Копировать</string>
V2rayNG/app/src/main/res/values-vi/strings.xml
+1 -1
View File
@@ -253,7 +253,7 @@
<string name="title_pref_use_hev_tunnel">Enable New TUN Feature</string>
<string name="summary_pref_use_hev_tunnel">When enabled, TUN will use hev-socks5-tunnel; otherwise, it will use badvpn-tun2socks.</string>
<string name="title_pref_hev_tunnel_loglevel">Hev Tun Log Level</string>
<string name="title_pref_hev_tunnel_rw_timeout">Hev Tun Read/Write Timeout (ms, default 300000)</string>
<string name="title_pref_hev_tunnel_rw_timeout">Hev Tun read/write timeout (seconds) (tcp,udp default 300,60)</string>
<string name="title_logcat">Logcat</string>
<string name="logcat_copy">Sao chép</string>
V2rayNG/app/src/main/res/values-zh-rCN/strings.xml
+1 -1
View File
@@ -251,7 +251,7 @@
<string name="title_pref_use_hev_tunnel">启用新的 TUN 功能</string>
<string name="summary_pref_use_hev_tunnel">选择启用后 TUN 将使用 hev-socks5-tunnel 否则使用 badvpn-tun2socks</string>
<string name="title_pref_hev_tunnel_loglevel">HevTun 日志级别</string>
<string name="title_pref_hev_tunnel_rw_timeout">HevTun 读写超时 (ms, 默认 300000)</string>
<string name="title_pref_hev_tunnel_rw_timeout">HevTun 读写超时(秒) (tcp,udp 默认 300,60)</string>
<string name="title_logcat">Logcat</string>
<string name="logcat_copy">复制</string>
V2rayNG/app/src/main/res/values-zh-rTW/strings.xml
+1 -1
View File
@@ -251,7 +251,7 @@
<string name="title_pref_use_hev_tunnel">啟用新 TUN 功能</string>
<string name="summary_pref_use_hev_tunnel">選擇啟用後，TUN 將使用 hev-socks5-tunnel，否則使用 badvpn-tun2socks。</string>
<string name="title_pref_hev_tunnel_loglevel">HevTun 日誌級別</string>
<string name="title_pref_hev_tunnel_rw_timeout">HevTun 讀寫逾時 (ms, 預設 300000)</string>
<string name="title_pref_hev_tunnel_rw_timeout">HevTun 讀寫逾時(秒) (tcp,udp 預設 300,60)</string>
<string name="title_logcat">Logcat</string>
<string name="logcat_copy">複製</string>
V2rayNG/app/src/main/res/values/strings.xml
+1 -1
View File
@@ -257,7 +257,7 @@
<string name="title_pref_use_hev_tunnel">Enable New TUN Feature</string>
<string name="summary_pref_use_hev_tunnel">When enabled, TUN will use hev-socks5-tunnel; otherwise, it will use badvpn-tun2socks.</string>
<string name="title_pref_hev_tunnel_loglevel">Hev Tun Log Level</string>
<string name="title_pref_hev_tunnel_rw_timeout">Hev Tun Read/Write Timeout (ms, default 300000)</string>
<string name="title_pref_hev_tunnel_rw_timeout">Hev Tun read/write timeout (seconds) (tcp,udp default 300,60)</string>
<string name="title_logcat">Logcat</string>
<string name="logcat_copy">Copy</string>
V2rayNG/app/src/main/res/xml/pref_settings.xml
+2 -3
View File
@@ -93,9 +93,8 @@
android:title="@string/title_pref_hev_tunnel_loglevel" />
<EditTextPreference
android:inputType="number"
android:key="pref_hev_tunnel_rw_timeout"
android:summary="300000"
android:key="pref_hev_tunnel_rw_timeout_v2"
android:summary="300,60"
android:title="@string/title_pref_hev_tunnel_rw_timeout" />
</PreferenceCategory>