diff options
| author | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-02-24 14:17:57 -0800 |
|---|---|---|
| committer | Adam Ierymenko <adam.ierymenko@gmail.com> | 2015-02-24 14:17:57 -0800 |
| commit | b6fba5934a07b719d1b2fb97f1a06c336072ee9d (patch) | |
| tree | 10ac4b97506f6a4bd2edd1120b6c178844d140f2 /node/IncomingPacket.cpp | |
| parent | 78fc62d967690f07886f7bc28df8e92528829fb3 (diff) | |
| download | infinitytier-b6fba5934a07b719d1b2fb97f1a06c336072ee9d.tar.gz infinitytier-b6fba5934a07b719d1b2fb97f1a06c336072ee9d.zip | |
RedisNetworkConfigMaster in its own folder. Also fix some hex/decimal Redis database confusion.
Diffstat (limited to 'node/IncomingPacket.cpp')
| -rw-r--r-- | node/IncomingPacket.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/node/IncomingPacket.cpp b/node/IncomingPacket.cpp index 7bc8cc9c..21fcac01 100644 --- a/node/IncomingPacket.cpp +++ b/node/IncomingPacket.cpp @@ -632,7 +632,7 @@ bool IncomingPacket::_doNETWORK_CONFIG_REQUEST(const RuntimeEnvironment *RR,cons if (RR->netconfMaster) { Dictionary netconf; - switch(RR->netconfMaster->doNetworkConfigRequest(_remoteAddress,packetId(),source(),nwid,metaData,haveTimestamp,netconf)) { + switch(RR->netconfMaster->doNetworkConfigRequest(_remoteAddress,packetId(),peer->identity(),nwid,metaData,haveTimestamp,netconf)) { case NetworkConfigMaster::NETCONF_QUERY_OK: { std::string netconfStr(netconf.toString()); if (netconfStr.length() > 0xffff) { // sanity check since field ix 16-bit @@ -652,6 +652,8 @@ bool IncomingPacket::_doNETWORK_CONFIG_REQUEST(const RuntimeEnvironment *RR,cons } } } break; + case NetworkConfigMaster::NETCONF_QUERY_OK_BUT_NOT_NEWER: // nothing to do -- netconf has not changed + break; case NetworkConfigMaster::NETCONF_QUERY_OBJECT_NOT_FOUND: { Packet outp(peer->address(),RR->identity.address(),Packet::VERB_ERROR); outp.append((unsigned char)Packet::VERB_NETWORK_CONFIG_REQUEST); |