yggdrasil-network/yggdrasil-go
1
0
Fork 0
mirror of https://github.com/yggdrasil-network/yggdrasil-go.git synced 2025-06-21 00:25:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

limit maximum queue number and size. don't cause the last packet in a queue to drop due to timeout (makes sure *some* packets can get through for every stream, even if delayed)

Browse source
This commit is contained in:
Arceliar 2018-07-04 18:35:54 -05:00
parent d0e6a9ad41
commit 99616b967a
1 changed files with 22 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/yggdrasil/switch.go
View file

@ -598,11 +598,18 @@ type switch_buffer struct {
count uint64 // Total queue size, including dropped packets count uint64 // Total queue size, including dropped packets
} }
func (b *switch_buffer) dropTimedOut() { // Clean up old packets from buffers, to help keep latency within some reasonable bound
func (t *switchTable) cleanBuffer(b *switch_buffer) {
// TODO figure out what timeout makes sense // TODO figure out what timeout makes sense
if len(b.packets) == 0 {
return
}
coords := switch_getPacketCoords(b.packets[0].bytes)
dropAll := t.selfIsClosest(coords)
const timeout = 25 * time.Millisecond const timeout = 25 * time.Millisecond
now := time.Now() now := time.Now()
for len(b.packets) > 0 && now.Sub(b.packets[0].time) > timeout { for len(b.packets) > 0 && (dropAll || len(b.packets) > 32 || (len(b.packets) > 1 && now.Sub(b.packets[0].time) > timeout)) {
t.core.log.Println("DEBUG:", len(b.packets), now.Sub(b.packets[0].time))
util_putBytes(b.packets[0].bytes) util_putBytes(b.packets[0].bytes)
b.packets = b.packets[1:] b.packets = b.packets[1:]
} }
@ -621,7 +628,7 @@ func (t *switchTable) handleIdle(port switchPort, buffs map[string]switch_buffer
for streamID, buf := range buffs { for streamID, buf := range buffs {
// Filter over the streams that this node is closer to // Filter over the streams that this node is closer to
// Keep the one with the smallest queue // Keep the one with the smallest queue
buf.dropTimedOut() t.cleanBuffer(&buf)
if len(buf.packets) == 0 { if len(buf.packets) == 0 {
delete(buffs, streamID) delete(buffs, streamID)
continue continue
@ -662,9 +669,20 @@ func (t *switchTable) doWorker() {
// Try to send it somewhere (or drop it if it's corrupt or at a dead end) // Try to send it somewhere (or drop it if it's corrupt or at a dead end)
if !t.handleIn(packet, idle) { if !t.handleIn(packet, idle) {
// There's nobody free to take it right now, so queue it for later // There's nobody free to take it right now, so queue it for later
// First drop random queues if we're already tracking too much, to prevent OOM DoS
for streamID, buf := range buffs {
if len(buffs) < 32 {
break
}
for _, packet := range buf.packets {
util_putBytes(packet.bytes)
}
delete(buffs, streamID)
}
// Now add the packet to the appropriate queue
streamID := switch_getPacketStreamID(packet) streamID := switch_getPacketStreamID(packet)
buf := buffs[streamID] buf := buffs[streamID]
buf.dropTimedOut() t.cleanBuffer(&buf)
pinfo := switch_packetInfo{packet, time.Now()} pinfo := switch_packetInfo{packet, time.Now()}
buf.packets = append(buf.packets, pinfo) buf.packets = append(buf.packets, pinfo)
buf.count++ buf.count++