Small fix to send pushes if not a reply.

This commit is contained in:
Adam Ierymenko 2016-11-10 11:57:45 -08:00
parent 226123ca08
commit 12d32b9311

View File

@ -736,9 +736,11 @@ void Node::ncSendConfig(uint64_t nwid,uint64_t requestPacketId,const Address &de
unsigned int chunkIndex = 0; unsigned int chunkIndex = 0;
while (chunkIndex < totalSize) { while (chunkIndex < totalSize) {
const unsigned int chunkLen = std::min(totalSize - chunkIndex,(unsigned int)(ZT_UDP_DEFAULT_PAYLOAD_MTU - (ZT_PACKET_IDX_PAYLOAD + 256))); const unsigned int chunkLen = std::min(totalSize - chunkIndex,(unsigned int)(ZT_UDP_DEFAULT_PAYLOAD_MTU - (ZT_PACKET_IDX_PAYLOAD + 256)));
Packet outp(destination,RR->identity.address(),Packet::VERB_OK); Packet outp(destination,RR->identity.address(),(requestPacketId) ? Packet::VERB_OK : Packet::VERB_NETWORK_CONFIG);
outp.append((unsigned char)Packet::VERB_NETWORK_CONFIG_REQUEST); if (requestPacketId) {
outp.append(requestPacketId); outp.append((unsigned char)Packet::VERB_NETWORK_CONFIG_REQUEST);
outp.append(requestPacketId);
}
const unsigned int sigStart = outp.size(); const unsigned int sigStart = outp.size();
outp.append(nwid); outp.append(nwid);
@ -800,7 +802,7 @@ void Node::ncSendError(uint64_t nwid,uint64_t requestPacketId,const Address &des
} }
outp.append(nwid); outp.append(nwid);
RR->sw->send(outp,true); RR->sw->send(outp,true);
} } // else we can't send an ERROR() in response to nothing, so discard
} }
} // namespace ZeroTier } // namespace ZeroTier