From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Mon, 9 Jul 2018 11:37:50 +0000 (+0200)
Subject: knot_edns_* -> knot_pkt_
X-Git-Tag: v3.0.0~6^2~23
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=07d183cba7e73da72f269818fde9d5873d8d337e;p=thirdparty%2Fknot-resolver.git

knot_edns_* -> knot_pkt_
---

diff --git a/lib/resolve.c b/lib/resolve.c
index 39d7a9e34..58e51fb7f 100644
--- a/lib/resolve.c
+++ b/lib/resolve.c
@@ -538,7 +538,7 @@ static int answer_padding(struct kr_request *request)
 	int32_t pad_bytes = -1;
 
 	if (padding == -1) { /* use the default padding policy from libknot */
-		pad_bytes =  knot_edns_default_padding_size(answer, opt_rr);
+		pad_bytes =  knot_pkt_default_padding_size(answer, opt_rr);
 	}
 	if (padding >= 2) {
 		int32_t max_pad_bytes = knot_edns_get_payload(opt_rr) - (answer->size + knot_rrset_size(opt_rr));
@@ -751,7 +751,7 @@ static int resolve_query(struct kr_request *request, const knot_pkt_t *packet)
 	} else if (cookie_ctx && cookie_ctx->srvr.enabled &&
 		   knot_wire_get_qdcount(packet->wire) == 0 &&
 		   knot_pkt_has_edns(packet) &&
-		   knot_edns_has_option(packet->opt_rr, KNOT_EDNS_OPTION_COOKIE)) {
+		   knot_pkt_edns_option(packet, KNOT_EDNS_OPTION_COOKIE)) {
 		/* Plan empty query only for cookies. */
 		qry = kr_rplan_push_empty(rplan, NULL);
 	}