Preliminary debug state

wrappers/blockcipherrwc.go

@@ -1,12 +1,14 @@
 package wrappers
 
 import (
-	"bytes"
 	"crypto/aes"
 	"crypto/cipher"
+	"fmt"
 	"net"
 
 	"github.com/juju/errors"
+
+	"github.com/9seconds/mtg/utils"
 )
 
 type BlockCipherReadWriteCloserWithAddr struct {
@@ -19,16 +21,18 @@ type BlockCipherReadWriteCloserWithAddr struct {
 
 func (c *BlockCipherReadWriteCloserWithAddr) Read(p []byte) (int, error) {
 	return c.BufferedRead(p, func() error {
-		buf := &bytes.Buffer{}
-		for buf.Len()%aes.BlockSize != 0 || buf.Len() == 0 {
-			n, err := c.conn.Read(p)
+		var buf []byte
+
+		for len(buf) == 0 || len(buf)%aes.BlockSize != 0 {
+			rv, err := utils.ReadCurrentData(c.conn)
 			if err != nil {
 				return errors.Annotate(err, "Cannot read from socket")
 			}
-			buf.Write(p[:n])
+			buf = append(buf, rv...)
 		}
-		c.decryptor.CryptBlocks(buf.Bytes(), buf.Bytes())
-		c.Buffer.Write(buf.Bytes())
+
+		c.decryptor.CryptBlocks(buf, buf)
+		c.Buffer.Write(buf)
 
 		return nil
 	})
@@ -46,6 +50,7 @@ func (c *BlockCipherReadWriteCloserWithAddr) Write(p []byte) (int, error) {
 }
 
 func (c *BlockCipherReadWriteCloserWithAddr) Close() error {
+	fmt.Println("BlockCipherReadWriteCloserWithAddr closes", "sockid", c.SocketID(), "bufsize", c.Buffer.Len())
 	return c.conn.Close()
 }
 
@@ -57,6 +62,10 @@ func (c *BlockCipherReadWriteCloserWithAddr) RemoteAddr() *net.TCPAddr {
 	return c.conn.RemoteAddr()
 }
 
+func (c *BlockCipherReadWriteCloserWithAddr) SocketID() string {
+	return c.conn.SocketID()
+}
+
 func NewBlockCipherRWC(conn ReadWriteCloserWithAddr, encryptor, decryptor cipher.BlockMode) ReadWriteCloserWithAddr {
 	return &BlockCipherReadWriteCloserWithAddr{
 		BufferedReader: NewBufferedReader(),