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

net.stun: Factor out address unpack, an operation common to multiple attributes

Browse source
This commit is contained in:
Matthew Wild 2022-03-05 11:03:44 +00:00
parent 6e9d71259c
commit ac06bd8c97
1 changed files with 12 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

23
net/stun.lua
View file

@ -207,11 +207,13 @@ function packet_methods:get_attribute(attr_type)
end end
end end
function packet_methods:get_mapped_address() function packet_methods:_unpack_address(data, xor)
local data = self:get_attribute("mapped-address");
if not data then return; end
local family, port = struct.unpack("x>BI2", data); local family, port = struct.unpack("x>BI2", data);
local addr = data:sub(5); local addr = data:sub(5);
if xor then
port = bit32.bxor(port, 0x2112);
addr = sxor(addr, magic_cookie..self.transaction_id);
end
return { return {
family = addr_families[family] or "unknown"; family = addr_families[family] or "unknown";
port = port; port = port;
@ -219,17 +221,16 @@ function packet_methods:get_mapped_address()
}; };
end end
function packet_methods:get_mapped_address()
local data = self:get_attribute("mapped-address");
if not data then return; end
return self:_unpack_address(data, false);
end
function packet_methods:get_xor_mapped_address() function packet_methods:get_xor_mapped_address()
local data = self:get_attribute("xor-mapped-address"); local data = self:get_attribute("xor-mapped-address");
if not data then return; end if not data then return; end
local family, port = struct.unpack("x>BI2", data); return self:_unpack_address(data, true);
local addr = sxor(data:sub(5), magic_cookie..self.transaction_id);
return {
family = addr_families[family] or "unknown";
port = bit32.bxor(port, 0x2112);
address = net.ntop(addr);
address_raw = data:sub(5);
};
end end
function packet_methods:add_message_integrity(key) function packet_methods:add_message_integrity(key)