diff --git a/modules/ta_sentinel/ta_sentinel.lua b/modules/ta_sentinel/ta_sentinel.lua index 8ac958e96bfee03656a40125d5fe5c750dbcc039..59ee11d04cf5083d0e64db196cc13c78508d62f7 100644 --- a/modules/ta_sentinel/ta_sentinel.lua +++ b/modules/ta_sentinel/ta_sentinel.lua @@ -21,13 +21,13 @@ function M.layer.finish(state, req, pkt) if not (kpkt:qclass() == kres.class.IN) then return state end - local qname = kres.dname2str(qry:name()) - local sentype, hexkeytag = qname:match('^_([iI][sS])%-[tT][aA]%-(%x+).') + local qname = kres.dname2str(qry:name()):lower() + local sentype, hexkeytag = qname:match('^kskroll%-sentinel%-(is)%-ta%-(%x+)%.') if not sentype then - sentype, hexkeytag = qname:match('^_([nN][oO][tT])%-[tT][aA]%-(%x+).') + sentype, hexkeytag = qname:match('^kskroll%-sentinel%-(not)%-ta%-(%x+)%.') end if not sentype or not hexkeytag then - return state end -- regex did not match, exit + return state end -- pattern did not match, exit -- end of hot path local qkeytag = tonumber(hexkeytag, 16) @@ -36,7 +36,6 @@ function M.layer.finish(state, req, pkt) if (qkeytag < 0) or (qkeytag > 0xffff) then return state end -- invalid keytag?!, exit - sentype = sentype:lower() if verbose() then log('[ta_sentinel] key tag: ' .. qkeytag .. ', sentinel: ' .. sentype) end diff --git a/tests/deckard b/tests/deckard index 39772e7336d9465a81bae6e983cb7fd559f7f0bc..dd660f91a4ea5d39e5a7fead340ed37b193de095 160000 --- a/tests/deckard +++ b/tests/deckard @@ -1 +1 @@ -Subproject commit 39772e7336d9465a81bae6e983cb7fd559f7f0bc +Subproject commit dd660f91a4ea5d39e5a7fead340ed37b193de095