1. add recover when parse data panic.

Author: seanchann

pkg/connection/tcp/ssclient/ssclient.go

@@ -158,7 +158,8 @@ func (c *Client) ParseTcpReq() (*protocol.SSProtocol, error) {
 	return ssProtocol, nil
 }
 
-func (c *Client) ParseReqData(buf []byte) ([]byte, error) {
+//ParseReqData parse request data
+func (c *Client) ParseReqData(buf []byte) (out []byte, err error) {
 	const (
 		dataLenLen  = 2
 		hmacSha1Len = 10
@@ -172,7 +173,7 @@ func (c *Client) ParseReqData(buf []byte) ([]byte, error) {
 		buf = make([]byte, headerLen)
 	}
 
-	if _, err := io.ReadFull(c, buf[:headerLen]); err != nil {
+	if _, err = io.ReadFull(c, buf[:headerLen]); err != nil {
 		return nil, err
 	}
 	dataLen := binary.BigEndian.Uint16(buf[:dataLenLen])
@@ -183,6 +184,14 @@ func (c *Client) ParseReqData(buf []byte) ([]byte, error) {
 		buf = make([]byte, dataLen)
 	}
 
+	defer func() {
+		if r := recover(); r != nil {
+			glog.Infof("bufferlen (%v) datalen(%v) headerlen(%v) dataend(%v)\r\n", len(buf), dataLen, headerLen, dataEndIdx)
+			glog.Errorf("panic information %v\r\n", r)
+			err = fmt.Errorf("panic in parse data")
+		}
+	}()
+
 	if _, err := io.ReadFull(c, buf[headerLen:dataEndIdx]); err != nil {
 		return nil, err
 	}

pkg/connection/tcp/tcp_server.go

@@ -85,6 +85,7 @@ func (tcpSrv *TCPServer) handleRequest(ctx context.Context, acceptConn net.Conn)
 		if limitConn > uint(tcpSrv.Config.MaxConnection) {
 			glog.Errorf("limit connection, refuse this connection(%v)", acceptConn)
 			acceptConn.Close()
+			return
 		}
 	}
 	limitConn++