knot_dname_is_sub(): remove

Two of the call points might be slightly more readable with _is_sub(),
but I'm not convinced that justifies keeping the function.

diff --git a/distro/deb/libknot7.symbols b/distro/deb/libknot7.symbols
index 6bf0e12ad266c3913c3c976ab290d834ba288e2c..502fe02db03bf742fd344f822dc7b3913c072d01 100644 (file)
--- a/distro/deb/libknot7.symbols
+++ b/distro/deb/libknot7.symbols
@@ -43,7 +43,6 @@ libknot.so.7 libknot7 #MINVER#
  knot_dname_from_str@Base 2.3.0
  knot_dname_in@Base 2.3.0
  knot_dname_is_equal@Base 2.3.0
- knot_dname_is_sub@Base 2.3.0
  knot_dname_is_wildcard@Base 2.3.0
  knot_dname_label_is_equal@Base 2.6.0
  knot_dname_labels@Base 2.3.0

diff --git a/src/knot/updates/ddns.c b/src/knot/updates/ddns.c
index 52f3b8dea4e9ebee7e0f87391d76719c2c179693..973319d83394fb9effc6dc39fed81eebb353cf90 100644 (file)
--- a/src/knot/updates/ddns.c
+++ b/src/knot/updates/ddns.c
@@ -628,12 +628,12 @@ static int check_update(const knot_rrset_t *rrset, const knot_pkt_t *query,
        /* Accept both subdomain and dname match. */
        const knot_dname_t *owner = rrset->owner;
        const knot_dname_t *qname = knot_pkt_qname(query);
-       const bool is_sub = knot_dname_is_sub(owner, qname);
-       const bool is_apex = knot_dname_is_equal(owner, qname);
-       if (!is_sub && !is_apex) {
+       const int in_bailiwick = knot_dname_in_bailiwick(owner, qname);
+       if (in_bailiwick < 0) {
                *rcode = KNOT_RCODE_NOTZONE;
                return KNOT_EOUTOFZONE;
        }
+       const bool is_apex = in_bailiwick == 0;
 
        if (is_dnssec_protected(rrset->type, is_apex)) {
                *rcode = KNOT_RCODE_REFUSED;

diff --git a/src/knot/zone/contents.c b/src/knot/zone/contents.c
index 3d4e99efff7bb4a5b966ded3b3995da897b4d387..54fdca7c1b90ee853052610a491337feebb43ac8 100644 (file)
--- a/src/knot/zone/contents.c
+++ b/src/knot/zone/contents.c
@@ -65,7 +65,7 @@ static int check_node(const zone_contents_t *contents, const zone_node_t *node)
        assert(contents->apex != NULL);
        assert(node);
 
-       if (!knot_dname_is_sub(node->owner, contents->apex->owner)) {
+       if (knot_dname_in_bailiwick(node->owner, contents->apex->owner) <= 0) {
                return KNOT_EOUTOFZONE;
        }
 
@@ -590,8 +590,7 @@ static int insert_rr(zone_contents_t *z, const knot_rrset_t *rr,
        }
 
        // check if the RRSet belongs to the zone
-       if (!knot_dname_is_sub(rr->owner, z->apex->owner) &&
-           !knot_dname_is_equal(rr->owner, z->apex->owner)) {
+       if (knot_dname_in_bailiwick(rr->owner, z->apex->owner) < 0) {
                return KNOT_EOUTOFZONE;
        }
 
@@ -622,8 +621,7 @@ static int remove_rr(zone_contents_t *z, const knot_rrset_t *rr,
        }
 
        // check if the RRSet belongs to the zone
-       if (!knot_dname_is_sub(rr->owner, z->apex->owner) &&
-           !knot_dname_is_equal(rr->owner, z->apex->owner)) {
+       if (knot_dname_in_bailiwick(rr->owner, z->apex->owner) < 0) {
                return KNOT_EOUTOFZONE;
        }
 

diff --git a/src/knot/zone/semantic-check.c b/src/knot/zone/semantic-check.c
index 253afea5a8ba0d1c1ef990d6b5e9ddc417ed99e1..e7e9129b8bd7ac2ca5caee08200a2af45fcc73c1 100644 (file)
--- a/src/knot/zone/semantic-check.c
+++ b/src/knot/zone/semantic-check.c
@@ -472,7 +472,7 @@ static int check_delegation(const zone_node_t *node, semchecks_data_t *data)
        for (int i = 0; i < ns_rrs->count; ++i) {
                knot_rdata_t *ns_rr = knot_rdataset_at(ns_rrs, i);
                const knot_dname_t *ns_dname = knot_ns_name(ns_rr);
-               if (!knot_dname_is_sub(ns_dname, node->owner)) {
+               if (knot_dname_in_bailiwick(ns_dname, node->owner) <= 0) {
                        continue;
                }
 

diff --git a/src/libknot/dname.h b/src/libknot/dname.h
index e6e11afe490189aae4d35b1c083141a339c668c5..44d49a68037b04a88df31a13d04e047fc2e6fd75 100644 (file)
--- a/src/libknot/dname.h
+++ b/src/libknot/dname.h
@@ -325,21 +325,6 @@ uint8_t *knot_dname_lf(const knot_dname_t *src, knot_dname_storage_t storage);
  */
 int knot_dname_in_bailiwick(const knot_dname_t *name, const knot_dname_t *bailiwick);
 
-/*!
- * \brief Checks if one domain name is a (strict) subdomain of other.
- *
- * \param sub     Domain name to be the possible subdomain.
- * \param domain  Domain name to be the possible parent domain.
- *
- * \retval true \a sub is a (strict) subdomain of \a domain.
- * \retval false otherwise.
- */
-static inline
-bool knot_dname_is_sub(const knot_dname_t *sub, const knot_dname_t *domain)
-{
-       return knot_dname_in_bailiwick(sub, domain) > 0;
-}
-
 /*!
  * \brief Check if the domain name is a subdomain of or equal to other.
  *