Merge branch 'receive_packets' of https://github.com/huffman/hifi into protocol

Atlante45 committed 11 years ago

Commit fbb6a942 parents aca759a c6ffda1107 files · +1921 −2050Browse files

Showing the changes to domain-server/src/DomainServerNodeData.cpp (1 of 107 files). Show all

Unified · Split

domain-server/src/DomainServerNodeData.cpp+2−2

@@ -31,8 +31,8 @@ DomainServerNodeData::DomainServerNodeData() : · 30 unmodified lines
31	_paymentIntervalTimer.start();	31	_paymentIntervalTimer.start();
32	}	32	}
33		33
34	void DomainServerNodeData::parseJSONStatsPacket(const QByteArray& statsPacket) {	34	void DomainServerNodeData::processJSONStatsPacket(NLPacket& statsPacket) {
35	QVariantMap packetVariantMap = JSONBreakableMarshal::fromStringBuffer(statsPacket.mid(numBytesForPacketHeader(statsPacket)));	35	QVariantMap packetVariantMap = JSONBreakableMarshal::fromStringBuffer(statsPacket.readAll());
36	_statsJSONObject = mergeJSONStatsFromNewObject(QJsonObject::fromVariantMap(packetVariantMap), _statsJSONObject);	36	_statsJSONObject = mergeJSONStatsFromNewObject(QJsonObject::fromVariantMap(packetVariantMap), _statsJSONObject);
37	}	37	}
38		38