精简了ReceiveData的代码

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

.gitignore

@@ -2,3 +2,4 @@
 TransX
 server.log*
 client.log*
+applog

client.bat

@@ -1 +1 @@
-.\TransX -destip 127.0.0.1 -destport 1082 -listenport 1080 -encrypt client -log client.log
+.\TransX -destip 127.0.0.1 -destport 1082 -listenport 1080 -encrypt client -log applog/client.log

server.bat

@@ -1 +1 @@
-.\TransX -destip 127.0.0.1 -destport 1084 -listenport 1082 -encrypt server -log server.log
+.\TransX -destip 127.0.0.1 -destport 1084 -listenport 1082 -encrypt server -log applog/server.log

tscipher/cipher.go

@@ -58,7 +58,6 @@ func (this *Carrier) GetReceiveBuff() []byte {
 	_b := make([]byte, len(buff), cap(buff))
 	copy(_b, buff)
 	return _b
-	// return this.receiveBuff
 }
 
 func (this *Carrier) SetReceiveBuff(buff []byte) {
@@ -149,11 +148,6 @@ func SendData(carrier *Carrier, nByte int) (n int, err error) {
 	}
 	//打包
 	wraped := WrapPackage(encrypedByte[:nByte])
-	//检查一下这个包是否正确
-	// _, _, err = UnwrapPackage(wraped)
-	// if err != nil {
-	// 	log.Error("Package is incorrect")
-	// }
 	n, err = carrier.Conn.Write(wraped)
 	log.Info("Ready to write id %s, 18 byte %s", carrier.AttachedTunnelID, string(wraped[:18]))
 	copy(carrier.Cache, encrypedByte[:nByte]) // in case of debugging
@@ -175,23 +169,32 @@ func ReceiveData(carrier *Carrier) (n int, err error) {
 			log.Error("ReceiveData err %s", r)
 		}
 	}()
-	// hasHeader := false
 	log.Info("id %s wrapedPackage := carrier.GetReceiveBuff()", carrier.AttachedTunnelID)
 	wrapedPackage := carrier.GetReceiveBuff() //make([]byte, 0, cap(carrier.Cache))
-	// log.Debug("WWW id %s address of wrapedPackage[0] %p cap %d. carrier.ReceiveBuff[0] %p cap(%d)", carrier.AttachedTunnelID, &wrapedPackage[0], cap(wrapedPackage), &(carrier.ReceiveBuff[0]), cap(carrier.ReceiveBuff))
 	var packageData []byte
 	var _rest []byte
 	for {
 		//首先检查这个是不是完整的包，是就返回好了，免得被阻塞
-		// log.Debug("id %s address of wrapedPackage[0] %p. carrier.ReceiveBuff[0] %p", carrier.AttachedTunnelID, &wrapedPackage[0], &(carrier.ReceiveBuff[0]))
+		data, rest, err := UnwrapPackage(wrapedPackage)
-		if data, rest, err := UnwrapPackage(wrapedPackage); err == nil {
-			_rest = rest
 		packageData = data
-		} else {
+		_rest = rest
+		if err, ok := err.(*NotPackageError); len(wrapedPackage) > 0 && ok {
+			return 0, err
+		}
+		log.Debug("id %s length of package %d", carrier.AttachedTunnelID, len(packageData))
+		if err == nil {
+			//够一个完整的包
+			log.Info("id %s capBuff := cap(carrier.GetReceiveBuff())", carrier.AttachedTunnelID)
+			capBuff := cap(carrier.GetReceiveBuff())
+			_buff := make([]byte, 0, capBuff) //释放
+			_buff = append(_buff, _rest...)
+			log.Info("id %s carrier.SetReceiveBuff(_buff)", carrier.AttachedTunnelID)
+			carrier.SetReceiveBuff(_buff)
+			break
+		}
+		//如果读到的数据不够一个完整的包
 		log.Debug("id %s to read wrapedPackage %d", carrier.AttachedTunnelID, len(wrapedPackage))
-			// carrier.Conn.SetReadDeadline(time.Now().Add(time.Second * 5))
 		if len(wrapedPackage) > 0 {
-
 			n, err = carrier.Conn.Read(carrier.Cache)
 			if err != nil {
 				log.Error("ERROR %s", err)
@@ -201,42 +204,16 @@ func ReceiveData(carrier *Carrier) (n int, err error) {
 			n, err = io.ReadAtLeast(carrier.Conn, carrier.Cache, 18)
 			log.Debug("id %s to ReadAtLeast", carrier.AttachedTunnelID)
 		}
+
 		if err != nil {
 			n = 0
 			return n, err
 		}
 		wrapedPackage = append(wrapedPackage, carrier.Cache[:n]...)
+
 		log.Debug("id %s length of conn %d", carrier.AttachedTunnelID, n)
 		log.Debug("id %s first 18 %s from %s", carrier.AttachedTunnelID, string(wrapedPackage[:18]), carrier.Conn.RemoteAddr().String())
-			data, rest, err := UnwrapPackage(wrapedPackage)
-			if err, ok := err.(*NotPackageError); ok {
-				return 0, err
-			}
-			//如果读到的数据不够一个完整的包
-			if _, ok := err.(*LackDataError); ok {
-				// carrier.ReceiveBuff = append(carrier.ReceiveBuff, wrapedPackage)
-				// hasHeader = true
-				log.Info("id %s not enough", carrier.AttachedTunnelID)
-				continue
-			}
-			packageData = data
-			log.Debug("id %s length of package %d", carrier.AttachedTunnelID, len(packageData))
-			_rest = rest
-		}
-		//够一个完整的包
-		// carrier.ReceiveBuff = make([]byte, 0, cap(carrier.ReceiveBuff)) //释放
-		log.Info("id %s capBuff := cap(carrier.GetReceiveBuff())", carrier.AttachedTunnelID)
-		capBuff := cap(carrier.GetReceiveBuff())
-		_buff := make([]byte, 0, capBuff) //释放
-		// carrier.SetReceiveBuff()
-		_buff = append(_buff, _rest...)
-		// carrier.ReceiveBuff = append(carrier.ReceiveBuff, _rest...)
-		// carrier.SetReceiveBuff(append(carrier.GetReceiveBuff(), _rest...))
-		log.Info("id %s carrier.SetReceiveBuff(_buff)", carrier.AttachedTunnelID)
-		carrier.SetReceiveBuff(_buff)
-		// log.Debug("id %s address of carrier.ReceiveBuff[0] %p", carrier.AttachedTunnelID, &carrier.ReceiveBuff[0])
 
-		break
 	}
 
 	if len(carrier.GetReceiveBuff()) > 0 {