From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Fri, 6 Sep 2019 12:33:02 +0000 (+0200)
Subject: libknot compatibility: knot_edns_get_option()
X-Git-Tag: v4.2.1~5^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=630289cd9a2ef2756b43fe7bd660392cc38d157b;p=thirdparty%2Fknot-resolver.git

libknot compatibility: knot_edns_get_option()
---

diff --git a/modules/edns_keepalive/edns_keepalive.c b/modules/edns_keepalive/edns_keepalive.c
index 12370b824..75767ca7e 100644
--- a/modules/edns_keepalive/edns_keepalive.c
+++ b/modules/edns_keepalive/edns_keepalive.c
@@ -36,7 +36,11 @@ static int edns_keepalive_finalize(kr_layer_t *ctx)
 	const bool ka_want =
 		req->qsource.flags.tcp &&
 		src_opt != NULL &&
-		knot_edns_get_option(src_opt, KNOT_EDNS_OPTION_TCP_KEEPALIVE) &&
+		knot_edns_get_option(src_opt, KNOT_EDNS_OPTION_TCP_KEEPALIVE
+					#if KNOT_VERSION_MINOR >= 9
+						, NULL
+					#endif
+				) &&
 		answ_opt != NULL;
 	if (!ka_want) {
 		return ctx->state;
diff --git a/modules/nsid/nsid.c b/modules/nsid/nsid.c
index f5c8e6273..fee2da1e1 100644
--- a/modules/nsid/nsid.c
+++ b/modules/nsid/nsid.c
@@ -30,7 +30,11 @@ static int nsid_finalize(kr_layer_t *ctx) {
 	if (src_opt == NULL)
 		return ctx->state;
 
-	const uint8_t *req_nsid = knot_edns_get_option(src_opt, KNOT_EDNS_OPTION_NSID);
+	const uint8_t *req_nsid = knot_edns_get_option(src_opt, KNOT_EDNS_OPTION_NSID
+							#if KNOT_VERSION_MINOR >= 9
+								, NULL
+							#endif
+							);
 	/* NSID option must be explicitly requested */
 	if (req_nsid == NULL)
 		return ctx->state;