Merge remote-tracking branch 'huffman/protocol' into atp

This commit is contained in:
Stephen Birarda 2015-07-07 16:10:07 -07:00
commit 018831e230

View file

@ -24,7 +24,7 @@ NetworkPacket::NetworkPacket(const NetworkPacket& other) :
}
NetworkPacket::NetworkPacket(const SharedNodePointer& node, const NLPacket& packet) {
if (packet.getSizeWitHeader() && packet.getSizeWithHeader() <= MAX_nlPacket_SIZE) {
if (packet.getSizeWithHeader() && packet.getSizeWithHeader() <= MAX_PACKET_SIZE) {
_node = node;
_nlPacket = packet;
} else {