update ironwood, only store 1 packet in the pre-session buffer

This commit is contained in:
Arceliar 2021-06-19 07:44:37 -05:00
parent b34c3230f8
commit 1bf751a474
3 changed files with 8 additions and 12 deletions

View file

@ -40,7 +40,7 @@ type keyInfo struct {
}
type buffer struct {
packets [][]byte
packet []byte
timeout *time.Timer
}
@ -73,7 +73,7 @@ func (k *keyStore) sendToAddress(addr address.Address, bs []byte) {
k.addrBuffer[addr] = buf
}
msg := append([]byte(nil), bs...)
buf.packets = append(buf.packets, msg)
buf.packet = msg
if buf.timeout != nil {
buf.timeout.Stop()
}
@ -102,7 +102,7 @@ func (k *keyStore) sendToSubnet(subnet address.Subnet, bs []byte) {
k.subnetBuffer[subnet] = buf
}
msg := append([]byte(nil), bs...)
buf.packets = append(buf.packets, msg)
buf.packet = msg
if buf.timeout != nil {
buf.timeout.Stop()
}
@ -134,15 +134,11 @@ func (k *keyStore) update(key ed25519.PublicKey) *keyInfo {
k.resetTimeout(info)
k.mutex.Unlock()
if buf := k.addrBuffer[info.address]; buf != nil {
for _, bs := range buf.packets {
_, _ = k.core.pc.WriteTo(bs, iwt.Addr(info.key[:]))
}
k.core.pc.WriteTo(buf.packet, iwt.Addr(info.key[:]))
delete(k.addrBuffer, info.address)
}
if buf := k.subnetBuffer[info.subnet]; buf != nil {
for _, bs := range buf.packets {
_, _ = k.core.pc.WriteTo(bs, iwt.Addr(info.key[:]))
}
k.core.pc.WriteTo(buf.packet, iwt.Addr(info.key[:]))
delete(k.subnetBuffer, info.subnet)
}
} else {