Skip to content
Open
Changes from all commits
Commits
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
14 changes: 8 additions & 6 deletions mmdvm.lua
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function string.fromhex(str)
end

function round(num, precision)
return math.floor(num*math.pow(10,precision)+0.5) / math.pow(10,precision)
return math.floor(num*10^precision+0.5) / 10^precision
end

-- removes leading zeros
Expand Down Expand Up @@ -463,11 +463,11 @@ function p_mmdvm.dissector (buf, pkt, root)
elseif (tostring(buf(0,6)):fromhex()) == "MSTNAK" then

subtree:add(f_signature, buf(0,6))
info("NAK in frame" .. _number)
print("NAK in frame" .. _number)

if not pkt.visited then

info("univsited NAK in frame" .. _number)
print("univsited NAK in frame" .. _number)

if not state_map[_number] then
state_map[_number] = {}
Expand Down Expand Up @@ -520,15 +520,17 @@ function p_mmdvm.dissector (buf, pkt, root)
else
if buf:len() == 10 then
subtree:add(f_rptr_id, buf(6,4))
pkt.cols.info:set("MSTNAK")
state_map[_number]['MSG'] = "MST->RPT: MSTNAK"
else
pkt.cols.info:set("MSTNAK [MALFORMED]")
state_map[_number]['MALFORMED'] = true
state_map[_number]['MSG'] = "MST->RPT: MSTNAK [MALFORMED]"
end
pkt.cols.info:set(state_map[_number]['MSG'])
end

else

info("visited NAK in frame" .. _number)
print("visited NAK in frame" .. _number)
_message = state_map[_number]['MSG']
pkt.cols.info:set(_message)
if not state_map[_number]['MALFORMED'] then
Expand Down