Bump version 5.3.1

ShadowsocksR-Live · Feb 11, 2024 · fd6debb · fd6debb
1 parent 4752ef0
commit fd6debb
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -6,8 +6,8 @@ ext {
     sdkVersion = 33
     compileSdkVersion = 33
     buildToolsVersion = '31.0.0'
-    versionCode = 530
-    versionName = '5.3.0'
+    versionCode = 531
+    versionName = '5.3.1'
     resConfigs = ['zh-rCN']
 }
 

diff --git a/core/src/main/java/com/github/shadowsocks/bg/OverTlsWrapper.kt b/core/src/main/java/com/github/shadowsocks/bg/OverTlsWrapper.kt
@@ -8,7 +8,7 @@ object OverTlsWrapper {
     }
 
     @JvmStatic
-    external fun runClient(vpnService: VpnService, cofigPath: String, statPath: String, verbose: Boolean): Int
+    external fun runClient(vpnService: VpnService, cofigPath: String, statPath: String, verbosity: Int): Int
 
     @JvmStatic
     external fun stopClient(): Int

diff --git a/core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt b/core/src/main/java/com/github/shadowsocks/bg/ProxyInstance.kt
@@ -156,7 +156,8 @@ class ProxyInstance(val profile: Profile, private val route: String = profile.ro
         override fun run() {
             super.run()
             if (isOverTls) {
-                vpnService?.let { OverTlsWrapper.runClient(it, configPath(), statPath(), verbose()) }
+                val verbosity = if (verbose()) 5 else 3
+                vpnService?.let { OverTlsWrapper.runClient(it, configPath(), statPath(), verbosity) }
             } else {
                 cmd?.let { SsrClientWrapper.runSsrClient(it) }
             }

diff --git a/core/src/main/java/com/github/shadowsocks/bg/SsrVpnService.kt b/core/src/main/java/com/github/shadowsocks/bg/SsrVpnService.kt
@@ -245,7 +245,9 @@ class SsrVpnService : VpnService(), LocalDnsService.Interface {
         private val dnsOverTcp: Boolean
     ) : Thread() {
         override fun run() {
-            Tun2proxy.run(proxyUrl, tunFd, tunMtu, verbose, dnsOverTcp)
+            val verbosity = if (verbose) 5 else 3
+            val dnsStrategy = if (dnsOverTcp) 1 else 2
+            Tun2proxy.run(proxyUrl, tunFd, tunMtu.toChar(), verbosity, dnsStrategy)
         }
 
         fun terminate() {

diff --git a/core/src/main/java/com/github/shadowsocks/bg/Tun2proxy.kt b/core/src/main/java/com/github/shadowsocks/bg/Tun2proxy.kt
@@ -6,7 +6,7 @@ object Tun2proxy {
     }
 
     @JvmStatic
-    external fun run(proxyUrl: String, tunFd: Int, tunMtu: Int, verbose: Boolean, dnsOverTcp: Boolean): Int
+    external fun run(proxyUrl: String, tunFd: Int, tunMtu: Char, verbosity: Int, dnsStrategy: Int): Int
 
     @JvmStatic
     external fun stop(): Int

diff --git a/rust/overtls b/rust/overtls
diff --git a/rust/tun2proxy b/rust/tun2proxy
+4 −0		.cargo/config.toml
+4 −4		.github/workflows/release.yml
+1 −0		.gitignore
+1 −1		Cargo.toml
+1 −1		apple/overtls.xcodeproj/project.pbxproj
+7 −5		apple/overtls/OverTlsWrapper.m
+1 −1		apple/readme.md
+1 −1		ios-build.sh
+10 −27		readme-cn.md
+30 −14		readme.md
+7 −4		src/android.rs
+6 −5		src/api.rs
+2 −4		src/bin/overtls.rs
+62 −4		src/cmdopt.rs
+6 −5		src/dump_logger.rs
+2 −0		src/lib.rs