mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

net.websocket.frames: Replace bit fiddling code with util.struct

Browse source 
Fallback code for not having either the string.pack and string.unpack
functions available in Lua 5.4 or the struct lib is no longer needed
since the struct lib was imported as util.struct in 3ce3633527af
This commit is contained in:
Kim Alvefur 2022-03-06 15:13:50 +01:00
parent 9a86373fd1
commit ece896d253
1 changed files with 15 additions and 50 deletions
Download patch file Download diff file Expand all files Collapse all files

65
net/websocket/frames.lua
View file

@ -6,71 +6,36 @@
-- COPYING file in the source package for more information.
--
local softreq = require "util.dependencies".softreq;
local random_bytes = require "util.random".bytes;
local bit = require "util.bitcompat";
local band = bit.band;
local bor = bit.bor;
local lshift = bit.lshift;
local rshift = bit.rshift;
local sbit = require "util.strbitop";
local sxor = sbit.sxor;
local s_char= string.char;
local s_pack = string.pack;
local s_unpack = string.unpack;
local s_char = string.char;
local s_pack = require"util.struct".pack;
local s_unpack = require"util.struct".unpack;
if not s_pack and softreq"struct" then
s_pack = softreq"struct".pack;
s_unpack = softreq"struct".unpack;
local function pack_uint16be(x)
return s_pack(">I2", x);
end
local function pack_uint64be(x)
return s_pack(">I8", x);
end
local function read_uint16be(str, pos)
local l1, l2 = str:byte(pos, pos+1);
return l1*256 + l2;
if type(str) ~= "string" then
str, pos = str:sub(pos, pos+1), 1;
end
return s_unpack(">I2", str, pos);
end
-- FIXME: this may lose precision
local function read_uint64be(str, pos)
local l1, l2, l3, l4, l5, l6, l7, l8 = str:byte(pos, pos+7);
local h = lshift(l1, 24) + lshift(l2, 16) + lshift(l3, 8) + l4;
local l = lshift(l5, 24) + lshift(l6, 16) + lshift(l7, 8) + l8;
return h * 2^32 + l;
end
local function pack_uint16be(x)
return s_char(rshift(x, 8), band(x, 0xFF));
end
local function get_byte(x, n)
return band(rshift(x, n), 0xFF);
end
local function pack_uint64be(x)
local h = band(x / 2^32, 2^32-1);
return s_char(get_byte(h, 24), get_byte(h, 16), get_byte(h, 8), band(h, 0xFF),
get_byte(x, 24), get_byte(x, 16), get_byte(x, 8), band(x, 0xFF));
end
if s_pack then
function pack_uint16be(x)
return s_pack(">I2", x);
end
function pack_uint64be(x)
return s_pack(">I8", x);
end
end
if s_unpack then
function read_uint16be(str, pos)
if type(str) ~= "string" then
str, pos = str:sub(pos, pos+1), 1;
end
return s_unpack(">I2", str, pos);
end
function read_uint64be(str, pos)
if type(str) ~= "string" then
str, pos = str:sub(pos, pos+7), 1;
end
return s_unpack(">I8", str, pos);
if type(str) ~= "string" then
str, pos = str:sub(pos, pos+7), 1;
end
return s_unpack(">I8", str, pos);
end
local function parse_frame_header(frame)