From 09b1bc805f4058cf8fc557e61129640178c6803f Mon Sep 17 00:00:00 2001 From: Fred Morcos Date: Wed, 3 Jul 2024 12:17:32 +0200 Subject: [PATCH] DNSdist: Adapt to QType class changes --- pdns/dnsdistdist/dnsdist-lua-rules.cc | 2 +- pdns/dnsdistdist/dnsdist-rings.cc | 2 +- pdns/dnsdistdist/dnsdist-web.cc | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pdns/dnsdistdist/dnsdist-lua-rules.cc b/pdns/dnsdistdist/dnsdist-lua-rules.cc index a4d7adbcfdd3..9e2a364e44b0 100644 --- a/pdns/dnsdistdist/dnsdist-lua-rules.cc +++ b/pdns/dnsdistdist/dnsdist-lua-rules.cc @@ -544,7 +544,7 @@ void setupLuaRules(LuaContext& luaCtx) } else { string val = boost::get(str); - qtype = QType::chartocode(val.c_str()); + qtype = QType::fromString(val); if (qtype == 0) { throw std::runtime_error("Unable to convert '" + val + "' to a DNS type"); } diff --git a/pdns/dnsdistdist/dnsdist-rings.cc b/pdns/dnsdistdist/dnsdist-rings.cc index ba55561fede9..33730d40bafd 100644 --- a/pdns/dnsdistdist/dnsdist-rings.cc +++ b/pdns/dnsdistdist/dnsdist-rings.cc @@ -202,7 +202,7 @@ size_t Rings::loadFromFile(const std::string& filepath, const struct timespec& n /* skip ID */ idx++; DNSName qname(parts.at(idx++)); - QType qtype(QType::chartocode(parts.at(idx++).c_str())); + QType qtype(QType::fromString(parts.at(idx++))); if (isResponse) { insertResponse(when, from, qname, qtype.getCode(), 0, 0, dnsHeader, dest, protocol); diff --git a/pdns/dnsdistdist/dnsdist-web.cc b/pdns/dnsdistdist/dnsdist-web.cc index 368ee9e75a63..04e8033489e6 100644 --- a/pdns/dnsdistdist/dnsdist-web.cc +++ b/pdns/dnsdistdist/dnsdist-web.cc @@ -1583,7 +1583,7 @@ static void handleCacheManagement(const YaHTTP::Request& req, YaHTTP::Response& return; } if (expungeType != req.getvars.end()) { - type = QType::chartocode(expungeType->second.c_str()); + type = QType::fromString(expungeType->second); } std::shared_ptr pool;