update libs

ShadowsocksR-Live · Nov 17, 2023 · 374e18c · 374e18c
1 parent 0d68bf9
commit 374e18c
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/core/src/main/java/com/github/shadowsocks/bg/SsrVpnService.kt b/core/src/main/java/com/github/shadowsocks/bg/SsrVpnService.kt
@@ -182,8 +182,9 @@ class SsrVpnService : VpnService(), LocalDnsService.Interface {
             val tunFd = conn.getFd()
             val tunMtu = VPN_MTU
             val verbose = BuildConfig.DEBUG
+            val dnsOverTcp = !(DataStore.useOverTLS && profile.isOverTLS())
 
-            tunThread = Tun2proxyThread(proxyUrl, tunFd, tunMtu, verbose)
+            tunThread = Tun2proxyThread(proxyUrl, tunFd, tunMtu, verbose, dnsOverTcp)
             tunThread?.isDaemon = true
             tunThread?.start()
         } else {
@@ -240,10 +241,11 @@ class SsrVpnService : VpnService(), LocalDnsService.Interface {
         private val proxyUrl: String,
         private val tunFd: Int,
         private val tunMtu: Int,
-        private val verbose: Boolean
+        private val verbose: Boolean,
+        private val dnsOverTcp: Boolean
     ) : Thread() {
         override fun run() {
-            Tun2proxy.run(proxyUrl, tunFd, tunMtu, verbose)
+            Tun2proxy.run(proxyUrl, tunFd, tunMtu, verbose, dnsOverTcp)
         }
 
         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): Int
+    external fun run(proxyUrl: String, tunFd: Int, tunMtu: Int, verbose: Boolean, dnsOverTcp: Boolean): Int
 
     @JvmStatic
     external fun stop(): Int

diff --git a/rust/Cargo.toml b/rust/Cargo.toml
@@ -1,2 +1,3 @@
 [workspace]
+resolver = "2"
 members = ["./overtls", "./tun2proxy"]
diff --git a/rust/overtls b/rust/overtls
diff --git a/rust/tun2proxy b/rust/tun2proxy
+1 −1		.cargo/config.toml
+9 −3		.github/workflows/release.yml
+1 −0		.gitignore
+36 −14		Cargo.toml
+1 −1		cbindgen.toml
+1 −1		readme-cn.md
+1 −1		readme.md
+1 −1		rustfmt.toml
+120 −0		src/active_ip_addr.rs
+10 −14		src/android.rs
+23 −11		src/api.rs
+21 −15		src/client.rs
+17 −3		src/cmdopt.rs
+27 −16		src/config.rs
+73 −0		src/dns.rs
+73 −0		src/dump_logger.rs
+5 −8		src/error.rs
+6 −4		src/lib.rs
+14 −7		src/main.rs
+83 −88		src/server.rs
+2 −2		src/tcp_stream.rs
+29 −7		src/tls.rs
+2 −7		src/traffic_audit.rs
+87 −37		src/udprelay.rs
+8 −13		src/weirduri.rs