Merge remote-tracking branch 'origin/dev' into multipath

This commit is contained in:
Joseph Henry 2019-08-14 11:25:40 -07:00
commit 15e44f0ddd
3 changed files with 11 additions and 2 deletions

View file

@ -275,6 +275,11 @@ void Multicaster::send(
}
}
} else {
if (gs.txQueue.size() >= ZT_TX_QUEUE_SIZE) {
RR->t->outgoingNetworkFrameDropped(tPtr,network,src,mg.mac(),etherType,0,len,"multicast TX queue is full");
return;
}
const unsigned int gatherLimit = (limit - (unsigned int)gs.members.size()) + 1;
if ((gs.members.empty())||((now - gs.lastExplicitGather) >= ZT_MULTICAST_EXPLICIT_GATHER_DELAY)) {