From 0555828e62e045b4ea661e69b7e049ccb40377e1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 6 Aug 2021 11:52:26 +0200 Subject: [PATCH] adjust RR-dumping style a little The former "default" dumping style isn't really used anywhere in Knot. The only visible difference is that RRSIGs are now logged *without* replacing their TTLs by the original non-decremented TTL values. That can avoid some confusion when reading debug logs. (Those original TTLs are still shown a bit further on each line.) --- daemon/lua/kres-gen-29.lua | 2 +- daemon/lua/kres-gen-31.lua | 2 +- daemon/lua/kres-gen.sh | 2 +- daemon/lua/kres.lua | 6 +++--- lib/utils.c | 6 +++++- lib/utils.h | 5 +++++ 6 files changed, 16 insertions(+), 7 deletions(-) diff --git a/daemon/lua/kres-gen-29.lua b/daemon/lua/kres-gen-29.lua index 7649520ee..ebc60488b 100644 --- a/daemon/lua/kres-gen-29.lua +++ b/daemon/lua/kres-gen-29.lua @@ -11,7 +11,7 @@ struct timeval { }; typedef struct knot_dump_style knot_dump_style_t; -extern const knot_dump_style_t KNOT_DUMP_STYLE_DEFAULT; +extern const knot_dump_style_t KR_DUMP_STYLE_DEFAULT; struct kr_cdb_api {}; struct lru {}; typedef enum {KNOT_ANSWER, KNOT_AUTHORITY, KNOT_ADDITIONAL} knot_section_t; diff --git a/daemon/lua/kres-gen-31.lua b/daemon/lua/kres-gen-31.lua index 4e2b4ed7c..991da7022 100644 --- a/daemon/lua/kres-gen-31.lua +++ b/daemon/lua/kres-gen-31.lua @@ -11,7 +11,7 @@ struct timeval { }; typedef struct knot_dump_style knot_dump_style_t; -extern const knot_dump_style_t KNOT_DUMP_STYLE_DEFAULT; +extern const knot_dump_style_t KR_DUMP_STYLE_DEFAULT; struct kr_cdb_api {}; struct lru {}; typedef enum {KNOT_ANSWER, KNOT_AUTHORITY, KNOT_ADDITIONAL} knot_section_t; diff --git a/daemon/lua/kres-gen.sh b/daemon/lua/kres-gen.sh index 3fb1f2078..eded99ea9 100755 --- a/daemon/lua/kres-gen.sh +++ b/daemon/lua/kres-gen.sh @@ -64,7 +64,7 @@ EOF printf " typedef struct knot_dump_style knot_dump_style_t; -extern const knot_dump_style_t KNOT_DUMP_STYLE_DEFAULT; +extern const knot_dump_style_t KR_DUMP_STYLE_DEFAULT; struct kr_cdb_api {}; struct lru {}; " diff --git a/daemon/lua/kres.lua b/daemon/lua/kres.lua index aa95c232d..550756195 100644 --- a/daemon/lua/kres.lua +++ b/daemon/lua/kres.lua @@ -395,7 +395,7 @@ ffi.metatype( knot_rrset_t, { if rr:rdcount() > 0 then local ret if i ~= nil then - ret = knot.knot_rrset_txt_dump_data(rr, i, rrset_buf, rrset_buflen, knot.KNOT_DUMP_STYLE_DEFAULT) + ret = knot.knot_rrset_txt_dump_data(rr, i, rrset_buf, rrset_buflen, C.KR_DUMP_STYLE_DEFAULT) else ret = -1 end @@ -412,7 +412,7 @@ ffi.metatype( knot_rrset_t, { 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) + style or C.KR_DUMP_STYLE_DEFAULT) local result = nil if ret >= 0 then result = ffi.string(dump[0], ret) @@ -428,7 +428,7 @@ ffi.metatype( knot_rrset_t, { ffi.gc(dump, C.free) local ret = knot.knot_rrset_txt_dump_data(rr, i, dump, 1024, - knot.KNOT_DUMP_STYLE_DEFAULT) + C.KR_DUMP_STYLE_DEFAULT) if ret >= 0 then local out = {} out.owner = dname2str(rr:owner()) diff --git a/lib/utils.c b/lib/utils.c index 789a9b25f..47f913e41 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -1010,6 +1010,10 @@ char *kr_pkt_text(const knot_pkt_t *pkt) return result; } +const knot_dump_style_t KR_DUMP_STYLE_DEFAULT = { /* almost all = false, */ + .show_ttl = true, +}; + char *kr_rrset_text(const knot_rrset_t *rr) { if (!rr) { @@ -1019,7 +1023,7 @@ char *kr_rrset_text(const knot_rrset_t *rr) /* Note: knot_rrset_txt_dump will double the size until the rrset fits */ size_t bufsize = 128; char *buf = malloc(bufsize); - int ret = knot_rrset_txt_dump(rr, &buf, &bufsize, &KNOT_DUMP_STYLE_DEFAULT); + int ret = knot_rrset_txt_dump(rr, &buf, &bufsize, &KR_DUMP_STYLE_DEFAULT); if (ret < 0) { free(buf); return NULL; diff --git a/lib/utils.h b/lib/utils.h index 9232da304..b372d5f00 100644 --- a/lib/utils.h +++ b/lib/utils.h @@ -401,6 +401,11 @@ int kr_ranked_rrarray_set_wire(ranked_rr_array_t *array, bool to_wire, uint32_t qry_uid, bool check_dups, bool (*extraCheck)(const ranked_rr_array_entry_t *)); + +/** Style used by the kr_*_text() functions. */ +KR_EXPORT extern +const knot_dump_style_t KR_DUMP_STYLE_DEFAULT; + /** * @return Newly allocated string representation of packet. * Caller has to free() returned string. -- 2.47.2