diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-06-17 18:42:23 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-06-17 18:42:23 -0700 |
| commit | dfdd46db80331104366747e336323095aba2c886 (patch) | |
| tree | 9d7d65a6fcee14f59b9e07dca248a9ae3e180e4e /node/Multicaster.cpp | |
| parent | c59c74dddab862ade65938e630dc0f561fcb0c2f (diff) | |
| parent | 87bb0086deadf3663c3e0ec1308e0d71a6473362 (diff) | |
| download | infinitytier-dfdd46db80331104366747e336323095aba2c886.tar.gz infinitytier-dfdd46db80331104366747e336323095aba2c886.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'node/Multicaster.cpp')
| -rw-r--r-- | node/Multicaster.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/node/Multicaster.cpp b/node/Multicaster.cpp index 7da2b14c..0cc4fb87 100644 --- a/node/Multicaster.cpp +++ b/node/Multicaster.cpp @@ -216,7 +216,7 @@ void Multicaster::send( if ((now - gs.lastExplicitGather) >= ZT_MULTICAST_EXPLICIT_GATHER_DELAY) { gs.lastExplicitGather = now; - SharedPtr<Peer> sn(RR->topology->getBestSupernode()); + SharedPtr<Peer> sn(RR->topology->getBestRootserver()); if (sn) { TRACE(">>MC upstream GATHER up to %u for group %.16llx/%s",gatherLimit,nwid,mg.toString().c_str()); @@ -271,12 +271,12 @@ void Multicaster::send( delete [] indexes; #ifdef ZT_SUPPORT_LEGACY_MULTICAST - // This sends a P5 multicast up to our supernode, who then + // This sends a P5 multicast up to our rootserver, who then // redistributes it manually down to all <1.0.0 peers for // legacy support. These peers don't support the new multicast // frame type, so even if they receive it they will ignore it. { - SharedPtr<Peer> sn(RR->topology->getBestSupernode()); + SharedPtr<Peer> sn(RR->topology->getBestRootserver()); if (sn) { uint32_t rn = RR->prng->next32(); Packet outp(sn->address(),RR->identity.address(),Packet::VERB_P5_MULTICAST_FRAME); |