From 4e0ae9d13ba25024cf4f432bb3091ed84c6b74a7 Mon Sep 17 00:00:00 2001
From: rankun <rankun@bytedance.com>
Date: Fri, 12 Jul 2019 11:52:12 +0800
Subject: [PATCH] =?UTF-8?q?update:=E5=AE=8C=E5=96=84forward=E9=87=8D?=
 =?UTF-8?q?=E8=BF=9E=E6=9C=BA=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 QtScrcpy/device/server/server.cpp | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/QtScrcpy/device/server/server.cpp b/QtScrcpy/device/server/server.cpp
index fcd6c83..21237a8 100644
--- a/QtScrcpy/device/server/server.cpp
+++ b/QtScrcpy/device/server/server.cpp
@@ -10,6 +10,7 @@
 #define DEVICE_SERVER_PATH "/data/local/tmp/scrcpy-server.jar"
 #define DEVICE_NAME_FIELD_LENGTH 64
 #define SOCKET_NAME "qtscrcpy"
+#define MAX_CONNECT_COUNT 20
 
 Server::Server(QObject *parent) : QObject(parent)
 {
@@ -200,6 +201,12 @@ QTcpSocket *Server::getControlSocket()
 
 void Server::stop()
 {
+    if (m_tunnelForward) {
+        stopConnectTimeoutTimer();
+    } else {
+        stopAcceptTimeoutTimer();
+    }
+
     if (m_videoSocket) {
         m_videoSocket->close();
         m_videoSocket->deleteLater();
@@ -327,7 +334,7 @@ void Server::onConnectTimer()
 {
     // device server need time to start
     // 这里连接太早时间不够导致安卓监听socket还没有建立，readInfo会失败，所以采取定时重试策略
-    // 每隔100ms尝试一次，最多尝试100次
+    // 每隔100ms尝试一次，最多尝试MAX_CONNECT_COUNT次
     QString deviceName;
     QSize deviceSize;
     bool success = false;
@@ -338,7 +345,7 @@ void Server::onConnectTimer()
     videoSocket->connectToHost(QHostAddress::LocalHost, m_params.localPort);
     if (!videoSocket->waitForConnected(1000)) {
         // 连接到adb很快的，这里失败不重试
-        m_connectCount = 10;
+        m_connectCount = MAX_CONNECT_COUNT;
         qWarning("video socket connect to server failed");
         goto result;
     }
@@ -346,7 +353,7 @@ void Server::onConnectTimer()
     controlSocket->connectToHost(QHostAddress::LocalHost, m_params.localPort);
     if (!controlSocket->waitForConnected(1000)) {
         // 连接到adb很快的，这里失败不重试
-        m_connectCount = 10;
+        m_connectCount = MAX_CONNECT_COUNT;
         qWarning("control socket connect to server failed");
         goto result;
     }
@@ -366,7 +373,7 @@ void Server::onConnectTimer()
         }
     } else {
         qWarning("connect to server failed");
-        m_connectCount = 10;
+        m_connectCount = MAX_CONNECT_COUNT;
         goto result;
     }
 
@@ -389,7 +396,7 @@ result:
         controlSocket->deleteLater();
     }
 
-    if (10 <= m_connectCount++) {
+    if (MAX_CONNECT_COUNT <= m_connectCount++) {
         stopConnectTimeoutTimer();
         stop();
         emit connectToResult(false);