bug repair when high concurrent

lib/conn/snappy.go

@@ -1,41 +1,29 @@
 package conn
 
 import (
-	"github.com/cnlh/nps/lib/crypt"
-	"github.com/cnlh/nps/lib/lg"
 	"github.com/cnlh/nps/lib/pool"
 	"github.com/cnlh/nps/lib/rate"
 	"github.com/cnlh/nps/vender/github.com/golang/snappy"
-	"log"
 	"net"
 )
 
 type SnappyConn struct {
-	w     *snappy.Writer
-	r     *snappy.Reader
-	crypt bool
-	rate  *rate.Rate
+	w    *snappy.Writer
+	r    *snappy.Reader
+	rate *rate.Rate
 }
 
 func NewSnappyConn(conn net.Conn, crypt bool, rate *rate.Rate) *SnappyConn {
 	c := new(SnappyConn)
 	c.w = snappy.NewBufferedWriter(conn)
 	c.r = snappy.NewReader(conn)
-	c.crypt = crypt
 	c.rate = rate
 	return c
 }
 
-//snappy压缩写 包含加密
+//snappy压缩写
 func (s *SnappyConn) Write(b []byte) (n int, err error) {
-	n = len(b)
-	if s.crypt {
-		if b, err = crypt.AesEncrypt(b, []byte(cryptKey)); err != nil {
-			lg.Println("encode crypt error:", err)
-			return
-		}
-	}
-	if _, err = s.w.Write(b); err != nil {
+	if n, err = s.w.Write(b); err != nil {
 		return
 	}
 	if err = s.w.Flush(); err != nil {
@@ -47,24 +35,14 @@ func (s *SnappyConn) Write(b []byte) (n int, err error) {
 	return
 }
 
-//snappy压缩读 包含解密
+//snappy压缩读
 func (s *SnappyConn) Read(b []byte) (n int, err error) {
 	buf := pool.BufPool.Get().([]byte)
 	defer pool.BufPool.Put(buf)
 	if n, err = s.r.Read(buf); err != nil {
 		return
 	}
-	var bs []byte
-	if s.crypt {
-		if bs, err = crypt.AesDecrypt(buf[:n], []byte(cryptKey)); err != nil {
-			log.Println("decode crypt error:", err)
-			return
-		}
-	} else {
-		bs = buf[:n]
-	}
-	n = len(bs)
-	copy(b, bs)
+	copy(b, buf[:n])
 	if s.rate != nil {
 		s.rate.Get(int64(n))
 	}