fumiama/WireGold
1
0
Fork 0
mirror of https://github.com/fumiama/WireGold.git synced 2026-07-01 16:10:24 +08:00
Code Activity

fix 分片

Browse Source
This commit is contained in:
fumiama
2021-12-31 14:16:27 +08:00
parent 1d636440b9
commit 67138152d1
2 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
gold/head/packet.go
View File

@@ -12,11 +12,9 @@ import (
// Packet 是发送和接收的最小单位 // Packet 是发送和接收的最小单位
type Packet struct { type Packet struct {
// Ver 协议版本
Ver uint16
// DataSZ len(Data) // DataSZ len(Data)
// 不得超过 65507-head 字节 // 不得超过 65507-head 字节
DataSZ uint16 DataSZ uint32
// Proto 详见 head // Proto 详见 head
Proto uint8 Proto uint8
// TTL is time to live // TTL is time to live
@@ -38,14 +36,13 @@ type Packet struct {
// Data 承载的数据 // Data 承载的数据
Data []byte Data []byte
// 记录还有多少字节未到达 // 记录还有多少字节未到达
rembytes uint16 rembytes uint32
} }
// NewPacket 生成一个新包 // NewPacket 生成一个新包
func NewPacket(proto uint8, srcPort uint16, dst net.IP, dstPort uint16, data []byte) *Packet { func NewPacket(proto uint8, srcPort uint16, dst net.IP, dstPort uint16, data []byte) *Packet {
logrus.Debugln("[packet] new: [proto:", proto, ", srcport:", srcPort, ", dstport:", dstPort, ", dst:", dst, ", data:", data) logrus.Debugln("[packet] new: [proto:", proto, ", srcport:", srcPort, ", dstport:", dstPort, ", dst:", dst, ", data:", data)
return &Packet{ return &Packet{
Ver: 1,
Proto: proto, Proto: proto,
TTL: 16, TTL: 16,
SrcPort: srcPort, SrcPort: srcPort,
@@ -62,12 +59,7 @@ func (p *Packet) Unmarshal(data []byte) (complete bool, err error) {
return return
} }
if p.DataSZ == 0 && len(p.Data) == 0 { if p.DataSZ == 0 && len(p.Data) == 0 {
p.Ver = binary.LittleEndian.Uint16(data[:2]) p.DataSZ = binary.LittleEndian.Uint32(data[:4])
if p.Ver != 1 {
err = errors.New("unknown protocol version")
return
}
p.DataSZ = binary.LittleEndian.Uint16(data[2:4])
p.Data = make([]byte, p.DataSZ) p.Data = make([]byte, p.DataSZ)
pt := binary.LittleEndian.Uint16(data[4:6]) pt := binary.LittleEndian.Uint16(data[4:6])
p.Proto = uint8(pt) p.Proto = uint8(pt)
@@ -87,7 +79,7 @@ func (p *Packet) Unmarshal(data []byte) (complete bool, err error) {
copy(p.Dst, data[16:20]) copy(p.Dst, data[16:20])
copy(p.Hash[:], data[20:52]) copy(p.Hash[:], data[20:52])
} }
p.rembytes -= uint16(copy(p.Data[flags<<3:], data[52:])) p.rembytes -= uint32(copy(p.Data[flags<<3:], data[52:]))
complete = p.rembytes == 0 complete = p.rembytes == 0
@@ -96,7 +88,7 @@ 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, datasz, offset uint16, dontfrag, hasmore bool) []byte { func (p *Packet) Marshal(src net.IP, datasz uint32, offset uint16, dontfrag, hasmore bool) []byte {
p.TTL-- p.TTL--
if p.TTL == 0 { if p.TTL == 0 {
return nil return nil
@@ -116,8 +108,7 @@ func (p *Packet) Marshal(src net.IP, datasz, offset uint16, dontfrag, hasmore bo
} }
packet := make([]byte, 52+len(p.Data)) packet := make([]byte, 52+len(p.Data))
binary.LittleEndian.PutUint16(packet[:2], p.Ver) binary.LittleEndian.PutUint32(packet[:4], p.DataSZ)
binary.LittleEndian.PutUint16(packet[2:4], p.DataSZ)
binary.LittleEndian.PutUint16(packet[4:6], (uint16(p.TTL)<<8)|uint16(p.Proto)) binary.LittleEndian.PutUint16(packet[4:6], (uint16(p.TTL)<<8)|uint16(p.Proto))
binary.LittleEndian.PutUint16(packet[6:8], p.SrcPort) binary.LittleEndian.PutUint16(packet[6:8], p.SrcPort)
binary.LittleEndian.PutUint16(packet[8:10], p.DstPort) binary.LittleEndian.PutUint16(packet[8:10], p.DstPort)

6
gold/link/link.go
View File

@@ -80,12 +80,12 @@ func (l *Link) Write(p *head.Packet, istransfer bool) (n int, err error) {
p.FillHash() p.FillHash()
p.Data = l.Encode(p.Data) p.Data = l.Encode(p.Data)
} }
return l.write(p, uint16(len(p.Data)), 0, istransfer, false) return l.write(p, uint32(len(p.Data)), 0, istransfer, false)
} }
p.FillHash() p.FillHash()
p.Data = l.Encode(p.Data) p.Data = l.Encode(p.Data)
data := p.Data data := p.Data
totl := uint16(len(data)) totl := uint32(len(data))
i := 0 i := 0
for ; int(totl)-i > int(l.me.mtu); i += int(l.me.mtu) { for ; int(totl)-i > int(l.me.mtu); i += int(l.me.mtu) {
logrus.Infoln("[link] split frag", i, ":", i+int(l.me.mtu), ", remain:", int(totl)-i) logrus.Infoln("[link] split frag", i, ":", i+int(l.me.mtu), ", remain:", int(totl)-i)
@@ -121,7 +121,7 @@ func (l *Link) String() (n string) {
} }
// write 向 peer 发一个包 // write 向 peer 发一个包
func (l *Link) write(p *head.Packet, datasz, offset uint16, istransfer, hasmore bool) (n int, err error) { func (l *Link) write(p *head.Packet, datasz uint32, offset uint16, istransfer, hasmore bool) (n int, err error) {
var d []byte var d []byte
if istransfer { if istransfer {
if p.Flags&0x4000 == 0x4000 && len(p.Data) > int(l.me.mtu) { if p.Flags&0x4000 == 0x4000 && len(p.Data) > int(l.me.mtu) {