fumiama/WireGold
1
0
Fork 0
mirror of https://github.com/fumiama/WireGold.git synced 2026-06-11 20:20:27 +08:00
Code Activity

fix 分片

Browse Source
This commit is contained in:
fumiama
2021-12-31 14:03:33 +08:00
parent 5b2d16674b
commit c56ef8be45
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gold/head/packet.go
View File

@@ -77,14 +77,17 @@ func (p *Packet) Unmarshal(data []byte) (complete bool, err error) {
p.rembytes = p.DataSZ p.rembytes = p.DataSZ
} }
p.Flags = binary.LittleEndian.Uint16(data[10:12]) flags := binary.LittleEndian.Uint16(data[10:12])
p.Src = make(net.IP, 4) if flags&0x1fff == 0 {
copy(p.Src, data[12:16]) p.Flags = flags
p.Dst = make(net.IP, 4) p.Src = make(net.IP, 4)
copy(p.Dst, data[16:20]) copy(p.Src, data[12:16])
copy(p.Hash[:], data[20:52]) p.Dst = make(net.IP, 4)
p.rembytes -= uint16(copy(p.Data[p.Flags<<3:], data[52:])) copy(p.Dst, data[16:20])
copy(p.Hash[:], data[20:52])
}
p.rembytes -= uint16(copy(p.Data[flags<<3:], data[52:]))
complete = p.rembytes == 0 complete = p.rembytes == 0
@@ -93,14 +96,14 @@ func (p *Packet) Unmarshal(data []byte) (complete bool, err error) {
// Marshal 将自身数据编码为 []byte // Marshal 将自身数据编码为 []byte
// offset 必须为 8 的倍数，表示偏移的 8 位 // offset 必须为 8 的倍数，表示偏移的 8 位
func (p *Packet) Marshal(src net.IP, offset uint16, dontfrag, hasmore bool) []byte { func (p *Packet) Marshal(src net.IP, datasz, offset uint16, dontfrag, hasmore bool) []byte {
p.TTL-- p.TTL--
if p.TTL == 0 { if p.TTL == 0 {
return nil return nil
} }
p.DataSZ = uint16(len(p.Data))
if src != nil { if src != nil {
p.DataSZ = datasz
p.Src = src p.Src = src
offset >>= 3 offset >>= 3
if dontfrag { if dontfrag {

8
gold/link/link.go
View File

@@ -78,6 +78,8 @@ func (l *Link) Write(p *head.Packet, istransfer bool) (n int, err error) {
if len(p.Data) <= int(l.me.mtu) { if len(p.Data) <= int(l.me.mtu) {
return l.write(p, 0, istransfer, false) return l.write(p, 0, istransfer, false)
} }
p.FillHash()
p.Data = l.Encode(p.Data)
data := p.Data data := p.Data
totl := len(data) totl := len(data)
i := 0 i := 0
@@ -121,11 +123,9 @@ func (l *Link) write(p *head.Packet, offset uint16, istransfer, hasmore bool) (n
if p.Flags&0x4000 == 0x4000 && len(p.Data) > int(l.me.mtu) { if p.Flags&0x4000 == 0x4000 && len(p.Data) > int(l.me.mtu) {
return len(p.Data), errors.New("drop dont fragmnet big trans packet") return len(p.Data), errors.New("drop dont fragmnet big trans packet")
} }
d = p.Marshal(nil, 0, false, false) d = p.Marshal(nil, 0, 0, false, false)
} else { } else {
p.FillHash() d = p.Marshal(l.me.me, uint16(len(p.Data)), offset, false, hasmore)
p.Data = l.Encode(p.Data)
d = p.Marshal(l.me.me, offset, false, hasmore)
} }
if d == nil { if d == nil {
return 0, errors.New("[link] ttl exceeded") return 0, errors.New("[link] ttl exceeded")