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

… allocations
efess · May 5, 2019 · af24f09 · af24f09
1 parent 917617f
commit af24f09
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/Server/WebQDS/COM.js b/Server/WebQDS/COM.js
@@ -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;
@@ -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');
@@ -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;

diff --git a/Server/WebQDS/NET_Datagram.js b/Server/WebQDS/NET_Datagram.js
@@ -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);
@@ -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;
 		}
@@ -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;
@@ -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)
@@ -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)
@@ -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);
@@ -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;
 

diff --git a/Server/WebQDS/NET_WEBS.js b/Server/WebQDS/NET_WEBS.js
@@ -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)
@@ -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)
@@ -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)
 		{