Merge branch 'fix-#172'

yyyar · Oct 23, 2018 · b366c87 · b366c87
2 parents d4bdbab + 5fd0c92
commit b366c87
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 2 deletions.
diff --git a/src/server/tcp/server.go b/src/server/tcp/server.go
@@ -357,9 +357,17 @@ func (this *Server) handle(ctx *core.TcpContext) {
 		select {
 		case s, ok := <-cs:
 			isRx = ok
+			if !ok {
+				cs = nil
+				continue
+			}
 			this.scheduler.IncrementRx(*backend, s.CountWrite)
 		case s, ok := <-bs:
 			isTx = ok
+			if !ok {
+				bs = nil
+				continue
+			}
 			this.scheduler.IncrementTx(*backend, s.CountWrite)
 		}
 	}

diff --git a/src/utils/tls/sni/sni.go b/src/utils/tls/sni/sni.go
@@ -40,14 +40,21 @@ func Sniff(conn net.Conn, readTimeout time.Duration) (net.Conn, string, error) {
 	buf := pool.Get().([]byte)
 	defer pool.Put(buf)
 
-	conn.SetReadDeadline(time.Now().Add(readTimeout))
+	err := conn.SetReadDeadline(time.Now().Add(readTimeout))
+	if err != nil {
+		return nil, "", err
+	}
+
 	i, err := conn.Read(buf)
 
 	if err != nil {
 		return nil, "", err
 	}
 
-	conn.SetReadDeadline(time.Time{}) // Reset read deadline
+	err = conn.SetReadDeadline(time.Time{}) // Reset read deadline
+	if err != nil {
+		return nil, "", err
+	}
 
 	hostname := extractHostname(buf[0:i])