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

fix: mtu calculation

Browse Source
This commit is contained in:
源文雨
2023-08-05 10:55:40 +08:00
parent 3c5b4ad058
commit a3ae280a7f
3 changed files with 22 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gold/link/me.go
View File

@@ -170,10 +170,6 @@ func (m *Me) sendAllSameDst(packet []byte) (n int) {
break
}
i += int(totl)
if i > int(m.mtu) {
logrus.Debugln("[me] wrap exceed mtu, break")
break
}
ptr = rem[i:]
logrus.Debugln("[me] wrap", totl, "bytes packet to send together")
}

2
gold/link/peer.go
View File

@@ -32,7 +32,7 @@ func (m *Me) AddPeer(cfg *PeerConfig) (l *Link) {
if ok {
return
}
if cfg.MTU == 0 || cfg.MTU == 65535 || cfg.MTU%8 != 0 || (m.mtu != 0 && cfg.MTU > m.mtu) {
if cfg.MTU == 0 || (m.mtu != 0 && cfg.MTU > m.mtu) {
panic("invalid mtu for peer " + cfg.PeerIP)
}
l = &Link{

40
gold/link/send.go
View File

@@ -21,39 +21,44 @@ func (l *Link) WriteAndPut(p *head.Packet, istransfer bool) (n int, err error) {
sndcnt := atomic.AddUintptr(&l.sendcount, 1)
mtu := l.mtu
if l.mturandomrange > 0 {
mtu -= uint16(rand.Intn(int(l.mturandomrange))) & 0xfff8
}
logrus.Debugln("[send] mtu:", mtu, ", count:", sndcnt, ", additional data:", uint16(sndcnt))
if len(p.Data) <= int(mtu) {
if !istransfer {
l.encrypt(p, uint16(sndcnt), teatype)
}
defer p.Put()
return l.write(p, teatype, uint16(sndcnt), mtu, uint32(len(p.Data)), 0, istransfer, false)
mtu -= uint16(rand.Intn(int(l.mturandomrange)))
}
logrus.Debugln("[send] mtu:", mtu, ", count:", sndcnt, ", additional data:", uint16(sndcnt)&0x0fff)
if !istransfer {
l.encrypt(p, uint16(sndcnt), teatype)
}
delta := (int(mtu) - 60) & 0x0000fff8
if delta <= 0 {
logrus.Warnln("[send] reset invalid data frag len", delta, "to 8")
delta = 8
}
if len(p.Data) <= delta {
defer p.Put()
return l.write(p, teatype, uint16(sndcnt), uint32(len(p.Data)), 0, istransfer, false)
}
if istransfer && p.Flags&0x4000 == 0x4000 && len(p.Data) > delta {
return 0, errors.New("drop dont fragmnet big trans packet")
}
data := p.Data
ttl := p.TTL
totl := uint32(len(data))
i := 0
packet := head.SelectPacket()
*packet = *p
for ; int(totl)-i > int(mtu); i += int(mtu) {
logrus.Debugln("[send] split frag [", i, "~", i+int(mtu), "], remain:", int(totl)-i-int(mtu))
packet.Data = data[:int(mtu)]
cnt, err := l.write(packet, teatype, uint16(sndcnt), mtu, totl, uint16(i>>3), istransfer, true)
for ; int(totl)-i > delta; i += delta {
logrus.Debugln("[send] split frag [", i, "~", i+delta, "], remain:", int(totl)-i-delta)
packet.Data = data[:delta]
cnt, err := l.write(packet, teatype, uint16(sndcnt), totl, uint16(i>>3), istransfer, true)
n += cnt
if err != nil {
return n, err
}
data = data[int(mtu):]
data = data[delta:]
packet.TTL = ttl
}
packet.Put()
p.Data = data
cnt, err := l.write(p, teatype, uint16(sndcnt), mtu, totl, uint16(i>>3), istransfer, false)
cnt, err := l.write(p, teatype, uint16(sndcnt), totl, uint16(i>>3), istransfer, false)
p.Put()
n += cnt
return n, err
@@ -80,13 +85,10 @@ func (l *Link) encrypt(p *head.Packet, sndcnt uint16, teatype uint8) {
}
// write 向 peer 发一个包
func (l *Link) write(p *head.Packet, teatype uint8, additional, mtu uint16, datasz uint32, offset uint16, istransfer, hasmore bool) (n int, err error) {
func (l *Link) write(p *head.Packet, teatype uint8, additional uint16, datasz uint32, offset uint16, istransfer, hasmore bool) (n int, err error) {
var d []byte
var cl func()
if istransfer {
if p.Flags&0x4000 == 0x4000 && len(p.Data) > int(mtu) {
return len(p.Data), errors.New("drop dont fragmnet big trans packet")
}
d, cl = p.Marshal(nil, teatype, additional, 0, 0, false, false)
} else {
d, cl = p.Marshal(l.me.me, teatype, additional, datasz, offset, false, hasmore)