Fix zerocoder, use buffers instead of strings for vardata, add util for null-terminated string<->buffer conversion

This commit is contained in:
Casper Warden
2017-11-26 19:47:41 +00:00
parent 3f25aa0f1b
commit fc6d77a893
195 changed files with 2005 additions and 1881 deletions

View File

@@ -17,10 +17,10 @@ export class DirPlacesQueryMessage implements MessageBase
};
QueryData: {
QueryID: UUID;
QueryText: string;
QueryText: Buffer;
QueryFlags: number;
Category: number;
SimName: string;
SimName: Buffer;
QueryStart: number;
};
@@ -39,13 +39,13 @@ export class DirPlacesQueryMessage implements MessageBase
this.QueryData['QueryID'].writeToBuffer(buf, pos);
pos += 16;
buf.writeUInt8(this.QueryData['QueryText'].length, pos++);
buf.write(this.QueryData['QueryText'], pos);
this.QueryData['QueryText'].copy(buf, pos);
pos += this.QueryData['QueryText'].length;
buf.writeUInt32LE(this.QueryData['QueryFlags'], pos);
pos += 4;
buf.writeInt8(this.QueryData['Category'], pos++);
buf.writeUInt8(this.QueryData['SimName'].length, pos++);
buf.write(this.QueryData['SimName'], pos);
this.QueryData['SimName'].copy(buf, pos);
pos += this.QueryData['SimName'].length;
buf.writeInt32LE(this.QueryData['QueryStart'], pos);
pos += 4;
@@ -70,29 +70,29 @@ export class DirPlacesQueryMessage implements MessageBase
this.AgentData = newObjAgentData;
const newObjQueryData: {
QueryID: UUID,
QueryText: string,
QueryText: Buffer,
QueryFlags: number,
Category: number,
SimName: string,
SimName: Buffer,
QueryStart: number
} = {
QueryID: UUID.zero(),
QueryText: '',
QueryText: Buffer.allocUnsafe(0),
QueryFlags: 0,
Category: 0,
SimName: '',
SimName: Buffer.allocUnsafe(0),
QueryStart: 0
};
newObjQueryData['QueryID'] = new UUID(buf, pos);
pos += 16;
varLength = buf.readUInt8(pos++);
newObjQueryData['QueryText'] = buf.toString('utf8', pos, pos + (varLength - 1));
newObjQueryData['QueryText'] = buf.slice(pos, pos + (varLength - 1));
pos += varLength;
newObjQueryData['QueryFlags'] = buf.readUInt32LE(pos);
pos += 4;
newObjQueryData['Category'] = buf.readInt8(pos++);
varLength = buf.readUInt8(pos++);
newObjQueryData['SimName'] = buf.toString('utf8', pos, pos + (varLength - 1));
newObjQueryData['SimName'] = buf.slice(pos, pos + (varLength - 1));
pos += varLength;
newObjQueryData['QueryStart'] = buf.readInt32LE(pos);
pos += 4;