发现bug了，接受的时候并不是按发送的数据块接受的，所以接受处理有错位的地方。

Signed-off-by: dmy@lab <dmy@lab.com>

tscipher/cipher.go

@@ -17,9 +17,10 @@ type Cipher interface {
 }
 
 type Carrier struct {
-	Conn   net.Conn
-	Cipher Cipher
-	Cache  []byte
+	Conn             net.Conn
+	Cipher           Cipher
+	Cache            []byte
+	AttachedTunnelID string
 }
 
 func NewCipher(cipherName string) (cipher Cipher) {
@@ -116,6 +117,7 @@ func ReceiveData(carrier *Carrier) (n int, err error) {
 	// log.Info("packageSize %d data size %d", packageSize, len(data))
 	if err == nil && packageSize == len(data) { //读到的是一个完整的包
 		realData = data
+		n = len(realData)
 		log.Debug("read a complete package")
 	} else {
 		gotSize := len(data)
@@ -126,7 +128,7 @@ func ReceiveData(carrier *Carrier) (n int, err error) {
 				return
 			}
 			wrapedPackage = carrier.Cache[:n]
-			log.Debug("got partial package size %d from %s", n, carrier.Conn.RemoteAddr().String())
+			log.Debug("got partial package size %d from %s ID: %s", n, carrier.Conn.RemoteAddr().String(), carrier.AttachedTunnelID)
 			_, data, err = UnwrapPackage(wrapedPackage)
 			if err == nil {
 				n = 0

tscipher/xor.go

@@ -7,9 +7,9 @@ type XOR struct {
 }
 
 func (this *XOR) Decrypt(data []byte) (decrypted []byte, err error) {
-	// decrypted = data
-	// err = nil
-	// return
+	decrypted = data
+	err = nil
+	return
 	decrypted = make([]byte, len(data))
 	for i := 0; i < len(data); i++ {
 		decrypted[i] = data[len(data)-i-1] ^ this.key[i%len(this.key)]
@@ -20,9 +20,9 @@ func (this *XOR) Decrypt(data []byte) (decrypted []byte, err error) {
 }
 
 func (this *XOR) Encrypt(data []byte) (encryped []byte, err error) {
-	// encryped = data
-	// err = nil
-	// return
+	encryped = data
+	err = nil
+	return
 	encryped = make([]byte, len(data))
 	for i := 0; i < len(data); i++ {
 		encryped[len(data)-i-1] = data[i] ^ this.key[i%len(this.key)]