trust anchors: store in prettier format (#167)

The output is only better if built with libknot >= 2.4.0.
As a side-effect, add lua method knot_rrset_t::txt_dump;
it's a light wrapper around knot_rrset_txt_dump.

Re-tested rolling with a.moot-servers.net, to be sure.

diff --git a/daemon/lua/kres-gen.lua b/daemon/lua/kres-gen.lua
index 309db5c9c23b5e6a21b132a8895bee78ec30f4fc..e8bb4f5bc70bc6b0f7963d48340dd7a57099ea83 100644 (file)
--- a/daemon/lua/kres-gen.lua
+++ b/daemon/lua/kres-gen.lua
@@ -169,7 +169,10 @@ char *knot_dname_to_str(char *, const knot_dname_t *, size_t);
 uint16_t knot_rdata_rdlen(const knot_rdata_t *);
 uint8_t *knot_rdata_data(const knot_rdata_t *);
 knot_rdata_t *knot_rdataset_at(const knot_rdataset_t *, size_t);
+int knot_rrset_add_rdata(knot_rrset_t *, const uint8_t *, const uint16_t, const uint32_t, knot_mm_t *);
+void knot_rrset_init_empty(knot_rrset_t *);
 uint32_t knot_rrset_ttl(const knot_rrset_t *);
+int knot_rrset_txt_dump(const knot_rrset_t *, char **, size_t *, const knot_dump_style_t *);
 int knot_rrset_txt_dump_data(const knot_rrset_t *, const size_t, char *, const size_t, const knot_dump_style_t *);
 const knot_dname_t *knot_pkt_qname(const knot_pkt_t *);
 uint16_t knot_pkt_qtype(const knot_pkt_t *);

diff --git a/daemon/lua/kres-gen.sh b/daemon/lua/kres-gen.sh
index 124853543220a35fbbb6f502b9aec43d8fd02342..e186a9c15276cca16484a00077ae65cdcaccb320 100755 (executable)
--- a/daemon/lua/kres-gen.sh
+++ b/daemon/lua/kres-gen.sh
@@ -77,7 +77,10 @@ genResType "enum kr_query_flag" | sed -e 's/enum kr_query_flag/struct query_flag
        knot_rdata_rdlen
        knot_rdata_data
        knot_rdataset_at
+       knot_rrset_add_rdata
+       knot_rrset_init_empty
        knot_rrset_ttl
+       knot_rrset_txt_dump
        knot_rrset_txt_dump_data
 # Packet
        knot_pkt_qname

diff --git a/daemon/lua/kres.lua.in b/daemon/lua/kres.lua.in
index e67731582b565ad3ddcd6ff73c3ffdf265ea14cb..540c7f99f866487739606ef8837100456faba18f 100644 (file)
--- a/daemon/lua/kres.lua.in
+++ b/daemon/lua/kres.lua.in
@@ -1,6 +1,8 @@
 -- LuaJIT ffi bindings for libkres, a DNS resolver library.
 -- @note Since it's statically compiled, it expects to find the symbols in the C namespace.
 
+local kres -- the module
+
 ffi = require('ffi')
 local bit = require('bit')
 local bor = bit.bor
@@ -107,6 +109,7 @@ struct sockaddr {
 /*
  * libc APIs
  */
+void * malloc(size_t size);
 void free(void *ptr);
 int inet_pton(int af, const char *src, void *dst);
 ]]
@@ -127,7 +130,7 @@ ffi.metatype( sockaddr_t, {
        }
 })
 
--- Metatype for RR set
+-- Metatype for RR set.  Beware, the indexing is 0-based (rdata, get, tostring).
 local rrset_buflen = (64 + 1) * 1024
 local rrset_buf = ffi.new('char[?]', rrset_buflen)
 local knot_rrset_t = ffi.typeof('knot_rrset_t')
@@ -158,7 +161,42 @@ ffi.metatype( knot_rrset_t, {
                                return ret >= 0 and ffi.string(rrset_buf)
                        end
                end,
-       }
+
+               -- Dump the rrset in presentation format (dig-like).
+               txt_dump = function(rr, style)
+                       if @KNOT_RRSET_TXT_DUMP@ then
+                               local bufsize = 1024
+                               local dump = ffi.new('char *[1]', C.malloc(bufsize))
+                                       -- ^ one pointer to a string
+                               local size = ffi.new('size_t[1]', { bufsize }) -- one size_t = bufsize
+
+                               local ret = knot.knot_rrset_txt_dump(rr, dump, size,
+                                                               style or knot.KNOT_DUMP_STYLE_DEFAULT)
+                               local result = nil
+                               if ret >= 0 then
+                                       result = ffi.string(dump[0], ret)
+                               end
+                               C.free(dump[0])
+                               return result
+                       else
+                               -- different _txt_dump ABI -> use old "binary" method
+                               local function hex_encode(str)
+                                       return (str:gsub('.', function (c)
+                                               return string.format('%02X', string.byte(c))
+                                       end))
+                               end
+                               local result = ''
+                               local i
+                               for i = 0, rr.rrs.rr_count - 1 do
+                                       local rr1 = rr:get(i)
+                                       local rdata = hex_encode(rr1.rdata)
+                                       result = result .. string.format('%s %d IN TYPE%d \\# %d %s\n',
+                                               kres.dname2str(rr1.owner), rr1.ttl, rr1.type, #rr1.rdata, rdata)
+                               end
+                               return result
+                       end
+               end,
+       },
 })
 
 -- Metatype for packet
@@ -273,22 +311,34 @@ local function dname2str(dname)
        return ffi.string(ffi.gc(C.knot_dname_to_str(nil, dname, 0), C.free))
 end
 
--- Pretty print for RR
-local function rr2str(rr)
-       local function hex_encode(str)
-               return (str:gsub('.', function (c)
-                       return string.format('%02X', string.byte(c))
-               end))
+-- Pretty-print a single RR (which is a table with .owner .ttl .type .rdata)
+-- Extension: append .comment if exists.
+local function rr2str(rr, style)
+       -- Construct a single-RR temporary set while minimizing copying.
+       local rrs = knot_rrset_t()
+       knot.knot_rrset_init_empty(rrs)
+       rrs._owner = ffi.cast('char *', rr.owner) -- explicit cast needed here
+       rrs.type = rr.type
+       rrs.rclass = kres.class.IN
+       knot.knot_rrset_add_rdata(rrs, rr.rdata, #rr.rdata, rr.ttl, nil)
+
+       local ret = rrs:txt_dump(style)
+       C.free(rrs.rrs.data)
+
+       -- Trim the newline and append comment (optionally).
+       if ret then
+               if ret:byte(-1) == string.byte('\n', -1) then
+                       ret = ret:sub(1, -2)
+               end
+               if rr.comment then
+                       ret = ret .. ' ;' .. rr.comment
+               end
        end
-       local rdata = hex_encode(rr.rdata)
-       res = string.format('%s %d IN TYPE%d \\# %d %s',
-               dname2str(rr.owner), rr.ttl, rr.type, #rr.rdata, rdata)
-       if rr.comment then res = res .. ';' .. rr.comment end
-       return res
+       return ret
 end
 
 -- Module API
-local kres = {
+kres = {
        -- Constants
        class = ffi.new('struct rr_class'),
        type = ffi.new('struct rr_type'),