dark/zerotiertspu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix a nasty bug introduced in packet fragmentation a while back during refactoring, and a few other things related to multicast.

Browse source
This commit is contained in:
Adam Ierymenko 2014-10-28 17:25:34 -07:00
parent faff84e63a
commit 5bb854e504
6 changed files with 27 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

15
node/Multicaster.cpp
View file

@ -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<MulticastGroupMember>::iterator reader(mm->second.members.begin());
std::vector<MulticastGroupMember>::iterator writer(mm->second.members.begin());
std::vector<MulticastGroupMember>::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<Peer> p(RR->topology->getPeer(member));
if ((!p)||(!p->remoteVersionKnown())||(p->remoteVersionMajor() >= 1)) {
for(std::list<OutboundMulticast>::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;
}
}
}
}

2
node/OutboundMulticast.hpp
View file

@ -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

7
node/Packet.hpp
View file

@ -35,11 +35,12 @@
#include <string>
#include <iostream>
#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);
}
/**

8
node/Switch.cpp
View file

@ -785,9 +785,9 @@ bool Switch::_trySend(const Packet &packet,bool encrypt)
++fragsRemaining;
unsigned int totalFragments = fragsRemaining + 1;
for(unsigned int f=0;f<fragsRemaining;++f) {
for(unsigned int fno=1;fno<totalFragments;++fno) {
chunkSize = std::min(remaining,(unsigned int)(ZT_UDP_DEFAULT_PAYLOAD_MTU - ZT_PROTO_MIN_FRAGMENT_LENGTH));
Packet::Fragment frag(tmp,fragStart,chunkSize,f + 1,totalFragments);
Packet::Fragment frag(tmp,fragStart,chunkSize,fno,totalFragments);
via->send(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;
}