Skip to content

Fix #34 - winquake connection issue, update deprecated Buffer allocat… #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
efess wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fix #34 - winquake connection issue, update deprecated Buffer allocat… #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Server/WebQDS/COM.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ COM.LoadFile = function(filename)
break;
}
Sys.Print('PackFile: ' + search.filename + '/pak' + j + '.pak : ' + filename + '\n')
src = new Buffer(file.filelen);
src = Buffer.alloc(file.filelen);
Node.fs.readSync(fd, src, 0, file.filelen, file.filepos);
Node.fs.closeSync(fd);
break;
Expand Down Expand Up @@ -255,7 +255,7 @@ COM.LoadPackFile = function(packfile)
{
return;
}
var buf = new Buffer(12);
var buf = Buffer.alloc(12);
Node.fs.readSync(fd, buf, 0, 12, 0);
if (buf.readUInt32LE(0) !== 0x4b434150)
Sys.Error(packfile + ' is not a packfile');
Expand All @@ -267,7 +267,7 @@ COM.LoadPackFile = function(packfile)
var pack = [];
if (numpackfiles !== 0)
{
buf = new Buffer(dirlen);
buf = Buffer.alloc(dirlen);
Node.fs.readSync(fd, buf, 0, dirlen, dirofs);
if (CRC.Block(buf) !== 32981)
COM.modified = true;
Expand Down
19 changes: 10 additions & 9 deletions Server/WebQDS/NET_Datagram.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,15 +87,15 @@ Datagram.CheckNewConnections = function()
sock.sendSequence = 0;
sock.unreliableSendSequence = 0;
sock.sendMessageLength = 0;
sock.sendMessage = new Buffer(8192);
sock.sendMessage = Buffer.alloc(8192);
sock.receiveSequence = 0;
sock.unreliableReceiveSequence = 0;
sock.receiveMessageLength = 0;
sock.receiveMessage = new Buffer(8192);
sock.receiveMessage = Buffer.alloc(8192);
sock.addr = address;
sock.address = address[0] + ':' + address[1];
sock.messages = [];
var buf = new Buffer(1032);
var buf = Buffer.alloc(1032);
buf.writeUInt32LE(0x09000080, 0);
buf[4] = 0x81;
buf.writeUInt32LE(newsocket.data_port, 5);
Expand Down Expand Up @@ -128,8 +128,9 @@ Datagram.GetMessage = function(sock)
Con.DPrint('Dropped ' + (sequence - sock.unreliableReceiveSequence) + ' datagram(s)\n');
sock.unreliableReceiveSequence = sequence + 1;
NET.message.cursize = length;
const dest = new Uint8Array(NET.message.data)
for (i = 0; i < length; ++i)
NET.message.data[i] = message[8 + i];
dest[i] = message[8 + i];
ret = 2;
break;
}
Expand Down Expand Up @@ -163,7 +164,7 @@ Datagram.GetMessage = function(sock)
}
if ((flags & 1) !== 0)
{
sock.driverdata.send(new Buffer([0, 2, 0, 8, sequence >>> 24, (sequence & 0xff0000) >>> 16, (sequence & 0xff00) >>> 8, (sequence & 0xff) >>> 0]),
sock.driverdata.send(Buffer.from([0, 2, 0, 8, sequence >>> 24, (sequence & 0xff0000) >>> 16, (sequence & 0xff00) >>> 8, (sequence & 0xff) >>> 0]),
0, 8, sock.addr[1], sock.addr[0]);
if (sequence !== sock.receiveSequence)
continue;
Expand Down Expand Up @@ -198,7 +199,7 @@ Datagram.SendMessage = function(sock, data)
for (i = 0; i < data.cursize; ++i)
sock.sendMessage[i] = src[i];
sock.sendMessageLength = data.cursize;
var buf = new Buffer(1032);
var buf = Buffer.alloc(1032);
buf[0] = 0;
var dataLen;
if (data.cursize <= 1024)
Expand All @@ -222,7 +223,7 @@ Datagram.SendMessage = function(sock, data)

Datagram.SendMessageNext = function(sock, resend)
{
var buf = new Buffer(1032);
var buf = Buffer.alloc(1032);
buf[0] = 0;
var dataLen;
if (sock.sendMessageLength <= 1024)
Expand Down Expand Up @@ -250,7 +251,7 @@ Datagram.SendUnreliableMessage = function(sock, data)
{
if (sock.driverdata == null)
return -1;
var buf = new Buffer(1032);
var buf = Buffer.alloc(1032);
buf.writeUInt32BE(data.cursize + 0x00100008, 0);
buf.writeUInt32BE(sock.unreliableSendSequence++, 4);
var i, src = new Uint8Array(data.data);
Expand Down Expand Up @@ -288,7 +289,7 @@ Datagram.ControlOnMessage = function(msg, rinfo)
if (((msg[2] << 8) + msg[3]) !== rinfo.size)
return;
var command = msg[4];
var buf = new Buffer(1032), str, cursize;
var buf = Buffer.alloc(1032), str, cursize;
buf[0] = 0x80;
buf[1] = 0;

Expand Down
6 changes: 3 additions & 3 deletions Server/WebQDS/NET_WEBS.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ WEBS.SendMessage = function(sock, data)
return -1;
if (sock.driverdata.closeReasonCode !== -1)
return -1;
var src = new Uint8Array(data.data), dest = new Buffer(data.cursize + 1), i;
var src = new Uint8Array(data.data), dest = Buffer.alloc(data.cursize + 1), i;
dest[0] = 1;
var i;
for (i = 0; i < data.cursize; ++i)
Expand All @@ -98,7 +98,7 @@ WEBS.SendUnreliableMessage = function(sock, data)
return -1;
if (sock.driverdata.closeReasonCode !== -1)
return -1;
var src = new Uint8Array(data.data), dest = new Buffer(data.cursize + 1), i;
var src = new Uint8Array(data.data), dest = Buffer.alloc(data.cursize + 1), i;
dest[0] = 2;
var i;
for (i = 0; i < data.cursize; ++i)
Expand Down Expand Up @@ -420,7 +420,7 @@ WEBS.HTTPOnRequest = function(request, response)
}
try
{
password = (new Buffer(password.substring(6), 'base64')).toString('ascii');
password = (Buffer.from(password.substring(6), 'base64')).toString('ascii');
}
catch (e)
{
Expand Down