diff options
| author | Grant Limberg <glimberg@gmail.com> | 2015-07-07 19:24:02 -0700 |
|---|---|---|
| committer | Grant Limberg <glimberg@gmail.com> | 2015-07-07 19:24:02 -0700 |
| commit | 1ad2cfeedfa2a9f4fc1f512e1009e5bb1b0630cb (patch) | |
| tree | d8264c9bd4f6b9dce3f5237b94fe1f2fc521cf19 /node/OutboundMulticast.cpp | |
| parent | 6d398beefddb48d91f27e5f41bf39f40eb77222f (diff) | |
| parent | 412389ec755528108e0254e75a9cf43fc53e331a (diff) | |
| download | infinitytier-1ad2cfeedfa2a9f4fc1f512e1009e5bb1b0630cb.tar.gz infinitytier-1ad2cfeedfa2a9f4fc1f512e1009e5bb1b0630cb.zip | |
Merge branch 'adamierymenko-dev' into android-jni
Diffstat (limited to 'node/OutboundMulticast.cpp')
| -rw-r--r-- | node/OutboundMulticast.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/node/OutboundMulticast.cpp b/node/OutboundMulticast.cpp index f62046be..46116c07 100644 --- a/node/OutboundMulticast.cpp +++ b/node/OutboundMulticast.cpp @@ -104,7 +104,7 @@ void OutboundMulticast::sendOnly(const RuntimeEnvironment *RR,const Address &toA { if (_haveCom) { SharedPtr<Network> network(RR->node->network(_nwid)); - if (network->peerNeedsOurMembershipCertificate(toAddr,RR->node->now())) { + if ((network)&&(network->peerNeedsOurMembershipCertificate(toAddr,RR->node->now()))) { _packetWithCom.newInitializationVector(); _packetWithCom.setDestination(toAddr); //TRACE(">>MC %.16llx -> %s (with COM)",(unsigned long long)this,toAddr.toString().c_str()); @@ -112,6 +112,7 @@ void OutboundMulticast::sendOnly(const RuntimeEnvironment *RR,const Address &toA return; } } + //TRACE(">>MC %.16llx -> %s (without COM)",(unsigned long long)this,toAddr.toString().c_str()); _packetNoCom.newInitializationVector(); _packetNoCom.setDestination(toAddr); |