diff options
| author | Oto Šťáva <oto.stava@nic.cz> | 2024-07-11 14:50:28 +0200 |
|---|---|---|
| committer | Oto Šťáva <oto.stava@nic.cz> | 2024-07-11 14:50:28 +0200 |
| commit | 9f99d5b79f84b1ce083d9514077413050bbe2ad1 (patch) | |
| tree | 6905f5d3d1b211ee6d51c1a358ca9efc8894776f /lib | |
| parent | Merge branch 'manager-instability-handling' into 'master' (diff) | |
| parent | drop libknot <=3.2.x support (diff) | |
| download | knot-resolver-9f99d5b79f84b1ce083d9514077413050bbe2ad1.tar.xz knot-resolver-9f99d5b79f84b1ce083d9514077413050bbe2ad1.zip | |
Merge branch 'drop-libknot-3.2' into 'master'
drop libknot <=3.2.x support
See merge request knot/knot-resolver!1565
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/defines.h | 5 | ||||
| -rw-r--r-- | lib/resolve.c | 4 | ||||
| -rw-r--r-- | lib/utils.c | 4 |
3 files changed, 0 insertions, 13 deletions
diff --git a/lib/defines.h b/lib/defines.h index e8328928..24205896 100644 --- a/lib/defines.h +++ b/lib/defines.h @@ -73,11 +73,6 @@ static inline int KR_COLD kr_error(int x) { #define KR_DNAME_STR_MAXLEN (KNOT_DNAME_TXT_MAXLEN + 1) #define KR_RRTYPE_STR_MAXLEN (16 + 1) -/* Compatibility with libknot<3.1.0 */ -#if KNOT_VERSION_HEX < 0x030100 -#define KNOT_EDNS_EDE_NONE (-1) -#endif - /* * Address sanitizer hints. */ diff --git a/lib/resolve.c b/lib/resolve.c index ec00b215..4730f105 100644 --- a/lib/resolve.c +++ b/lib/resolve.c @@ -246,11 +246,7 @@ static int pkt_padding(knot_pkt_t *packet, int32_t padding) if (padding == -1) { /* use the default padding policy from libknot */ const size_t block_size = knot_wire_get_qr(packet->wire) ? KNOT_EDNS_ALIGNMENT_RESPONSE_DEFAULT - #if KNOT_VERSION_HEX < 0x030200 - : KNOT_EDNS_ALIGNMENT_QUERY_DEFALT; - #else : KNOT_EDNS_ALIGNMENT_QUERY_DEFAULT; - #endif pad_bytes = knot_edns_alignment_size(packet->size, knot_rrset_size(opt_rr), block_size); } diff --git a/lib/utils.c b/lib/utils.c index 2a0635e0..d04f5467 100644 --- a/lib/utils.c +++ b/lib/utils.c @@ -1198,11 +1198,7 @@ char *kr_pkt_text(const knot_pkt_t *pkt) const knot_dump_style_t KR_DUMP_STYLE_DEFAULT = { /* almost all = false, */ .show_ttl = true, -#if KNOT_VERSION_HEX >= 0x030200 .human_timestamp = true, -#else - .human_tmstamp = true, -#endif }; char *kr_rrset_text(const knot_rrset_t *rr) |