为了更好的调试,准备重构

Signed-off-by: dmy@lab <dmy@lab.com>
This commit is contained in:
dmy@lab
2015-10-24 16:07:23 +08:00
parent d4c3e2ada5
commit f0d343cebb
7 changed files with 69 additions and 40 deletions

View File

@@ -73,6 +73,9 @@ func UnwrapPackage(pacakge []byte) (packageSize int, data []byte, err error) {
}
func SendData(carrier *Carrier, nByte int) (n int, err error) {
if len(carrier.Cache) < nByte {
log.Panic("Cache of send is too small")
}
if carrier.Cipher == nil {
n, err = carrier.Conn.Write(carrier.Cache[:nByte])
return
@@ -113,7 +116,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
log.Info("read a complete package")
log.Debug("read a complete package")
} else {
gotSize := len(data)
for {
@@ -123,7 +126,7 @@ func ReceiveData(carrier *Carrier) (n int, err error) {
return
}
wrapedPackage = carrier.Cache[:n]
log.Info("got partial package size %d", n)
log.Debug("got partial package size %d from %s", n, carrier.Conn.RemoteAddr().String())
_, data, err = UnwrapPackage(wrapedPackage)
if err == nil {
n = 0
@@ -133,7 +136,8 @@ func ReceiveData(carrier *Carrier) (n int, err error) {
gotSize += len(data)
realData = append(realData, data...)
if gotSize == packageSize {
log.Info("got enough:. packageSize %d, real size %d", packageSize, gotSize)
log.Debug("got enough:. packageSize %d, real size %d. not include header", packageSize, gotSize)
n = gotSize
break
}
}
@@ -144,7 +148,7 @@ func ReceiveData(carrier *Carrier) (n int, err error) {
n = 0
return
}
n = len(decrypted)
// n = len(decrypted)
copy(carrier.Cache, decrypted)
return
}

View File

@@ -7,20 +7,26 @@ type XOR struct {
}
func (this *XOR) Decrypt(data []byte) (decrypted []byte, err error) {
// 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)]
// decrypted[i] = data[i]
// decrypted[i] = data[i]
}
err = nil
return
}
func (this *XOR) Encrypt(data []byte) (encryped []byte, err error) {
// 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)]
// encryped[i] = data[i]
// encryped[i] = data[i]
}
err = nil
return