diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-07-07 10:00:34 -0700 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-07-07 10:00:34 -0700 |
| commit | 778c7e6e703353030e2ea130e3db7cc968a5d53c (patch) | |
| tree | d9e8672cec00aef9e9403afb40563faa37d88b54 /node/IncomingPacket.cpp | |
| parent | c863ff3f02e9d68eb9bea32160d252eaddb7f1f5 (diff) | |
| download | infinitytier-778c7e6e703353030e2ea130e3db7cc968a5d53c.tar.gz infinitytier-778c7e6e703353030e2ea130e3db7cc968a5d53c.zip | |
More cleanup to direct path push, comment fixes, etc.
Diffstat (limited to 'node/IncomingPacket.cpp')
| -rw-r--r-- | node/IncomingPacket.cpp | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/node/IncomingPacket.cpp b/node/IncomingPacket.cpp index 7e883221..d5b4e9e6 100644 --- a/node/IncomingPacket.cpp +++ b/node/IncomingPacket.cpp @@ -661,21 +661,8 @@ bool IncomingPacket::_doNETWORK_MEMBERSHIP_CERTIFICATE(const RuntimeEnvironment ptr += com.deserialize(*this,ptr); if (com.hasRequiredFields()) { SharedPtr<Network> network(RR->node->network(com.networkId())); - if (network) { - if (network->validateAndAddMembershipCertificate(com)) { - if ((network->isAllowed(peer->address()))&&(network->peerNeedsOurMembershipCertificate(peer->address(),RR->node->now()))) { - // If peer passed our check and we haven't sent it our cert yet, respond - // and push our cert as well for instant authorization setup. - SharedPtr<NetworkConfig> nconf(network->config2()); - if ((nconf)&&(nconf->com())) { - Packet outp(peer->address(),RR->identity.address(),Packet::VERB_NETWORK_MEMBERSHIP_CERTIFICATE); - nconf->com().serialize(outp); - outp.armor(peer->key(),true); - RR->node->putPacket(_remoteAddress,outp.data(),outp.size()); - } - } - } - } + if (network) + network->validateAndAddMembershipCertificate(com); } } |
