From f54faacbf69171e565912197fc7c72d0222015a7 Mon Sep 17 00:00:00 2001 From: yuhan6665 <1588741+yuhan6665@users.noreply.github.com> Date: Sat, 9 May 2020 22:38:54 -0400 Subject: [PATCH] Close connecting sockets when user test tcping again --- .../kotlin/com/v2ray/ang/ui/MainActivity.kt | 1 + .../main/kotlin/com/v2ray/ang/util/Utils.kt | 22 +++++++++++++++++-- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt index 045f681e..65447d19 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/ui/MainActivity.kt @@ -240,6 +240,7 @@ class MainActivity : BaseActivity(), NavigationView.OnNavigationItemSelectedList } R.id.ping_all -> { + Utils.closeAllTcpSockets() for (k in 0 until configs.vmess.count()) { configs.vmess[k].testResult = "" adapter.updateConfigList() diff --git a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt index b986add4..0703105a 100644 --- a/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt +++ b/V2rayNG/app/src/main/kotlin/com/v2ray/ang/util/Utils.kt @@ -48,6 +48,8 @@ import libv2ray.Libv2ray object Utils { + val tcpTestingSockets = ArrayList() + /** * convert string to editalbe for kotlin * @@ -497,19 +499,35 @@ object Utils { fun socketConnectTime(url: String, port: Int): Long { try { + val socket = Socket() + synchronized(this) { + tcpTestingSockets.add(socket) + } val start = System.currentTimeMillis() - val socket = Socket(url, port) + socket.connect(InetSocketAddress(url, port)) val time = System.currentTimeMillis() - start + synchronized(this) { + tcpTestingSockets.remove(socket) + } socket.close() return time } catch (e: UnknownHostException) { e.printStackTrace() } catch (e: IOException) { - e.printStackTrace() + Log.d(AppConfig.ANG_PACKAGE, "socketConnectTime IOException: $e") } catch (e: Exception) { e.printStackTrace() } return -1 } + + fun closeAllTcpSockets() { + synchronized(this) { + tcpTestingSockets.forEach { + it?.close() + } + tcpTestingSockets.clear() + } + } }