History

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
3131 _paymentIntervalTimer.start();
3232 }
3333
34−void DomainServerNodeData::parseJSONStatsPacket(const QByteArray& statsPacket) {
35− QVariantMap packetVariantMap = JSONBreakableMarshal::fromStringBuffer(statsPacket.mid(numBytesForPacketHeader(statsPacket)));
34+void DomainServerNodeData::processJSONStatsPacket(NLPacket& statsPacket) {
35+ QVariantMap packetVariantMap = JSONBreakableMarshal::fromStringBuffer(statsPacket.readAll());
3636 _statsJSONObject = mergeJSONStatsFromNewObject(QJsonObject::fromVariantMap(packetVariantMap), _statsJSONObject);
3737 }
3838

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t