diff --git a/src/libknot/rrset.c b/src/libknot/rrset.c
index c123d0923e3ffd2db15936028f980e7744e42ee3..61f6ac597a6f79050718735ccbf522cbbd48ea3d 100644
--- a/src/libknot/rrset.c
+++ b/src/libknot/rrset.c
@@ -34,15 +34,6 @@
#include "libknot/dname.h"
#include "libknot/rdata.h"
-uint16_t knot_rrset_rr_count(const knot_rrset_t *rrset)
-{
- if (rrset == NULL) {
- return 0;
- }
-
- return rrset->rrs.rr_count;
-}
-
static uint16_t rrset_rdata_naptr_bin_chunk_size(const knot_rrset_t *rrset,
size_t pos)
{
@@ -350,6 +341,20 @@ static int binary_store(uint8_t *rdata, size_t *offset, size_t packet_offset,
return KNOT_EOK;
}
+knot_rrset_t *knot_rrset_new(knot_dname_t *owner, uint16_t type,
+ uint16_t rclass, mm_ctx_t *mm)
+{
+ knot_rrset_t *ret = mm_alloc(mm, sizeof(knot_rrset_t));
+ if (ret == NULL) {
+ ERR_ALLOC_FAILED;
+ return NULL;
+ }
+
+ knot_rrset_init(ret, owner, type, rclass);
+
+ return ret;
+}
+
void knot_rrset_init(knot_rrset_t *rrset, knot_dname_t *owner, uint16_t type,
uint16_t rclass)
{
@@ -360,41 +365,66 @@ void knot_rrset_init(knot_rrset_t *rrset, knot_dname_t *owner, uint16_t type,
rrset->additional = NULL;
}
-knot_rrset_t *knot_rrset_new(knot_dname_t *owner, uint16_t type,
- uint16_t rclass, mm_ctx_t *mm)
+void knot_rrset_init_empty(knot_rrset_t *rrset)
{
- knot_rrset_t *ret = mm_alloc(mm, sizeof(knot_rrset_t));
- if (ret == NULL) {
- ERR_ALLOC_FAILED;
+ knot_rrset_init(rrset, NULL, 0, KNOT_CLASS_IN);
+}
+
+knot_rrset_t *knot_rrset_copy(const knot_rrset_t *src, mm_ctx_t *mm)
+{
+ if (src == NULL) {
return NULL;
}
- ret->owner = owner;
- ret->type = type;
- ret->rclass = rclass;
+ knot_dname_t *owner_cpy = knot_dname_copy(src->owner, mm);
+ if (owner_cpy == NULL) {
+ return NULL;
+ }
- knot_rrs_init(&ret->rrs);
+ knot_rrset_t *rrset = knot_rrset_new(owner_cpy, src->type, src->rclass, mm);
+ if (rrset == NULL) {
+ knot_dname_free(&owner_cpy, NULL);
+ return NULL;
+ }
- ret->additional = NULL;
+ int ret = knot_rrs_copy(&rrset->rrs, &src->rrs, mm);
+ if (ret != KNOT_EOK) {
+ knot_rrset_free(&rrset, mm);
+ return NULL;
+ }
- return ret;
+ rrset->additional = NULL;
+ return rrset;
}
-int knot_rrset_add_rr(knot_rrset_t *rrset,
- const uint8_t *rdata, const uint16_t size,
- const uint32_t ttl, mm_ctx_t *mm)
+void knot_rrset_free(knot_rrset_t **rrset, mm_ctx_t *mm)
{
- if (rrset == NULL || rdata == NULL) {
- return KNOT_EINVAL;
+ if (rrset == NULL || *rrset == NULL) {
+ return;
}
- // Create knot_rr_t from given data
- knot_rr_t rr[knot_rr_array_size(size)];
- knot_rr_set_size(rr, size);
- knot_rr_set_ttl(rr, ttl);
- memcpy(knot_rr_rdata(rr), rdata, size);
+ knot_rrset_clear(*rrset, mm);
- return knot_rrs_add_rr(&rrset->rrs, rr, mm);
+ mm_free(mm, *rrset);
+ *rrset = NULL;
+}
+
+void knot_rrset_clear(knot_rrset_t *rrset, mm_ctx_t *mm)
+{
+ if (rrset) {
+ knot_rrs_clear(&rrset->rrs, mm);
+ knot_dname_free(&rrset->owner, mm);
+ }
+}
+
+uint8_t *knot_rrset_rr_rdata(const knot_rrset_t *rrset, size_t pos)
+{
+ knot_rr_t *rr = knot_rrs_rr(&rrset->rrs, pos);
+ if (rr) {
+ return knot_rr_rdata(rr);
+ } else {
+ return NULL;
+ }
}
uint16_t knot_rrset_rr_size(const knot_rrset_t *rrset, size_t pos)
@@ -425,14 +455,13 @@ void knot_rrset_rr_set_ttl(const knot_rrset_t *rrset, size_t pos, uint32_t ttl)
}
}
-uint8_t *knot_rrset_rr_rdata(const knot_rrset_t *rrset, size_t pos)
+uint16_t knot_rrset_rr_count(const knot_rrset_t *rrset)
{
- knot_rr_t *rr = knot_rrs_rr(&rrset->rrs, pos);
- if (rr) {
- return knot_rr_rdata(rr);
- } else {
- return NULL;
+ if (rrset == NULL) {
+ return 0;
}
+
+ return rrset->rrs.rr_count;
}
int knot_rrset_to_wire(const knot_rrset_t *rrset, uint8_t *wire, size_t *size,
@@ -563,6 +592,23 @@ int knot_rrset_rdata_from_wire_one(knot_rrset_t *rrset,
return knot_rrset_add_rr(rrset, rdata_buffer, offset, ttl, mm);
}
+int knot_rrset_add_rr(knot_rrset_t *rrset,
+ const uint8_t *rdata, const uint16_t size,
+ const uint32_t ttl, mm_ctx_t *mm)
+{
+ if (rrset == NULL || rdata == NULL) {
+ return KNOT_EINVAL;
+ }
+
+ // Create knot_rr_t from given data
+ knot_rr_t rr[knot_rr_array_size(size)];
+ knot_rr_set_size(rr, size);
+ knot_rr_set_ttl(rr, ttl);
+ memcpy(knot_rr_rdata(rr), rdata, size);
+
+ return knot_rrs_add_rr(&rrset->rrs, rr, mm);
+}
+
bool knot_rrset_equal(const knot_rrset_t *r1,
const knot_rrset_t *r2,
knot_rrset_compare_type_t cmp)
@@ -586,65 +632,9 @@ bool knot_rrset_equal(const knot_rrset_t *r1,
return true;
}
-void knot_rrset_free(knot_rrset_t **rrset, mm_ctx_t *mm)
-{
- if (rrset == NULL || *rrset == NULL) {
- return;
- }
-
- knot_rrset_clear(*rrset, mm);
-
- mm_free(mm, *rrset);
- *rrset = NULL;
-}
-
-void knot_rrset_clear(knot_rrset_t *rrset, mm_ctx_t *mm)
-{
- if (rrset) {
- knot_rrs_clear(&rrset->rrs, mm);
- knot_dname_free(&rrset->owner, mm);
- }
-}
-
bool knot_rrset_empty(const knot_rrset_t *rrset)
{
uint16_t rr_count = knot_rrset_rr_count(rrset);
return rr_count == 0;
}
-knot_rrset_t *knot_rrset_copy(const knot_rrset_t *src, mm_ctx_t *mm)
-{
- if (src == NULL) {
- return NULL;
- }
-
- knot_dname_t *owner_cpy = knot_dname_copy(src->owner, mm);
- if (owner_cpy == NULL) {
- return NULL;
- }
-
- knot_rrset_t *rrset = knot_rrset_new(owner_cpy, src->type, src->rclass, mm);
- if (rrset == NULL) {
- knot_dname_free(&owner_cpy, NULL);
- return NULL;
- }
-
- int ret = knot_rrs_copy(&rrset->rrs, &src->rrs, mm);
- if (ret != KNOT_EOK) {
- knot_rrset_free(&rrset, mm);
- return NULL;
- }
-
- rrset->additional = NULL;
- return rrset;
-}
-
-void knot_rrset_init_empty(knot_rrset_t *rrset)
-{
- rrset->owner = NULL;
- rrset->type = 0;
- rrset->rclass = KNOT_CLASS_IN;
- knot_rrs_init(&rrset->rrs);
- rrset->additional = NULL;
-}
-
diff --git a/src/libknot/rrset.h b/src/libknot/rrset.h
index 6088b942a0ce2e6ac34c27560114d5d36a0a2a40..151995703ca12a6ec8aefa20292cb30863c2a98c 100644
--- a/src/libknot/rrset.h
+++ b/src/libknot/rrset.h
@@ -38,11 +38,10 @@
struct knot_compr;
struct knot_node;
-/*----------------------------------------------------------------------------*/
/*!
- * \brief Structure for representing an RRSet.
+ * \brief Structure for representing RRSet.
*
- * For definition of a RRSet see RFC2181, Section 5.
+ * For RRSet definition see RFC2181, Section 5.
*/
struct knot_rrset {
knot_dname_t *owner; /*!< Domain name being the owner of the RRSet. */
@@ -55,15 +54,13 @@ struct knot_rrset {
typedef struct knot_rrset knot_rrset_t;
-/*----------------------------------------------------------------------------*/
-
typedef enum {
KNOT_RRSET_COMPARE_PTR,
KNOT_RRSET_COMPARE_HEADER,
KNOT_RRSET_COMPARE_WHOLE
} knot_rrset_compare_type_t;
-/*----------------------------------------------------------------------------*/
+/* -------------------- Creation / initialization --------------------------- */
/*!
* \brief Creates a new RRSet with the given properties.
@@ -92,19 +89,44 @@ void knot_rrset_init(knot_rrset_t *rrset, knot_dname_t *owner, uint16_t type,
uint16_t rclass);
/*!
- * \brief Adds the given RDATA to the RRSet.
+ * \brief Initializes given RRSet structure.
*
- * \param rrset RRSet to add the RDATA to.
- * \param rdata RDATA to add to the RRSet.
- * \param size Size of RDATA.
- * \param size TTL for RR.
+ * \param rrset RRSet to init.
+ */
+void knot_rrset_init_empty(knot_rrset_t *rrset);
+
+/*!
+ * \brief Creates new RRSet from \a src RRSet.
+ *
+ * \param src Source RRSet.
+ * \param mm Memory context.
+ *
+ * \retval Pointer to new RRSet if all went OK.
+ * \retval NULL on error.
+ */
+knot_rrset_t *knot_rrset_copy(const knot_rrset_t *src, mm_ctx_t *mm);
+
+/* ---------------------------- Cleanup ------------------------------------- */
+
+/*!
+ * \brief Destroys the RRSet structure and all its substructures.
+ )
+ * Also sets the given pointer to NULL.
+ *
+ * \param rrset RRset to be destroyed.
* \param mm Memory context.
+ */
+void knot_rrset_free(knot_rrset_t **rrset, mm_ctx_t *mm);
+
+/*!
+ * \brief Frees structures inside RRSet, but not the RRSet itself.
*
- * \return KNOT_E*
+ * \param rrset RRSet to be cleared.
+ * \param mm Memory context used for allocations.
*/
-int knot_rrset_add_rr(knot_rrset_t *rrset, const uint8_t *rdata,
- const uint16_t size, const uint32_t ttl,
- mm_ctx_t *mm);
+void knot_rrset_clear(knot_rrset_t *rrset, mm_ctx_t *mm);
+
+/* ----------- Getters / Setters (legacy, functionality in rr_t) ------------ */
/*!
* \brief Returns RDATA of RR on given position.
@@ -155,37 +177,7 @@ void knot_rrset_rr_set_ttl(const knot_rrset_t *rrset, size_t pos, uint32_t ttl);
*/
uint16_t knot_rrset_rr_count(const knot_rrset_t *rrset);
-/*!
- * \brief Compares two RRSets for equality.
- *
- * \param r1 First RRSet.
- * \param r2 Second RRSet.
- * \param cmp Type of comparison to perform.
- *
- * \retval True if RRSets are equal.
- * \retval False if RRSets are not equal.
- */
-bool knot_rrset_equal(const knot_rrset_t *r1,
- const knot_rrset_t *r2,
- knot_rrset_compare_type_t cmp);
-
-/*!
- * \brief Destroys the RRSet structure and all its substructures.
- )
- * Also sets the given pointer to NULL.
- *
- * \param rrset RRset to be destroyed.
- * \param mm Memory context.
- */
-void knot_rrset_free(knot_rrset_t **rrset, mm_ctx_t *mm);
-
-/*!
- * \brief Frees structures inside RRSet, but not the RRSet itself.
- *
- * \param rrset RRSet to be cleared.
- * \param mm Memory context used for allocations.
- */
-void knot_rrset_clear(knot_rrset_t *rrset, mm_ctx_t *mm);
+/* ---------- Wire conversions (legacy, to be done in knot_pkt_t) ----------- */
/*!
* \brief Converts RRSet structure to wireformat, compression included.
@@ -220,32 +212,46 @@ int knot_rrset_rdata_from_wire_one(knot_rrset_t *rrset,
size_t total_size, uint32_t ttl, size_t rdlength,
mm_ctx_t *mm);
+/* ---------- RR addition. (legacy, functionality in knot_rrs_t) ------------ */
+
/*!
- * \brief Checks whether RRSet is empty.
+ * \brief Adds the given RDATA to the RRSet.
*
- * \param rrset RRSet to check.
+ * \param rrset RRSet to add the RDATA to.
+ * \param rdata RDATA to add to the RRSet.
+ * \param size Size of RDATA.
+ * \param ttl TTL for RR.
+ * \param mm Memory context.
*
- * \retval True if RRSet is empty.
- * \retval False if RRSet is not empty.
+ * \return KNOT_E*
*/
-bool knot_rrset_empty(const knot_rrset_t *rrset);
+int knot_rrset_add_rr(knot_rrset_t *rrset, const uint8_t *rdata,
+ const uint16_t size, const uint32_t ttl,
+ mm_ctx_t *mm);
+
+/* ------------------ Equality / emptines bool checks ----------------------- */
/*!
- * \brief Creates new RRSet from \a src RRSet.
+ * \brief Compares two RRSets for equality.
*
- * \param src Source RRSet.
- * \param mm Memory context.
+ * \param r1 First RRSet.
+ * \param r2 Second RRSet.
+ * \param cmp Type of comparison to perform.
*
- * \retval Pointer to new RRSet if all went OK.
- * \retval NULL on error.
+ * \retval True if RRSets are equal.
+ * \retval False if RRSets are not equal.
*/
-knot_rrset_t *knot_rrset_copy(const knot_rrset_t *src, mm_ctx_t *mm);
+bool knot_rrset_equal(const knot_rrset_t *r1, const knot_rrset_t *r2,
+ knot_rrset_compare_type_t cmp);
/*!
- * \brief Initializes given RRSet structure.
+ * \brief Checks whether RRSet is empty.
*
- * \param rrset RRSet to init.
+ * \param rrset RRSet to check.
+ *
+ * \retval True if RRSet is empty.
+ * \retval False if RRSet is not empty.
*/
-void knot_rrset_init_empty(knot_rrset_t *rrset);
+bool knot_rrset_empty(const knot_rrset_t *rrset);
/*! @} */