From a158ab160079201633b583dab0152ac419ae9280 Mon Sep 17 00:00:00 2001
From: arm64v8a <48624112+arm64v8a@users.noreply.github.com>
Date: Wed, 9 Aug 2023 18:23:27 +0900
Subject: [PATCH] update box
---
.../java/io/nekohasekai/sagernet/Constants.kt | 1 +
.../sagernet/database/DataStore.kt | 2 +-
.../nekohasekai/sagernet/fmt/ConfigBuilder.kt | 7 +++++-
.../nekohasekai/sagernet/fmt/tuic/TuicFmt.kt | 1 +
app/src/main/res/values/arrays.xml | 1 +
app/src/main/res/xml/global_preferences.xml | 2 +-
buildScript/init/action/go.sh | 4 ++--
buildScript/lib/core/get_source_env.sh | 2 +-
libcore/go.mod | 9 ++++----
libcore/go.sum | 22 ++++++++++---------
10 files changed, 30 insertions(+), 21 deletions(-)
diff --git a/app/src/main/java/io/nekohasekai/sagernet/Constants.kt b/app/src/main/java/io/nekohasekai/sagernet/Constants.kt
index 7372aba..95efeaa 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/Constants.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/Constants.kt
@@ -157,6 +157,7 @@ object Key {
object TunImplementation {
const val GVISOR = 0
const val SYSTEM = 1
+ const val MIXED = 1
}
object IPv6Mode {
diff --git a/app/src/main/java/io/nekohasekai/sagernet/database/DataStore.kt b/app/src/main/java/io/nekohasekai/sagernet/database/DataStore.kt
index eaad164..854f763 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/database/DataStore.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/database/DataStore.kt
@@ -157,7 +157,7 @@ object DataStore : OnPreferenceDataStoreChangeListener {
var connectionTestConcurrent by configurationStore.int("connectionTestConcurrent") { 5 }
var alwaysShowAddress by configurationStore.boolean(Key.ALWAYS_SHOW_ADDRESS)
- var tunImplementation by configurationStore.stringToInt(Key.TUN_IMPLEMENTATION) { TunImplementation.SYSTEM }
+ var tunImplementation by configurationStore.stringToInt(Key.TUN_IMPLEMENTATION) { TunImplementation.MIXED }
var profileTrafficStatistics by configurationStore.boolean(Key.PROFILE_TRAFFIC_STATISTICS) { true }
var yacdURL by configurationStore.string("yacdURL") { "http://127.0.0.1:9090/ui" }
diff --git a/app/src/main/java/io/nekohasekai/sagernet/fmt/ConfigBuilder.kt b/app/src/main/java/io/nekohasekai/sagernet/fmt/ConfigBuilder.kt
index 23896ff..6d6a0b6 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/fmt/ConfigBuilder.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/fmt/ConfigBuilder.kt
@@ -5,6 +5,7 @@ import io.nekohasekai.sagernet.IPv6Mode
import io.nekohasekai.sagernet.Key
import io.nekohasekai.sagernet.R
import io.nekohasekai.sagernet.SagerNet
+import io.nekohasekai.sagernet.TunImplementation
import io.nekohasekai.sagernet.bg.VpnService
import io.nekohasekai.sagernet.database.DataStore
import io.nekohasekai.sagernet.database.ProxyEntity
@@ -218,7 +219,11 @@ fun buildConfig(
if (isVPN) inbounds.add(Inbound_TunOptions().apply {
type = "tun"
tag = "tun-in"
- stack = if (DataStore.tunImplementation == 1) "system" else "gvisor"
+ stack = when (DataStore.tunImplementation) {
+ TunImplementation.GVISOR -> "gvisor"
+ TunImplementation.SYSTEM -> "system"
+ else -> "mixed"
+ }
endpoint_independent_nat = true
mtu = DataStore.mtu
domain_strategy = genDomainStrategy(DataStore.resolveDestination)
diff --git a/app/src/main/java/io/nekohasekai/sagernet/fmt/tuic/TuicFmt.kt b/app/src/main/java/io/nekohasekai/sagernet/fmt/tuic/TuicFmt.kt
index fc16469..38ecfec 100644
--- a/app/src/main/java/io/nekohasekai/sagernet/fmt/tuic/TuicFmt.kt
+++ b/app/src/main/java/io/nekohasekai/sagernet/fmt/tuic/TuicFmt.kt
@@ -30,6 +30,7 @@ fun buildSingBoxOutboundTuicBean(bean: TuicBean): SingBoxOptions.Outbound_TUICOp
if (bean.caText.isNotBlank()) {
certificate = bean.caText
}
+ disable_sni = bean.disableSNI
insecure = bean.allowInsecure
enabled = true
}
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
index 7975b23..c83c80f 100644
--- a/app/src/main/res/values/arrays.xml
+++ b/app/src/main/res/values/arrays.xml
@@ -417,6 +417,7 @@
- gVisor
- System
+ - Mixed
diff --git a/app/src/main/res/xml/global_preferences.xml b/app/src/main/res/xml/global_preferences.xml
index ac693cc..09622a6 100644
--- a/app/src/main/res/xml/global_preferences.xml
+++ b/app/src/main/res/xml/global_preferences.xml
@@ -33,7 +33,7 @@
app:title="@string/service_mode"
app:useSimpleSummaryProvider="true" />