From 45521d5680bf66cc833d98faeed20fc76a3fb0ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B2=B3?= <shixi_liuhe1@staff.sina.com.cn>
Date: Sat, 20 Apr 2019 10:45:04 +0800
Subject: [PATCH] =?UTF-8?q?Exit=20bug=E3=80=81web=20display?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 client/control.go      | 4 +++-
 lib/file/db.go         | 4 ++--
 lib/version/version.go | 2 +-
 server/server.go       | 2 +-
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/client/control.go b/client/control.go
index b7d9abc..6613c84 100644
--- a/client/control.go
+++ b/client/control.go
@@ -211,6 +211,8 @@ func NewConn(tp string, vkey string, server string, connType string, proxyUrl st
 	if err != nil {
 		return nil, err
 	}
+	connection.SetDeadline(time.Now().Add(time.Second * 10))
+	defer connection.SetDeadline(time.Time{})
 	c := conn.NewConn(connection)
 	if _, err := c.Write([]byte(common.CONN_TEST)); err != nil {
 		return nil, err
@@ -220,7 +222,7 @@ func NewConn(tp string, vkey string, server string, connType string, proxyUrl st
 	}
 	if b, err := c.GetShortContent(32); err != nil || crypt.Md5(version.GetVersion()) != string(b) {
 		logs.Error("The client does not match the server version. The current version of the client is", version.GetVersion())
-		os.Exit(0)
+		return nil, err
 	}
 	if _, err := c.Write([]byte(common.Getverifyval(vkey))); err != nil {
 		return nil, err
diff --git a/lib/file/db.go b/lib/file/db.go
index 7a611d5..69e33d6 100644
--- a/lib/file/db.go
+++ b/lib/file/db.go
@@ -64,7 +64,7 @@ func (s *DbUtils) GetClientList(start, length int, search, sort, order string, c
 			}
 			cnt++
 			if start--; start < 0 {
-				if length--; length > 0 {
+				if length--; length >= 0 {
 					list = append(list, v)
 				}
 			}
@@ -187,7 +187,7 @@ func (s *DbUtils) GetHost(start, length int, id int, search string) ([]*Host, in
 			if id == 0 || v.Client.Id == id {
 				cnt++
 				if start--; start < 0 {
-					if length--; length > 0 {
+					if length--; length >= 0 {
 						list = append(list, v)
 					}
 				}
diff --git a/lib/version/version.go b/lib/version/version.go
index e1a1219..a8e21dd 100644
--- a/lib/version/version.go
+++ b/lib/version/version.go
@@ -1,6 +1,6 @@
 package version
 
-const VERSION = "0.22.4"
+const VERSION = "0.22.5"
 
 // Compulsory minimum version, Minimum downward compatibility to this version
 func GetVersion() string {
diff --git a/server/server.go b/server/server.go
index e5c7f9d..d5d0f63 100644
--- a/server/server.go
+++ b/server/server.go
@@ -242,7 +242,7 @@ func GetTunnel(start, length int, typeVal string, clientId int, search string) (
 				v.Client.IsConnect = false
 			}
 			if start--; start < 0 {
-				if length--; length > 0 {
+				if length--; length >= 0 {
 					if _, ok := RunList[v.Id]; ok {
 						v.RunStatus = true
 					} else {