fumiama/WireGold
1
0
Fork 0
mirror of https://github.com/fumiama/WireGold.git synced 2026-06-12 12:50:28 +08:00
Code Activity

add crc chksum

Browse Source
This commit is contained in:
源文雨
2022-05-15 19:37:34 +08:00
parent f08253bd45
commit d854e0096c
2 changed files with 15 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
gold/head/packet.go
View File

@@ -4,6 +4,7 @@ import (
"encoding/binary" "encoding/binary"
"encoding/hex" "encoding/hex"
"errors" "errors"
"hash/crc64"
"net" "net"
"github.com/fumiama/WireGold/helper" "github.com/fumiama/WireGold/helper"
@@ -56,8 +57,12 @@ func NewPacket(proto uint8, srcPort uint16, dst net.IP, dstPort uint16, data []b
// Unmarshal 将 data 的数据解码到自身 // Unmarshal 将 data 的数据解码到自身
func (p *Packet) Unmarshal(data []byte) (complete bool, err error) { func (p *Packet) Unmarshal(data []byte) (complete bool, err error) {
if len(data) < 12 { if len(data) < 60 {
err = errors.New("data len < 12") err = errors.New("data len < 60")
return
}
if crc64.Checksum(data[:52], crc64.MakeTable(crc64.ISO)) != binary.LittleEndian.Uint64(data[52:60]) {
err = errors.New("bad crc checksum")
return return
} }
@@ -91,7 +96,7 @@ func (p *Packet) Unmarshal(data []byte) (complete bool, err error) {
} }
if p.rembytes > 0 { if p.rembytes > 0 {
p.rembytes -= uint32(copy(p.Data[flags<<3:], data[52:])) p.rembytes -= uint32(copy(p.Data[flags<<3:], data[60:]))
} }
complete = p.rembytes == 0 complete = p.rembytes == 0
@@ -129,6 +134,7 @@ func (p *Packet) Marshal(src net.IP, teatype uint8, datasz uint32, offset uint16
w.Write(p.Src.To4()) w.Write(p.Src.To4())
w.Write(p.Dst.To4()) w.Write(p.Dst.To4())
w.Write(p.Hash[:]) w.Write(p.Hash[:])
w.WriteUInt64(crc64.Checksum(w.Bytes(), crc64.MakeTable(crc64.ISO)))
w.Write(p.Data) w.Write(p.Data)
}) })
} }

6
gold/link/recv.go
View File

@@ -15,7 +15,13 @@ func (l *Link) Read() *head.Packet {
} }
func (m *Me) wait(data []byte) *head.Packet { func (m *Me) wait(data []byte) *head.Packet {
if len(data) < 60 { // not a valid packet
return nil
}
flags := binary.LittleEndian.Uint16(data[10:12]) flags := binary.LittleEndian.Uint16(data[10:12])
if flags&0x8000 == 0x8000 { // not a valid packet
return nil
}
logrus.Debugln("[recv]", len(data), "bytes data with flag", hex.EncodeToString(data[10:12])) logrus.Debugln("[recv]", len(data), "bytes data with flag", hex.EncodeToString(data[10:12]))
if flags == 0 || flags == 0x4000 { if flags == 0 || flags == 0x4000 {
h := head.SelectPacket() h := head.SelectPacket()