Miko/node-metaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix WARNING related to appended acks in non-zerocoded packets

Browse Source
This commit is contained in:
Casper Warden
2017-12-19 23:36:28 +00:00
parent 58b29d8893
commit 4743dbfeec
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dist/classes/Packet.js vendored
View File

@@ -75,11 +75,13 @@ class Packet {
this.extraHeader = Buffer.allocUnsafe(0);
}
let appendedAcks = 0;
if (this.packetFlags & PacketFlags_1.PacketFlags.Ack) {
appendedAcks = buf.readUInt8(buf.length - 1);
}
if (this.packetFlags & PacketFlags_1.PacketFlags.Zerocoded) {
let tail = 0;
if (this.packetFlags & PacketFlags_1.PacketFlags.Ack) {
tail = 1;
appendedAcks = buf.readUInt8(buf.length - 1);
if (appendedAcks > 0) {
tail += appendedAcks * 4;
}

2
dist/classes/Packet.js.map vendored
View File

@@ -1 +1 @@
{"version":3,"file":"Packet.js","sourceRoot":"","sources":["../../lib/classes/Packet.ts"],"names":[],"mappings":"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"}
{"version":3,"file":"Packet.js","sourceRoot":"","sources":["../../lib/classes/Packet.ts"],"names":[],"mappings":"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"}

5
lib/classes/Packet.ts
View File

@@ -96,6 +96,10 @@ export class Packet
this.extraHeader = Buffer.allocUnsafe(0);
}
let appendedAcks = 0;
if (this.packetFlags & PacketFlags.Ack)
{
appendedAcks = buf.readUInt8(buf.length - 1);
}
if (this.packetFlags & PacketFlags.Zerocoded)
{
// Annoyingly, the AppendedAcks aren't zerocoded so we need to stop decode early
@@ -104,7 +108,6 @@ export class Packet
{
// Final byte in the packet contains the number of Acks
tail = 1;
appendedAcks = buf.readUInt8(buf.length - 1);
if (appendedAcks > 0)
{
tail += appendedAcks * 4;