cookies: make it work also with libknot-2.4

diff --git a/modules/cookies/cookiemonster.c b/modules/cookies/cookiemonster.c
index 37449535ad545ce47cc607eb95345c10ad1a70e4..fcc0489f2a07c195f640080bfd85c5ee9f4a44b0 100644 (file)
--- a/modules/cookies/cookiemonster.c
+++ b/modules/cookies/cookiemonster.c
@@ -259,7 +259,7 @@ int check_response(kr_layer_t *ctx, knot_pkt_t *pkt)
                return KR_STATE_FAIL;
        }
 
-       uint16_t rcode = knot_pkt_get_ext_rcode(pkt);
+       uint16_t rcode = knot_pkt_ext_rcode(pkt);
        if (rcode == KNOT_RCODE_BADCOOKIE) {
                struct kr_query *next = NULL;
                if (!(qry->flags & QUERY_BADCOOKIE_AGAIN)) {

diff --git a/modules/cookies/cookies.mk b/modules/cookies/cookies.mk
index 37c1df2b6173eea3e21a28d013ae9183a574a897..59496bcb69a674c7bc21804876c9c5714b2662c5 100644 (file)
--- a/modules/cookies/cookies.mk
+++ b/modules/cookies/cookies.mk
@@ -1,4 +1,8 @@
 cookies_CFLAGS := -fvisibility=hidden -fPIC
+# Compat with libknot < 2.4; the identifier got renamed since 2.4.0.
+cookies_CFLAGS += $(shell pkg-config --atleast-version=2.4.0 libknot \
+                                   || echo -Dknot_pkt_ext_rcode=knot_pkt_get_ext_rcode)
+
 cookies_SOURCES := \
        modules/cookies/cookiectl.c \
        modules/cookies/cookiemonster.c \