ExternalVendorCode/ZeroTierOne
1
0
Fork 0
mirror of https://github.com/zerotier/ZeroTierOne.git synced 2025-01-02 19:26:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not multicast to self.

Browse Source
This commit is contained in:
Adam Ierymenko 2014-10-03 18:42:41 -07:00
parent 496109fdcc
commit 3f7e7e8a88
3 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
node/IncomingPacket.cpp
View File

@ -925,7 +925,7 @@ bool IncomingPacket::_doMULTICAST_GATHER(const RuntimeEnvironment *RR,const Shar
outp.append(nwid); outp.append(nwid);
mg.mac().appendTo(outp); mg.mac().appendTo(outp);
outp.append((uint32_t)mg.adi()); outp.append((uint32_t)mg.adi());
if (RR->mc->gather(RR,nwid,mg,outp,gatherLimit)) { if (RR->mc->gather(RR,peer->address(),nwid,mg,outp,gatherLimit)) {
outp.armor(peer->key(),true); outp.armor(peer->key(),true);
_fromSock->send(_remoteAddress,outp.data(),outp.size()); _fromSock->send(_remoteAddress,outp.data(),outp.size());
} }
@ -1003,7 +1003,7 @@ bool IncomingPacket::_doMULTICAST_FRAME(const RuntimeEnvironment *RR,const Share
to.mac().appendTo(outp); to.mac().appendTo(outp);
outp.append((uint32_t)to.adi()); outp.append((uint32_t)to.adi());
outp.append((unsigned char)0x01); // flag 0x01 = contains gather results outp.append((unsigned char)0x01); // flag 0x01 = contains gather results
if (RR->mc->gather(RR,nwid,to,outp,gatherLimit)) { if (RR->mc->gather(RR,peer->address(),nwid,to,outp,gatherLimit)) {
outp.armor(peer->key(),true); outp.armor(peer->key(),true);
_fromSock->send(_remoteAddress,outp.data(),outp.size()); _fromSock->send(_remoteAddress,outp.data(),outp.size());
} }

28
node/Multicaster.cpp
View File

@ -49,10 +49,10 @@ Multicaster::~Multicaster()
{ {
} }
unsigned int Multicaster::gather(const RuntimeEnvironment *RR,uint64_t nwid,MulticastGroup &mg,Packet &appendTo,unsigned int limit) const unsigned int Multicaster::gather(const RuntimeEnvironment *RR,const Address &queryingPeer,uint64_t nwid,MulticastGroup &mg,Packet &appendTo,unsigned int limit) const
{ {
unsigned char *p; unsigned char *p;
unsigned int n = 0,i,rptr; unsigned int n = 0,i,rptr,skipped = 0;
uint64_t a,done[(ZT_PROTO_MAX_PACKET_LENGTH / 5) + 1]; uint64_t a,done[(ZT_PROTO_MAX_PACKET_LENGTH / 5) + 1];
Mutex::Lock _l(_groups_m); Mutex::Lock _l(_groups_m);
@ -90,16 +90,20 @@ restart_member_scan:
// Log that we've picked this one // Log that we've picked this one
done[n++] = a; done[n++] = a;
// Append to packet if (queryingPeer.toInt() == a) {
p = (unsigned char *)appendTo.appendField(ZT_ADDRESS_LENGTH); ++skipped;
*(p++) = (unsigned char)((a >> 32) & 0xff); } else {
*(p++) = (unsigned char)((a >> 24) & 0xff); // Append to packet
*(p++) = (unsigned char)((a >> 16) & 0xff); p = (unsigned char *)appendTo.appendField(ZT_ADDRESS_LENGTH);
*(p++) = (unsigned char)((a >> 8) & 0xff); *(p++) = (unsigned char)((a >> 32) & 0xff);
*p = (unsigned char)(a & 0xff); *(p++) = (unsigned char)((a >> 24) & 0xff);
*(p++) = (unsigned char)((a >> 16) & 0xff);
*(p++) = (unsigned char)((a >> 8) & 0xff);
*p = (unsigned char)(a & 0xff);
}
} }
appendTo.setAt(nAt,(uint16_t)n); appendTo.setAt(nAt,(uint16_t)(n - skipped));
return n; return n;
} }
@ -249,6 +253,10 @@ void Multicaster::_add(uint64_t now,uint64_t nwid,MulticastGroupStatus &gs,const
{ {
// assumes _groups_m is locked // assumes _groups_m is locked
// Do not add self -- even if someone else returns it
if (member == RR->identity.address())
return;
// Update timestamp and learnedFrom if existing // Update timestamp and learnedFrom if existing
for(std::vector<MulticastGroupMember>::iterator m(gs.members.begin());m!=gs.members.end();++m) { for(std::vector<MulticastGroupMember>::iterator m(gs.members.begin());m!=gs.members.end();++m) {
if (m->address == member) { if (m->address == member) {

3
node/Multicaster.hpp
View File

@ -109,6 +109,7 @@ public:
* If zero is returned, the first two fields will still have been appended. * If zero is returned, the first two fields will still have been appended.
* *
* @param RR Runtime environment * @param RR Runtime environment
* @param queryingPeer Peer asking for gather (to skip in results)
* @param nwid Network ID * @param nwid Network ID
* @param mg Multicast group * @param mg Multicast group
* @param appendTo Packet to append to * @param appendTo Packet to append to
@ -116,7 +117,7 @@ public:
* @return Number of addresses appended * @return Number of addresses appended
* @throws std::out_of_range Buffer overflow writing to packet * @throws std::out_of_range Buffer overflow writing to packet
*/ */
unsigned int gather(const RuntimeEnvironment *RR,uint64_t nwid,MulticastGroup &mg,Packet &appendTo,unsigned int limit) const; unsigned int gather(const RuntimeEnvironment *RR,const Address &queryingPeer,uint64_t nwid,MulticastGroup &mg,Packet &appendTo,unsigned int limit) const;
/** /**
* Send a multicast * Send a multicast