remove some useless code introduced since ota support

gpontop · Dec 16, 2015 · cb20fe4 · cb20fe4
1 parent 186bb44
commit cb20fe4
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 14 deletions.
diff --git a/cmd/shadowsocks-server/server.go b/cmd/shadowsocks-server/server.go
@@ -105,10 +105,6 @@ const logCntDelta = 100
 var connCnt int
 var nextLogConnCnt int = logCntDelta
 
-type isClosed struct {
-	isClosed bool
-}
-
 func handleConnection(conn *ss.Conn, auth bool) {
 	var host string
 

diff --git a/shadowsocks/encrypt.go b/shadowsocks/encrypt.go
@@ -216,12 +216,7 @@ func (c *Cipher) initEncrypt() (iv []byte, err error) {
 	} else {
 		iv = c.iv
 	}
-	if c.enc == nil {
-		c.enc, err = c.info.newStream(c.key, iv, Encrypt)
-		if err != nil {
-			return nil, err
-		}
-	}
+	c.enc, err = c.info.newStream(c.key, iv, Encrypt)
 	return
 }
 

diff --git a/shadowsocks/pipe.go b/shadowsocks/pipe.go
@@ -59,9 +59,7 @@ func PipeThenCloseOta(src *Conn, dst net.Conn) {
 	// sometimes it have to fill large block
 	buf := leakyBuf.Get()
 	defer leakyBuf.Put(buf)
-	i := 0
-	for {
-		i += 1
+	for i := 1; ; i += 1 {
 		SetReadTimeout(src)
 		if n, err := io.ReadFull(src, buf[:dataLenLen+hmacSha1Len]); err != nil {
 			if err == io.EOF {
@@ -77,7 +75,7 @@ func PipeThenCloseOta(src *Conn, dst net.Conn) {
 		if len(buf) < int(idxData0+dataLen) {
 			dataBuf = make([]byte, dataLen)
 		} else {
-			dataBuf = buf[idxData0:idxData0+dataLen]
+			dataBuf = buf[idxData0 : idxData0+dataLen]
 		}
 		if n, err := io.ReadFull(src, dataBuf); err != nil {
 			if err == io.EOF {