From 97fde5a58ae5f2be73a27d4e1ecbff0a9e5d06b7 Mon Sep 17 00:00:00 2001
From: Lubos Slovak <lubos.slovak@nic.cz>
Date: Mon, 26 May 2014 16:50:00 +0200
Subject: [PATCH] libknot/rdata/ --> libknot/rrtype/
---
Knot.files | 26 ++++++++++----------
src/Makefile.am | 28 +++++++++++-----------
src/knot/conf/cf-parse.y | 2 +-
src/knot/conf/conf.h | 2 +-
src/knot/ctl/remote.c | 4 ++--
src/knot/dnssec/nsec3-chain.c | 2 +-
src/knot/dnssec/zone-keys.c | 2 +-
src/knot/dnssec/zone-nsec.c | 4 ++--
src/knot/dnssec/zone-sign.c | 6 ++---
src/knot/nameserver/internet.c | 6 ++---
src/knot/nameserver/ixfr.c | 2 +-
src/knot/nameserver/notify.c | 2 +-
src/knot/nameserver/tsig_ctx.c | 2 +-
src/knot/nameserver/tsig_ctx.h | 2 +-
src/knot/server/journal.c | 2 +-
src/knot/server/zone-load.c | 2 +-
src/knot/updates/acl.c | 2 +-
src/knot/updates/acl.h | 2 +-
src/knot/updates/apply.c | 2 +-
src/knot/updates/changesets.c | 2 +-
src/knot/updates/ddns.c | 2 +-
src/knot/zone/contents.c | 8 +++----
src/knot/zone/contents.h | 2 +-
src/knot/zone/events.c | 2 +-
src/knot/zone/node.c | 2 +-
src/knot/zone/semantic-check.c | 8 +++----
src/knot/zone/zone-diff.c | 2 +-
src/knot/zone/zone.c | 2 +-
src/knot/zone/zonedb-load.c | 2 +-
src/libknot/dnssec/key.c | 2 +-
src/libknot/dnssec/key.h | 2 +-
src/libknot/dnssec/rrset-sign.c | 2 +-
src/libknot/libknot.h | 18 +++++++-------
src/libknot/packet/pkt.c | 2 +-
src/libknot/packet/pkt.h | 2 +-
src/libknot/processing/process.h | 2 +-
src/libknot/{rdata => rrtype}/dnskey.h | 0
src/libknot/{rdata => rrtype}/nsec.h | 0
src/libknot/{rdata => rrtype}/nsec3.c | 2 +-
src/libknot/{rdata => rrtype}/nsec3.h | 2 +-
src/libknot/{rdata => rrtype}/nsec3param.c | 2 +-
src/libknot/{rdata => rrtype}/nsec3param.h | 0
src/libknot/{rdata => rrtype}/opt.c | 2 +-
src/libknot/{rdata => rrtype}/opt.h | 0
src/libknot/{rdata => rrtype}/rdname.h | 0
src/libknot/{rdata => rrtype}/rrsig.h | 0
src/libknot/{rdata => rrtype}/soa.h | 0
src/libknot/{rdata => rrtype}/tsig.c | 2 +-
src/libknot/{rdata => rrtype}/tsig.h | 0
src/libknot/tsig-op.c | 2 +-
src/libknot/tsig-op.h | 2 +-
tests/dnssec_nsec3.c | 2 +-
tests/edns.c | 2 +-
tests/pkt.c | 2 +-
54 files changed, 91 insertions(+), 91 deletions(-)
rename src/libknot/{rdata => rrtype}/dnskey.h (100%)
rename src/libknot/{rdata => rrtype}/nsec.h (100%)
rename src/libknot/{rdata => rrtype}/nsec3.c (98%)
rename src/libknot/{rdata => rrtype}/nsec3.h (99%)
rename src/libknot/{rdata => rrtype}/nsec3param.c (97%)
rename src/libknot/{rdata => rrtype}/nsec3param.h (100%)
rename src/libknot/{rdata => rrtype}/opt.c (99%)
rename src/libknot/{rdata => rrtype}/opt.h (100%)
rename src/libknot/{rdata => rrtype}/rdname.h (100%)
rename src/libknot/{rdata => rrtype}/rrsig.h (100%)
rename src/libknot/{rdata => rrtype}/soa.h (100%)
rename src/libknot/{rdata => rrtype}/tsig.c (99%)
rename src/libknot/{rdata => rrtype}/tsig.h (100%)
diff --git a/Knot.files b/Knot.files
index 4652f4fec1..746a4e8540 100644
--- a/Knot.files
+++ b/Knot.files
@@ -233,19 +233,19 @@ src/libknot/processing/process.c
src/libknot/processing/process.h
src/libknot/rdata.c
src/libknot/rdata.h
-src/libknot/rdata/dnskey.h
-src/libknot/rdata/nsec.h
-src/libknot/rdata/nsec3.c
-src/libknot/rdata/nsec3.h
-src/libknot/rdata/nsec3param.c
-src/libknot/rdata/nsec3param.h
-src/libknot/rdata/rdname.h
-src/libknot/rdata/rrsig.h
-src/libknot/rdata/soa.h
-src/libknot/rdata/tsig.c
-src/libknot/rdata/tsig.h
-src/libknot/rdata/opt.c
-src/libknot/rdata/opt.h
+src/libknot/rrtype/dnskey.h
+src/libknot/rrtype/nsec.h
+src/libknot/rrtype/nsec3.c
+src/libknot/rrtype/nsec3.h
+src/libknot/rrtype/nsec3param.c
+src/libknot/rrtype/nsec3param.h
+src/libknot/rrtype/rdname.h
+src/libknot/rrtype/rrsig.h
+src/libknot/rrtype/soa.h
+src/libknot/rrtype/tsig.c
+src/libknot/rrtype/tsig.h
+src/libknot/rrtype/opt.c
+src/libknot/rrtype/opt.h
src/libknot/rdataset.c
src/libknot/rdataset.h
src/libknot/rrset-dump.c
diff --git a/src/Makefile.am b/src/Makefile.am
index d75e37120d..ad277aefe0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -157,8 +157,8 @@ libknot_la_SOURCES = \
libknot/dnssec/sig0.h \
libknot/dnssec/sign.c \
libknot/dnssec/sign.h \
- libknot/rdata/opt.c \
- libknot/rdata/opt.h \
+ libknot/rrtype/opt.c \
+ libknot/rrtype/opt.h \
libknot/libknot.h \
libknot/packet/compr.c \
libknot/packet/compr.h \
@@ -167,18 +167,18 @@ libknot_la_SOURCES = \
libknot/packet/wire.h \
libknot/processing/process.c \
libknot/processing/process.h \
- libknot/rdata/rdname.h \
- libknot/rdata/dnskey.h \
- libknot/rdata/nsec.h \
- libknot/rdata/nsec3.c \
- libknot/rdata/nsec3.h \
- libknot/rdata/nsec3param.h \
- libknot/rdata/nsec3param.c \
- libknot/rdata/nsec.h \
- libknot/rdata/rrsig.h \
- libknot/rdata/soa.h \
- libknot/rdata/tsig.c \
- libknot/rdata/tsig.h \
+ libknot/rrtype/rdname.h \
+ libknot/rrtype/dnskey.h \
+ libknot/rrtype/nsec.h \
+ libknot/rrtype/nsec3.c \
+ libknot/rrtype/nsec3.h \
+ libknot/rrtype/nsec3param.h \
+ libknot/rrtype/nsec3param.c \
+ libknot/rrtype/nsec.h \
+ libknot/rrtype/rrsig.h \
+ libknot/rrtype/soa.h \
+ libknot/rrtype/tsig.c \
+ libknot/rrtype/tsig.h \
libknot/rrset-dump.c \
libknot/rrset-dump.h \
libknot/rdata.c \
diff --git a/src/knot/conf/cf-parse.y b/src/knot/conf/cf-parse.y
index f07ca8ded6..f595cb0021 100644
--- a/src/knot/conf/cf-parse.y
+++ b/src/knot/conf/cf-parse.y
@@ -33,7 +33,7 @@
#include "common/sockaddr.h"
#include "libknot/dname.h"
#include "libknot/binary.h"
-#include "libknot/rdata/opt.h"
+#include "libknot/rrtype/opt.h"
#include "knot/server/rrl.h"
#include "knot/nameserver/query_module.h"
#include "knot/conf/conf.h"
diff --git a/src/knot/conf/conf.h b/src/knot/conf/conf.h
index afff285c0f..5059966b32 100644
--- a/src/knot/conf/conf.h
+++ b/src/knot/conf/conf.h
@@ -35,7 +35,7 @@
#include <urcu.h>
#include "libknot/dname.h"
-#include "libknot/rdata/tsig.h"
+#include "libknot/rrtype/tsig.h"
#include "libknot/dnssec/key.h"
#include "libknot/dnssec/policy.h"
#include "common/lists.h"
diff --git a/src/knot/ctl/remote.c b/src/knot/ctl/remote.c
index 37675bd3bd..637c6b7d09 100644
--- a/src/knot/ctl/remote.c
+++ b/src/knot/ctl/remote.c
@@ -25,8 +25,8 @@
#include "libknot/packet/wire.h"
#include "common/descriptor.h"
#include "libknot/tsig-op.h"
-#include "libknot/rdata/rdname.h"
-#include "libknot/rdata/soa.h"
+#include "libknot/rrtype/rdname.h"
+#include "libknot/rrtype/soa.h"
#include "libknot/dnssec/random.h"
#include "knot/dnssec/zone-sign.h"
#include "knot/dnssec/zone-nsec.h"
diff --git a/src/knot/dnssec/nsec3-chain.c b/src/knot/dnssec/nsec3-chain.c
index a64726385e..f36c4793b0 100644
--- a/src/knot/dnssec/nsec3-chain.c
+++ b/src/knot/dnssec/nsec3-chain.c
@@ -26,7 +26,7 @@
#include "knot/dnssec/zone-sign.h"
#include "knot/dnssec/zone-nsec.h"
#include "libknot/dnssec/bitmap.h"
-#include "libknot/rdata/nsec3.h"
+#include "libknot/rrtype/nsec3.h"
/* - Forward declarations --------------------------------------------------- */
diff --git a/src/knot/dnssec/zone-keys.c b/src/knot/dnssec/zone-keys.c
index 5946e18bae..0e0fb1afed 100644
--- a/src/knot/dnssec/zone-keys.c
+++ b/src/knot/dnssec/zone-keys.c
@@ -25,7 +25,7 @@
#include "libknot/common.h"
#include "libknot/dname.h"
#include "libknot/consts.h"
-#include "libknot/rdata/dnskey.h"
+#include "libknot/rrtype/dnskey.h"
#include "libknot/dnssec/sign.h"
#include "knot/dnssec/zone-keys.h"
diff --git a/src/knot/dnssec/zone-nsec.c b/src/knot/dnssec/zone-nsec.c
index 6f9fa2a9d3..c77bc1d4c3 100644
--- a/src/knot/dnssec/zone-nsec.c
+++ b/src/knot/dnssec/zone-nsec.c
@@ -27,8 +27,8 @@
#include "libknot/dnssec/bitmap.h"
#include "libknot/util/utils.h"
#include "libknot/packet/wire.h"
-#include "libknot/rdata/soa.h"
-#include "libknot/rdata/nsec3.h"
+#include "libknot/rrtype/soa.h"
+#include "libknot/rrtype/nsec3.h"
#include "knot/dnssec/nsec-chain.h"
#include "knot/dnssec/nsec3-chain.h"
#include "knot/dnssec/zone-nsec.h"
diff --git a/src/knot/dnssec/zone-sign.c b/src/knot/dnssec/zone-sign.c
index 72963ccc30..9f5ebd5bd8 100644
--- a/src/knot/dnssec/zone-sign.c
+++ b/src/knot/dnssec/zone-sign.c
@@ -31,9 +31,9 @@
#include "libknot/dnssec/policy.h"
#include "libknot/dnssec/rrset-sign.h"
#include "libknot/dnssec/sign.h"
-#include "libknot/rdata/rdname.h"
-#include "libknot/rdata/rrsig.h"
-#include "libknot/rdata/soa.h"
+#include "libknot/rrtype/rdname.h"
+#include "libknot/rrtype/rrsig.h"
+#include "libknot/rrtype/soa.h"
#include "knot/dnssec/zone-keys.h"
#include "knot/dnssec/zone-sign.h"
#include "knot/updates/changesets.h"
diff --git a/src/knot/nameserver/internet.c b/src/knot/nameserver/internet.c
index 849e6365fe..bb6c99caa4 100644
--- a/src/knot/nameserver/internet.c
+++ b/src/knot/nameserver/internet.c
@@ -17,9 +17,9 @@
#include "common/debug.h"
#include "common/descriptor.h"
#include "libknot/common.h"
-#include "libknot/rdata/rdname.h"
-#include "libknot/rdata/soa.h"
-#include "libknot/rdata/opt.h"
+#include "libknot/rrtype/rdname.h"
+#include "libknot/rrtype/soa.h"
+#include "libknot/rrtype/opt.h"
#include "libknot/dnssec/rrset-sign.h"
#include "knot/nameserver/internet.h"
#include "knot/nameserver/nsec_proofs.h"
diff --git a/src/knot/nameserver/ixfr.c b/src/knot/nameserver/ixfr.c
index 738da1f87e..08c344ea65 100644
--- a/src/knot/nameserver/ixfr.c
+++ b/src/knot/nameserver/ixfr.c
@@ -7,7 +7,7 @@
#include "common/debug.h"
#include "common/descriptor.h"
#include "libknot/util/utils.h"
-#include "libknot/rdata/soa.h"
+#include "libknot/rrtype/soa.h"
/* ------------------------ IXFR-out processing ----------------------------- */
diff --git a/src/knot/nameserver/notify.c b/src/knot/nameserver/notify.c
index acddf4f7cf..970bb8e88d 100644
--- a/src/knot/nameserver/notify.c
+++ b/src/knot/nameserver/notify.c
@@ -36,7 +36,7 @@
#include "knot/nameserver/tsig_ctx.h"
#include "knot/nameserver/process_answer.h"
#include "libknot/dnssec/random.h"
-#include "libknot/rdata/soa.h"
+#include "libknot/rrtype/soa.h"
/*----------------------------------------------------------------------------*/
/* API functions */
diff --git a/src/knot/nameserver/tsig_ctx.c b/src/knot/nameserver/tsig_ctx.c
index 35db6d6609..e2c08d6e85 100644
--- a/src/knot/nameserver/tsig_ctx.c
+++ b/src/knot/nameserver/tsig_ctx.c
@@ -19,7 +19,7 @@
#include <stdlib.h>
#include "common/errcode.h"
-#include "libknot/rdata/tsig.h"
+#include "libknot/rrtype/tsig.h"
#include "libknot/tsig-op.h"
#include "knot/nameserver/tsig_ctx.h"
diff --git a/src/knot/nameserver/tsig_ctx.h b/src/knot/nameserver/tsig_ctx.h
index b02b86a35b..e7ea2ac4a8 100644
--- a/src/knot/nameserver/tsig_ctx.h
+++ b/src/knot/nameserver/tsig_ctx.h
@@ -20,7 +20,7 @@
#include <stdlib.h>
#include "libknot/packet/pkt.h"
-#include "libknot/rdata/tsig.h"
+#include "libknot/rrtype/tsig.h"
#include "libknot/tsig-op.h"
#define TSIG_MAX_DIGEST_SIZE 64
diff --git a/src/knot/server/journal.c b/src/knot/server/journal.c
index 567acb2fcd..da68e54c96 100644
--- a/src/knot/server/journal.c
+++ b/src/knot/server/journal.c
@@ -29,7 +29,7 @@
#include "knot/other/debug.h"
#include "knot/server/journal.h"
#include "knot/server/serialization.h"
-#include "libknot/rdata/soa.h"
+#include "libknot/rrtype/soa.h"
/*! \brief Infinite file size limit. */
#define FSLIMIT_INF (~((size_t)0))
diff --git a/src/knot/server/zone-load.c b/src/knot/server/zone-load.c
index ffc71ca327..ed00a7d26a 100644
--- a/src/knot/server/zone-load.c
+++ b/src/knot/server/zone-load.c
@@ -25,7 +25,7 @@
#include "libknot/dname.h"
#include "libknot/dnssec/crypto.h"
#include "libknot/dnssec/random.h"
-#include "libknot/rdata/soa.h"
+#include "libknot/rrtype/soa.h"
#include "knot/zone/zone.h"
#include "knot/zone/zone.h"
#include "knot/zone/zonedb.h"
diff --git a/src/knot/updates/acl.c b/src/knot/updates/acl.c
index 3be5a74e0d..f077848865 100644
--- a/src/knot/updates/acl.c
+++ b/src/knot/updates/acl.c
@@ -25,7 +25,7 @@
#include "common/errcode.h"
#include "knot/updates/acl.h"
#include "libknot/util/endian.h"
-#include "libknot/rdata/tsig.h"
+#include "libknot/rrtype/tsig.h"
static inline uint32_t ipv4_chunk(const struct sockaddr_in *ipv4)
{
diff --git a/src/knot/updates/acl.h b/src/knot/updates/acl.h
index 21219030cb..e73a01f72a 100644
--- a/src/knot/updates/acl.h
+++ b/src/knot/updates/acl.h
@@ -33,7 +33,7 @@
#include "common/lists.h"
#include "common/sockaddr.h"
#include "common/mempattern.h"
-#include "libknot/rdata/tsig.h"
+#include "libknot/rrtype/tsig.h"
struct knot_tsig_key;
diff --git a/src/knot/updates/apply.c b/src/knot/updates/apply.c
index 510d7e664c..739432074e 100644
--- a/src/knot/updates/apply.c
+++ b/src/knot/updates/apply.c
@@ -29,7 +29,7 @@
#include "common/lists.h"
#include "common/descriptor.h"
#include "libknot/util/utils.h"
-#include "libknot/rdata/soa.h"
+#include "libknot/rrtype/soa.h"
/* --------------------------- Update cleanup ------------------------------- */
diff --git a/src/knot/updates/changesets.c b/src/knot/updates/changesets.c
index 6fee48a562..bc9250690a 100644
--- a/src/knot/updates/changesets.c
+++ b/src/knot/updates/changesets.c
@@ -24,7 +24,7 @@
#include "common/mempattern.h"
#include "common/mempool.h"
#include "libknot/rrset.h"
-#include "libknot/rdata/soa.h"
+#include "libknot/rrtype/soa.h"
#include "common/debug.h"
static int knot_changesets_init(changesets_t *changesets)
diff --git a/src/knot/updates/ddns.c b/src/knot/updates/ddns.c
index a94b2b08b5..ed019c46cc 100644
--- a/src/knot/updates/ddns.c
+++ b/src/knot/updates/ddns.c
@@ -26,7 +26,7 @@
#include "libknot/packet/pkt.h"
#include "libknot/common.h"
#include "libknot/consts.h"
-#include "libknot/rdata/soa.h"
+#include "libknot/rrtype/soa.h"
#include "common/mempattern.h"
#include "common/descriptor.h"
#include "common/lists.h"
diff --git a/src/knot/zone/contents.c b/src/knot/zone/contents.c
index 7399e8e691..62bed42c18 100644
--- a/src/knot/zone/contents.c
+++ b/src/knot/zone/contents.c
@@ -27,10 +27,10 @@
#include "knot/zone/zone-tree.h"
#include "libknot/packet/wire.h"
#include "libknot/consts.h"
-#include "libknot/rdata/rrsig.h"
-#include "libknot/rdata/nsec3.h"
-#include "libknot/rdata/soa.h"
-#include "libknot/rdata/rdname.h"
+#include "libknot/rrtype/rrsig.h"
+#include "libknot/rrtype/nsec3.h"
+#include "libknot/rrtype/soa.h"
+#include "libknot/rrtype/rdname.h"
/*----------------------------------------------------------------------------*/
/* Non-API functions */
diff --git a/src/knot/zone/contents.h b/src/knot/zone/contents.h
index a521c9f65c..d2f55a4cb6 100644
--- a/src/knot/zone/contents.h
+++ b/src/knot/zone/contents.h
@@ -27,7 +27,7 @@
#pragma once
#include "common/lists.h"
-#include "libknot/rdata/nsec3param.h"
+#include "libknot/rrtype/nsec3param.h"
#include "knot/zone/node.h"
#include "knot/zone/zone-tree.h"
diff --git a/src/knot/zone/events.c b/src/knot/zone/events.c
index e3a7fdaa80..7cce0ebb1c 100644
--- a/src/knot/zone/events.c
+++ b/src/knot/zone/events.c
@@ -30,7 +30,7 @@
#include "knot/zone/zone.h"
#include "knot/zone/zone-load.h"
#include "knot/zone/zonefile.h"
-#include "libknot/rdata/soa.h"
+#include "libknot/rrtype/soa.h"
#include "libknot/dnssec/random.h"
#include "knot/nameserver/internet.h"
#include "knot/nameserver/update.h"
diff --git a/src/knot/zone/node.c b/src/knot/zone/node.c
index 1860b4f64c..b198f36778 100644
--- a/src/knot/zone/node.c
+++ b/src/knot/zone/node.c
@@ -21,7 +21,7 @@
#include "knot/zone/node.h"
#include "libknot/rrset.h"
#include "libknot/rdataset.h"
-#include "libknot/rdata/rrsig.h"
+#include "libknot/rrtype/rrsig.h"
#include "common/descriptor.h"
#include "common/mempattern.h"
diff --git a/src/knot/zone/semantic-check.c b/src/knot/zone/semantic-check.c
index 489ad931d0..62546b92d1 100644
--- a/src/knot/zone/semantic-check.c
+++ b/src/knot/zone/semantic-check.c
@@ -26,10 +26,10 @@
#include "libknot/libknot.h"
#include "libknot/dnssec/key.h"
#include "libknot/dnssec/rrset-sign.h"
-#include "libknot/rdata/rrsig.h"
-#include "libknot/rdata/soa.h"
-#include "libknot/rdata/nsec.h"
-#include "libknot/rdata/nsec3.h"
+#include "libknot/rrtype/rrsig.h"
+#include "libknot/rrtype/soa.h"
+#include "libknot/rrtype/nsec.h"
+#include "libknot/rrtype/nsec3.h"
#include "common/base32hex.h"
#include "common/crc.h"
#include "common/descriptor.h"
diff --git a/src/knot/zone/zone-diff.c b/src/knot/zone/zone-diff.c
index 266c559b1d..523b6711db 100644
--- a/src/knot/zone/zone-diff.c
+++ b/src/knot/zone/zone-diff.c
@@ -23,7 +23,7 @@
#include "knot/zone/zone-diff.h"
#include "common/descriptor.h"
#include "libknot/util/utils.h"
-#include "libknot/rdata/soa.h"
+#include "libknot/rrtype/soa.h"
struct zone_diff_param {
knot_zone_tree_t *nodes;
diff --git a/src/knot/zone/zone.c b/src/knot/zone/zone.c
index 11485b1951..f538a71a1a 100644
--- a/src/knot/zone/zone.c
+++ b/src/knot/zone/zone.c
@@ -32,7 +32,7 @@
#include "libknot/dname.h"
#include "libknot/dnssec/random.h"
#include "libknot/util/utils.h"
-#include "libknot/rdata/soa.h"
+#include "libknot/rrtype/soa.h"
/*!
* \brief Set ACL list from configuration.
diff --git a/src/knot/zone/zonedb-load.c b/src/knot/zone/zonedb-load.c
index 31d3ea03e2..b89b92149e 100644
--- a/src/knot/zone/zonedb-load.c
+++ b/src/knot/zone/zonedb-load.c
@@ -20,7 +20,7 @@
#include "knot/zone/zonedb-load.h"
#include "knot/zone/zone-load.h"
#include "knot/conf/conf.h"
-#include "libknot/rdata/soa.h"
+#include "libknot/rrtype/soa.h"
#include "knot/zone/zone.h"
#include "knot/zone/zonefile.h"
#include "knot/zone/zonedb.h"
diff --git a/src/libknot/dnssec/key.c b/src/libknot/dnssec/key.c
index 548e32a52e..0c8f6e3a17 100644
--- a/src/libknot/dnssec/key.c
+++ b/src/libknot/dnssec/key.c
@@ -32,7 +32,7 @@
#include "libknot/dname.h"
#include "libknot/dnssec/key.h"
#include "libknot/dnssec/sig0.h"
-#include "libknot/rdata/tsig.h"
+#include "libknot/rrtype/tsig.h"
#include "zscanner/zscanner.h"
/*!
diff --git a/src/libknot/dnssec/key.h b/src/libknot/dnssec/key.h
index 6294b6a343..5e22a4d974 100644
--- a/src/libknot/dnssec/key.h
+++ b/src/libknot/dnssec/key.h
@@ -31,7 +31,7 @@
#include <time.h>
#include "libknot/dname.h"
#include "libknot/binary.h"
-#include "libknot/rdata/tsig.h"
+#include "libknot/rrtype/tsig.h"
/*----------------------------------------------------------------------------*/
diff --git a/src/libknot/dnssec/rrset-sign.c b/src/libknot/dnssec/rrset-sign.c
index e15acada9a..ec0f2dacb4 100644
--- a/src/libknot/dnssec/rrset-sign.c
+++ b/src/libknot/dnssec/rrset-sign.c
@@ -25,7 +25,7 @@
#include "libknot/dnssec/rrset-sign.h"
#include "libknot/dnssec/sign.h"
#include "libknot/rrset.h"
-#include "libknot/rdata/rrsig.h"
+#include "libknot/rrtype/rrsig.h"
#define MAX_RR_WIREFORMAT_SIZE (64 * 1024)
#define RRSIG_RDATA_SIGNER_OFFSET 18
diff --git a/src/libknot/libknot.h b/src/libknot/libknot.h
index 9e973e6832..c825c91e35 100644
--- a/src/libknot/libknot.h
+++ b/src/libknot/libknot.h
@@ -29,21 +29,21 @@
#include "libknot/consts.h"
#include "libknot/dname.h"
-#include "libknot/rdata/opt.h"
+#include "libknot/rrtype/opt.h"
#include "libknot/packet/wire.h"
#include "libknot/packet/compr.h"
#include "libknot/packet/pkt.h"
#include "libknot/rdataset.h"
#include "libknot/rrset.h"
#include "libknot/rrset-dump.h"
-#include "libknot/rdata/rdname.h"
-#include "libknot/rdata/dnskey.h"
-#include "libknot/rdata/nsec3.h"
-#include "libknot/rdata/nsec3param.h"
-#include "libknot/rdata/nsec.h"
-#include "libknot/rdata/rrsig.h"
-#include "libknot/rdata/soa.h"
-#include "libknot/rdata/tsig.h"
+#include "libknot/rrtype/rdname.h"
+#include "libknot/rrtype/dnskey.h"
+#include "libknot/rrtype/nsec3.h"
+#include "libknot/rrtype/nsec3param.h"
+#include "libknot/rrtype/nsec.h"
+#include "libknot/rrtype/rrsig.h"
+#include "libknot/rrtype/soa.h"
+#include "libknot/rrtype/tsig.h"
#include "libknot/tsig-op.h"
#include "libknot/util/tolower.h"
#include "libknot/util/utils.h"
diff --git a/src/libknot/packet/pkt.c b/src/libknot/packet/pkt.c
index 48ffbcc0fe..81f3eacc2b 100644
--- a/src/libknot/packet/pkt.c
+++ b/src/libknot/packet/pkt.c
@@ -23,7 +23,7 @@
#include "libknot/common.h"
#include "common/descriptor.h"
#include "libknot/packet/wire.h"
-#include "libknot/rdata/tsig.h"
+#include "libknot/rrtype/tsig.h"
#include "libknot/tsig-op.h"
/*! \brief Scan packet for RRSet existence. */
diff --git a/src/libknot/packet/pkt.h b/src/libknot/packet/pkt.h
index 4cc16e977e..f825b03341 100644
--- a/src/libknot/packet/pkt.h
+++ b/src/libknot/packet/pkt.h
@@ -32,7 +32,7 @@
#include "libknot/dname.h"
#include "libknot/rrset.h"
-#include "libknot/rdata/opt.h"
+#include "libknot/rrtype/opt.h"
#include "libknot/packet/wire.h"
#include "libknot/packet/compr.h"
#include "common/mempattern.h"
diff --git a/src/libknot/processing/process.h b/src/libknot/processing/process.h
index 5977cd556e..d748e55512 100644
--- a/src/libknot/processing/process.h
+++ b/src/libknot/processing/process.h
@@ -29,7 +29,7 @@
#include "common/mempattern.h"
#include "libknot/consts.h"
-#include "libknot/rdata/tsig.h"
+#include "libknot/rrtype/tsig.h"
#include "libknot/packet/pkt.h"
/*! \brief Main packet processing states.
diff --git a/src/libknot/rdata/dnskey.h b/src/libknot/rrtype/dnskey.h
similarity index 100%
rename from src/libknot/rdata/dnskey.h
rename to src/libknot/rrtype/dnskey.h
diff --git a/src/libknot/rdata/nsec.h b/src/libknot/rrtype/nsec.h
similarity index 100%
rename from src/libknot/rdata/nsec.h
rename to src/libknot/rrtype/nsec.h
diff --git a/src/libknot/rdata/nsec3.c b/src/libknot/rrtype/nsec3.c
similarity index 98%
rename from src/libknot/rdata/nsec3.c
rename to src/libknot/rrtype/nsec3.c
index f8e2691825..aeccf3a090 100644
--- a/src/libknot/rdata/nsec3.c
+++ b/src/libknot/rrtype/nsec3.c
@@ -18,7 +18,7 @@
#include <openssl/evp.h>
#include <openssl/sha.h>
-#include "libknot/rdata/nsec3.h"
+#include "libknot/rrtype/nsec3.h"
#include "libknot/util/tolower.h"
#include "common/errcode.h"
diff --git a/src/libknot/rdata/nsec3.h b/src/libknot/rrtype/nsec3.h
similarity index 99%
rename from src/libknot/rdata/nsec3.h
rename to src/libknot/rrtype/nsec3.h
index f0e01313cd..a1c2fa2689 100644
--- a/src/libknot/rdata/nsec3.h
+++ b/src/libknot/rrtype/nsec3.h
@@ -33,7 +33,7 @@
#include "libknot/consts.h"
#include "libknot/rdataset.h"
-#include "libknot/rdata/nsec3param.h"
+#include "libknot/rrtype/nsec3param.h"
static inline
uint8_t knot_nsec3_algorithm(const knot_rdataset_t *rrs, size_t pos)
diff --git a/src/libknot/rdata/nsec3param.c b/src/libknot/rrtype/nsec3param.c
similarity index 97%
rename from src/libknot/rdata/nsec3param.c
rename to src/libknot/rrtype/nsec3param.c
index 212d894b74..e9c779f125 100644
--- a/src/libknot/rdata/nsec3param.c
+++ b/src/libknot/rrtype/nsec3param.c
@@ -16,7 +16,7 @@
#include "common/memdup.h"
#include "common/errcode.h"
-#include "libknot/rdata/nsec3param.h"
+#include "libknot/rrtype/nsec3param.h"
/*!
* \brief Initialize the structure with NSEC3 params from NSEC3PARAM RR set.
diff --git a/src/libknot/rdata/nsec3param.h b/src/libknot/rrtype/nsec3param.h
similarity index 100%
rename from src/libknot/rdata/nsec3param.h
rename to src/libknot/rrtype/nsec3param.h
diff --git a/src/libknot/rdata/opt.c b/src/libknot/rrtype/opt.c
similarity index 99%
rename from src/libknot/rdata/opt.c
rename to src/libknot/rrtype/opt.c
index a905751e13..9f029b5fdf 100644
--- a/src/libknot/rdata/opt.c
+++ b/src/libknot/rrtype/opt.c
@@ -19,7 +19,7 @@
#include <assert.h>
#include <string.h>
-#include "libknot/rdata/opt.h"
+#include "libknot/rrtype/opt.h"
#include "libknot/common.h"
#include "common/descriptor.h"
#include "common/debug.h"
diff --git a/src/libknot/rdata/opt.h b/src/libknot/rrtype/opt.h
similarity index 100%
rename from src/libknot/rdata/opt.h
rename to src/libknot/rrtype/opt.h
diff --git a/src/libknot/rdata/rdname.h b/src/libknot/rrtype/rdname.h
similarity index 100%
rename from src/libknot/rdata/rdname.h
rename to src/libknot/rrtype/rdname.h
diff --git a/src/libknot/rdata/rrsig.h b/src/libknot/rrtype/rrsig.h
similarity index 100%
rename from src/libknot/rdata/rrsig.h
rename to src/libknot/rrtype/rrsig.h
diff --git a/src/libknot/rdata/soa.h b/src/libknot/rrtype/soa.h
similarity index 100%
rename from src/libknot/rdata/soa.h
rename to src/libknot/rrtype/soa.h
diff --git a/src/libknot/rdata/tsig.c b/src/libknot/rrtype/tsig.c
similarity index 99%
rename from src/libknot/rdata/tsig.c
rename to src/libknot/rrtype/tsig.c
index 66229c82e1..ce23c55141 100644
--- a/src/libknot/rdata/tsig.c
+++ b/src/libknot/rrtype/tsig.c
@@ -21,7 +21,7 @@
#include <assert.h>
#include <time.h>
-#include "libknot/rdata/tsig.h"
+#include "libknot/rrtype/tsig.h"
#include "common/debug.h"
#include "libknot/common.h"
#include "libknot/util/utils.h"
diff --git a/src/libknot/rdata/tsig.h b/src/libknot/rrtype/tsig.h
similarity index 100%
rename from src/libknot/rdata/tsig.h
rename to src/libknot/rrtype/tsig.h
diff --git a/src/libknot/tsig-op.c b/src/libknot/tsig-op.c
index 6980b94659..eecb7fc9bb 100644
--- a/src/libknot/tsig-op.c
+++ b/src/libknot/tsig-op.c
@@ -23,7 +23,7 @@
#include "libknot/common.h"
#include "common/descriptor.h"
-#include "libknot/rdata/tsig.h"
+#include "libknot/rrtype/tsig.h"
#include "libknot/tsig-op.h"
#include "libknot/packet/wire.h"
#include "common/debug.h"
diff --git a/src/libknot/tsig-op.h b/src/libknot/tsig-op.h
index 535d4e325d..3d866e6a45 100644
--- a/src/libknot/tsig-op.h
+++ b/src/libknot/tsig-op.h
@@ -29,7 +29,7 @@
#include <stdint.h>
-#include "libknot/rdata/tsig.h"
+#include "libknot/rrtype/tsig.h"
#include "libknot/rrset.h"
#include "libknot/dnssec/key.h"
diff --git a/tests/dnssec_nsec3.c b/tests/dnssec_nsec3.c
index 37e75dda57..44f90cfce4 100644
--- a/tests/dnssec_nsec3.c
+++ b/tests/dnssec_nsec3.c
@@ -24,7 +24,7 @@
#include "libknot/dname.h"
#include "libknot/consts.h"
#include "libknot/rrset.h"
-#include "libknot/rdata/nsec3.h"
+#include "libknot/rrtype/nsec3.h"
int main(int argc, char *argv[])
{
diff --git a/tests/edns.c b/tests/edns.c
index 63ecc7db5d..476950557e 100644
--- a/tests/edns.c
+++ b/tests/edns.c
@@ -19,7 +19,7 @@
#include <assert.h>
#include "common/errcode.h"
-#include "libknot/rdata/opt.h"
+#include "libknot/rrtype/opt.h"
#include "common/descriptor.h"
static const uint16_t E_MAX_PLD = 10000;
diff --git a/tests/pkt.c b/tests/pkt.c
index 5e48094e49..418253bc1c 100644
--- a/tests/pkt.c
+++ b/tests/pkt.c
@@ -21,7 +21,7 @@
#include "common/mempool.h"
#include "common/descriptor.h"
#include "libknot/packet/pkt.h"
-#include "libknot/rdata/tsig.h"
+#include "libknot/rrtype/tsig.h"
#define TTL 7200
#define NAMECOUNT 3
--
GitLab