Add Wireguard Mtu

2dust · Jan 16, 2024 · 8f62e42 · 8f62e42
1 parent 89b4060
commit 8f62e42
Show file tree

Hide file tree

Showing 12 changed files with 145 additions and 78 deletions.
diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/AppConfig.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/AppConfig.kt
@@ -62,8 +62,10 @@ object AppConfig {
     const val TAG_DIRECT = "direct"
     const val TAG_BLOCKED = "block"
 
-    const val androidpackagenamelistUrl = "https://raw.githubusercontent.com/2dust/androidpackagenamelist/master/proxy.txt"
-    const val v2rayCustomRoutingListUrl = "https://raw.githubusercontent.com/2dust/v2rayCustomRoutingList/master/"
+    const val androidpackagenamelistUrl =
+        "https://raw.githubusercontent.com/2dust/androidpackagenamelist/master/proxy.txt"
+    const val v2rayCustomRoutingListUrl =
+        "https://raw.githubusercontent.com/2dust/v2rayCustomRoutingList/master/"
     const val v2rayNGIssues = "https://github.com/2dust/v2rayNG/issues"
     const val v2rayNGWikiMode = "https://github.com/2dust/v2rayNG/wiki/Mode"
     const val v2rayNGPrivacyPolicy = "https://raw.githubusercontent.com/2dust/v2rayNG/master/CR.md"
@@ -76,6 +78,9 @@ object AppConfig {
     const val PORT_LOCAL_DNS = "10853"
     const val PORT_SOCKS = "10808"
     const val PORT_HTTP = "10809"
+    const val WIREGUARD_LOCAL_ADDRESS_V4 = "172.16.0.2/32"
+    const val WIREGUARD_LOCAL_ADDRESS_V6 = "2606:4700:110:8f81:d551:a0:532e:a2b3/128"
+    const val WIREGUARD_LOCAL_MTU = "1420"
 
     const val MSG_REGISTER_CLIENT = 1
     const val MSG_STATE_RUNNING = 11

diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/dto/V2rayConfig.kt
@@ -86,6 +86,7 @@ data class V2rayConfig(
                                    var secretKey: String? = null,
                                    val peers: List<WireGuardBean>? = null,
                                    var reserved: List<Int>? = null,
+                                   var mtu :Int? = null
         ) {
 
             data class VnextBean(var address: String = "",

diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/ServerActivity.kt
diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/V2rayConfigUtil.kt
@@ -7,6 +7,8 @@ import com.google.gson.*
 import com.tencent.mmkv.MMKV
 import com.v2ray.ang.AppConfig
 import com.v2ray.ang.AppConfig.ANG_PACKAGE
+import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V4
+import com.v2ray.ang.AppConfig.WIREGUARD_LOCAL_ADDRESS_V6
 import com.v2ray.ang.dto.V2rayConfig
 import com.v2ray.ang.dto.EConfigType
 import com.v2ray.ang.dto.ERoutingMode
@@ -428,7 +430,7 @@ object V2rayConfigUtil {
 
             if (protocol.equals(EConfigType.WIREGUARD.name, true)) {
                 var localTunAddr = if (outbound.settings?.address == null) {
-                    listOf("172.16.0.2/32", "2606:4700:110:8f81:d551:a0:532e:a2b3/128")
+                    listOf(WIREGUARD_LOCAL_ADDRESS_V4, WIREGUARD_LOCAL_ADDRESS_V6)
                 } else {
                     outbound.settings?.address as List<*>
                 }

diff --git a/V2rayNG/app/src/main/res/layout/activity_server_wireguard.xml b/V2rayNG/app/src/main/res/layout/activity_server_wireguard.xml
@@ -160,14 +160,13 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/server_lab_local_v4_address" />
+                android:text="@string/server_lab_local_address" />
 
             <EditText
-                android:id="@+id/et_local_v4_address"
+                android:id="@+id/et_local_address"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/edit_height"
                 android:inputType="text" />
-
         </LinearLayout>
 
         <LinearLayout
@@ -179,13 +178,13 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/server_lab_local_v6_address" />
+                android:text="@string/server_lab_local_mtu" />
 
             <EditText
-                android:id="@+id/et_local_v6_address"
+                android:id="@+id/et_local_mtu"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/edit_height"
-                android:inputType="text" />
+                android:inputType="number" />
 
         </LinearLayout>
 

diff --git a/V2rayNG/app/src/main/res/values-ar/strings.xml b/V2rayNG/app/src/main/res/values-ar/strings.xml
@@ -64,8 +64,8 @@
 	<string name="server_lab_short_id" translatable="false">ShortId</string>
 	<string name="server_lab_spider_x" translatable="false">SpiderX</string>
 	<string name="server_lab_reserved">Reserved (اختياري)</string>
-	<string name="server_lab_local_v4_address">العنوان المحلي IPv4(اختياري)</string>
-	<string name="server_lab_local_v6_address">العنوان المحلي IPv6(اختياري, يستخدم فقط عندما تفضل IPv6)</string>
+	<string name="server_lab_local_address">العنوان المحلي IPv4(اختياري)</string>
+	<string name="server_lab_local_mtu">Mtu(optional, default 1420)</string>
 	<string name="toast_success">نجاح</string>
 	<string name="toast_failure">فشل</string>
 	<string name="toast_none_data">لا يوجد شيء</string>

diff --git a/V2rayNG/app/src/main/res/values-fa/strings.xml b/V2rayNG/app/src/main/res/values-fa/strings.xml
@@ -61,8 +61,8 @@
     <string name="server_lab_encryption">رمزگذاری</string>
     <string name="server_lab_flow">جریان</string>
     <string name="server_lab_reserved">Reserved (اختیاری)</string>
-    <string name="server_lab_local_v4_address">آدرس محلی IPv4(اختیاری)</string>
-    <string name="server_lab_local_v6_address">آدرس محلی IPv6(اختیاری, فقط زمانی استفاده می شود که IPv6 را ترجیح می دهد)</string>
+    <string name="server_lab_local_address">آدرس محلی IPv4(اختیاری)</string>
+    <string name="server_lab_local_mtu">Mtu(optional, default 1420)</string>
     <string name="toast_success">موفقیت</string>
     <string name="toast_failure">شکست</string>
     <string name="toast_none_data">چیزی نیست</string>

diff --git a/V2rayNG/app/src/main/res/values-ru/strings.xml b/V2rayNG/app/src/main/res/values-ru/strings.xml
@@ -66,8 +66,8 @@
     <string name="server_lab_short_id" translatable="false">ShortId</string>
     <string name="server_lab_spider_x" translatable="false">SpiderX</string>
     <string name="server_lab_reserved">Reserved (необязательно)</string>
-    <string name="server_lab_local_v4_address">Локальный адрес IPv4 (необязательно)</string>
-    <string name="server_lab_local_v6_address">Локальный адрес IPv6 (необязательно, используется только если предпочитаете IPv6)</string>
+    <string name="server_lab_local_address">Локальный адрес IPv4 (необязательно)</string>
+    <string name="server_lab_local_mtu">Mtu(optional, default 1420)</string>
     <string name="toast_success">Успешно</string>
     <string name="toast_failure">Ошибка</string>
     <string name="toast_none_data">Ничего нет</string>

diff --git a/V2rayNG/app/src/main/res/values-vi/strings.xml b/V2rayNG/app/src/main/res/values-vi/strings.xml
@@ -60,8 +60,8 @@
     <string name="server_lab_encryption">Mã hóa</string>
     <string name="server_lab_flow">Kiểm soát lưu lượng (flow)</string>
     <string name="server_lab_reserved">Reserved (không bắt buộc)</string>
-    <string name="server_lab_local_v4_address">Địa chỉ cục bộ IPv4(không bắt buộc)</string>
-    <string name="server_lab_local_v6_address">Địa chỉ cục bộ IPv6 (không bắt buộc, chỉ sử dụng khi ưu tiên IPv6)</string>
+    <string name="server_lab_local_address">Địa chỉ cục bộ IPv4(không bắt buộc)</string>
+    <string name="server_lab_local_mtu">Mtu(optional, default 1420)</string>
     <string name="toast_success">Thành công!</string>
     <string name="toast_failure">Đã xảy ra lỗi, vui lòng thử lại!</string>
     <string name="toast_none_data">Không có gì ở đây</string>

diff --git a/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml b/V2rayNG/app/src/main/res/values-zh-rCN/strings.xml
@@ -60,8 +60,8 @@
     <string name="server_lab_encryption">加密方式(encryption)</string>
     <string name="server_lab_flow">流控(flow)</string>
     <string name="server_lab_reserved">Reserved(可选)</string>
-    <string name="server_lab_local_v4_address">本地 IPv4 地址(可选)</string>
-    <string name="server_lab_local_v6_address">本地 IPv6 地址(可选, 仅 IPv6 优先时使用)</string>
+    <string name="server_lab_local_address">本地地址(可选IPv4/IPv6，逗号隔开)</string>
+    <string name="server_lab_local_mtu">Mtu(可选, 默认1420)</string>
     <string name="toast_success">成功</string>
     <string name="toast_failure">失败</string>
     <string name="toast_none_data">没有数据</string>

diff --git a/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml b/V2rayNG/app/src/main/res/values-zh-rTW/strings.xml
@@ -60,8 +60,8 @@
     <string name="server_lab_encryption">加密 (encryption)</string>
     <string name="server_lab_flow">流程 (flow)</string>
     <string name="server_lab_reserved">Reserved (可選)</string>
-    <string name="server_lab_local_v4_address">本機 IPv4 位址(可選)</string>
-    <string name="server_lab_local_v6_address">本機 IPv6 位址(可選, 僅偏好 IPv6 時使用)</string>
+    <string name="server_lab_local_address">本機位址(可選IPv4/IPv6，逗號隔開)</string>
+    <string name="server_lab_local_mtu">Mtu(可選, 預設1420)</string>
     <string name="toast_success">成功</string>
     <string name="toast_failure">失敗</string>
     <string name="toast_none_data">無資料</string>

diff --git a/V2rayNG/app/src/main/res/values/strings.xml b/V2rayNG/app/src/main/res/values/strings.xml
@@ -67,8 +67,8 @@
     <string name="server_lab_spider_x" translatable="false">SpiderX</string>
     <string name="server_lab_secret_key" translatable="false">SecretKey</string>
     <string name="server_lab_reserved">Reserved(Optional)</string>
-    <string name="server_lab_local_v4_address">local address IPv4(Optional)</string>
-    <string name="server_lab_local_v6_address">local address IPv6(Optional, only used when prefer IPv6)</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="toast_success">Success</string>
     <string name="toast_failure">Failure</string>
     <string name="toast_none_data">There is nothing</string>