diff --git a/node/Multicaster.cpp b/node/Multicaster.cpp index 94c6a45ba..4d1b82d4a 100644 --- a/node/Multicaster.cpp +++ b/node/Multicaster.cpp @@ -325,7 +325,7 @@ void Multicaster::clean(uint64_t now) // so that remaining members can be sorted in ascending order of // transmit priority. std::vector::iterator reader(mm->second.members.begin()); - std::vector::iterator writer(mm->second.members.begin()); + std::vector::iterator writer(reader); unsigned int count = 0; while (reader != mm->second.members.end()) { if ((now - reader->timestamp) < ZT_MULTICAST_LIKE_EXPIRE) { @@ -363,7 +363,10 @@ void Multicaster::clean(uint64_t now) } else if (mm->second.txQueue.empty()) { // There are no remaining members and no pending multicasts, so erase the entry _groups.erase(mm++); - } else ++mm; + } else { + mm->second.members.clear(); + ++mm; + } } } @@ -399,10 +402,14 @@ void Multicaster::_add(uint64_t now,uint64_t nwid,const MulticastGroup &mg,Multi SharedPtr p(RR->topology->getPeer(member)); if ((!p)||(!p->remoteVersionKnown())||(p->remoteVersionMajor() >= 1)) { for(std::list::iterator tx(gs.txQueue.begin());tx!=gs.txQueue.end();) { - tx->sendIfNew(RR,member); if (tx->atLimit()) gs.txQueue.erase(tx++); - else ++tx; + else { + tx->sendIfNew(RR,member); + if (tx->atLimit()) + gs.txQueue.erase(tx++); + else ++tx; + } } } } diff --git a/node/OutboundMulticast.hpp b/node/OutboundMulticast.hpp index ab0aae55b..f87656eb4 100644 --- a/node/OutboundMulticast.hpp +++ b/node/OutboundMulticast.hpp @@ -102,7 +102,7 @@ public: /** * @return True if this outbound multicast has been sent to enough peers */ - inline bool atLimit() const throw() { return (_alreadySentTo.size() > _limit); } + inline bool atLimit() const throw() { return (_alreadySentTo.size() >= _limit); } /** * Just send without checking log diff --git a/node/Packet.hpp b/node/Packet.hpp index a6ac9dc63..2d2c11e20 100644 --- a/node/Packet.hpp +++ b/node/Packet.hpp @@ -35,11 +35,12 @@ #include #include +#include "Constants.hpp" + #include "Address.hpp" #include "Poly1305.hpp" #include "Salsa20.hpp" #include "Utils.hpp" -#include "Constants.hpp" #include "Buffer.hpp" #include "../ext/lz4/lz4.h" @@ -425,13 +426,13 @@ public: setSize(fragLen + ZT_PROTO_MIN_FRAGMENT_LENGTH); // NOTE: this copies both the IV/packet ID and the destination address. - memcpy(field(ZT_PACKET_FRAGMENT_IDX_PACKET_ID,13),field(ZT_PACKET_IDX_IV,13),13); + memcpy(field(ZT_PACKET_FRAGMENT_IDX_PACKET_ID,13),p.field(ZT_PACKET_IDX_IV,13),13); (*this)[ZT_PACKET_FRAGMENT_IDX_FRAGMENT_INDICATOR] = ZT_PACKET_FRAGMENT_INDICATOR; (*this)[ZT_PACKET_FRAGMENT_IDX_FRAGMENT_NO] = (char)(((fragTotal & 0xf) << 4) | (fragNo & 0xf)); (*this)[ZT_PACKET_FRAGMENT_IDX_HOPS] = 0; - memcpy(field(ZT_PACKET_FRAGMENT_IDX_PAYLOAD,fragLen),field(fragStart,fragLen),fragLen); + memcpy(field(ZT_PACKET_FRAGMENT_IDX_PAYLOAD,fragLen),p.field(fragStart,fragLen),fragLen); } /** diff --git a/node/Switch.cpp b/node/Switch.cpp index 4819bd562..7c63761be 100644 --- a/node/Switch.cpp +++ b/node/Switch.cpp @@ -785,9 +785,9 @@ bool Switch::_trySend(const Packet &packet,bool encrypt) ++fragsRemaining; unsigned int totalFragments = fragsRemaining + 1; - for(unsigned int f=0;fsend(RR,frag.data(),frag.size(),now); fragStart += chunkSize; remaining -= chunkSize; @@ -795,7 +795,9 @@ bool Switch::_trySend(const Packet &packet,bool encrypt) } return true; } - } else requestWhois(packet.destination()); + } else { + requestWhois(packet.destination()); + } return false; } diff --git a/testnet.cpp b/testnet.cpp index e2f04c67d..3fa8aef28 100644 --- a/testnet.cpp +++ b/testnet.cpp @@ -559,11 +559,11 @@ static void doUnicast(const std::vector &cmd) SimNode *receiver = nodes[*r]; SharedPtr rtap(receiver->tapFactory.getByNwid(nwid)); if (rtap) { - while (rtap->getNextReceivedFrame(frame,1)) { + if (rtap->getNextReceivedFrame(frame,5)) { if ((frame.len == frameLen)&&(!memcmp(frame.data + 16,pkt.data + 16,frameLen - 16))) { uint64_t ints[2]; memcpy(ints,frame.data,16); - printf("%s <- %.10llx received test packet, latency == %llums"ZT_EOL_S,r->toString().c_str(),ints[0],frame.timestamp - ints[1]); + printf("%s <- %.10llx received test packet, length == %u, latency == %llums"ZT_EOL_S,r->toString().c_str(),ints[0],frame.len,frame.timestamp - ints[1]); receivedPairs.insert(std::pair(Address(ints[0]),*r)); } else { printf("%s !! got spurious packet, length == %u, etherType == 0x%.4x"ZT_EOL_S,r->toString().c_str(),frame.len,frame.etherType); @@ -647,19 +647,19 @@ static void doMulticast(const std::vector &cmd) printf("---------- waiting %llu seconds..."ZT_EOL_S,tout / 1000ULL); - uint64_t toutend = Utils::now() + tout; unsigned int receiveCount = 0; TestEthernetTap::TestFrame frame; + uint64_t toutend = Utils::now() + tout; do { for(std::map< Address,SimNode * >::iterator nn(nodes.begin());nn!=nodes.end();++nn) { SimNode *receiver = nn->second; SharedPtr rtap(receiver->tapFactory.getByNwid(nwid)); if (rtap) { - while (rtap->getNextReceivedFrame(frame,1)) { + if (rtap->getNextReceivedFrame(frame,5)) { if ((frame.len == frameLen)&&(!memcmp(frame.data + 16,pkt.data + 16,frameLen - 16))) { uint64_t ints[2]; memcpy(ints,frame.data,16); - printf("%s <- %.10llx received test packet, latency == %llums"ZT_EOL_S,nn->first.toString().c_str(),ints[0],frame.timestamp - ints[1]); + printf("%s <- %.10llx received test packet, length == %u, latency == %llums"ZT_EOL_S,nn->first.toString().c_str(),ints[0],frame.len,frame.timestamp - ints[1]); ++receiveCount; } else { printf("%s !! got spurious packet, length == %u, etherType == 0x%.4x"ZT_EOL_S,nn->first.toString().c_str(),frame.len,frame.etherType); diff --git a/testnet/TestEthernetTap.cpp b/testnet/TestEthernetTap.cpp index 6a151aca4..afd26da67 100644 --- a/testnet/TestEthernetTap.cpp +++ b/testnet/TestEthernetTap.cpp @@ -128,7 +128,7 @@ bool TestEthernetTap::updateMulticastGroups(std::set &groups) bool TestEthernetTap::injectPacketFromHost(const MAC &from,const MAC &to,unsigned int etherType,const void *data,unsigned int len) { - if ((len == 0)||(len > 2800)) + if ((len == 0)||(len > _mtu)) return false; _pq.push(TestFrame(from,to,data,etherType & 0xffff,len)); return true;