facat/transx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

1.增加web 显示profile

Browse Source 
2.重新安排了一些日志的等级
This commit is contained in:
dmy@lab
2015-11-20 17:31:32 +08:00
parent fff90f7057
commit da0e77d74c
10 changed files with 39 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
tscipher/cipher.go
View File

@@ -155,7 +155,7 @@ func SendData(carrier *Carrier, nByte int) (n int, err error) {
//打包
wraped := WrapPackage(encrypedByte[:nByte])
n, err = carrier.Conn.Write(wraped)
log.Info("Ready to write id %s, 18 byte %s", carrier.AttachedTunnelID, string(wraped[:18]))
log.Debug("Ready to write id %s, 18 byte %s", carrier.AttachedTunnelID, string(wraped[:18]))
copy(carrier.Cache, encrypedByte[:nByte]) // in case of debugging
return
}
@@ -175,7 +175,7 @@ func ReceiveData(carrier *Carrier) (n int, err error) {
// log.Error("ReceiveData err %s", r)
// }
// }()
log.Info("id %s wrapedPackage := carrier.GetReceiveBuff()", carrier.AttachedTunnelID)
log.Debug("id %s wrapedPackage := carrier.GetReceiveBuff()", carrier.AttachedTunnelID)
wrapedPackage := carrier.GetReceiveBuff() //make([]byte, 0, cap(carrier.Cache))
var packageData []byte
var _rest []byte
@@ -191,11 +191,11 @@ func ReceiveData(carrier *Carrier) (n int, err error) {
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)
log.Debug("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)
log.Debug("id %s carrier.SetReceiveBuff(_buff)", carrier.AttachedTunnelID)
carrier.SetReceiveBuff(_buff)
break
}