From fc0021a0eaa2741c72b9d7fc11f52376f91487b9 Mon Sep 17 00:00:00 2001 From: Otto Moerbeek Date: Wed, 19 Jun 2024 13:10:15 +0200 Subject: [PATCH] dns.cc: use pdns::views::UnsignedCharView Includes minor cleanup and additions to make UnsignedCharView usable for this use case. Supersedes #14356 Fixes /usr/include/c++/v1/__fwd/string_view.h:22:41: warning: 'char_traits' is deprecated: char_traits for T not equal to char, wchar_t, char8_t, char16_t or char32_t is non-standard and is provided for a temporary period. It will be removed in LLVM 19, so please migrate off of it. [-Wdeprecated-declarations] --- pdns/dns.cc | 15 ++++---- pdns/dnsdistdist/Makefile.am | 2 + pdns/dnsdistdist/views.hh | 1 + pdns/views.hh | 73 ++++++++++++++++++++++++++++++++++++ 4 files changed, 84 insertions(+), 7 deletions(-) create mode 120000 pdns/dnsdistdist/views.hh create mode 100644 pdns/views.hh diff --git a/pdns/dns.cc b/pdns/dns.cc index d9fb5096f88c..7824f40300a1 100644 --- a/pdns/dns.cc +++ b/pdns/dns.cc @@ -24,6 +24,7 @@ #endif #include "dns.hh" #include "misc.hh" +#include "views.hh" #include #include #include @@ -100,27 +101,27 @@ std::string Opcode::to_s(uint8_t opcode) { } // goal is to hash based purely on the question name, and turn error into 'default' -uint32_t hashQuestion(const uint8_t* packet, uint16_t packet_len, uint32_t init, bool& ok) +uint32_t hashQuestion(const uint8_t* packet, uint16_t packet_len, uint32_t init, bool& wasOK) { if (packet_len < sizeof(dnsheader)) { - ok = false; + wasOK = false; return init; } - // C++ 17 does not have std::u8string_view - std::basic_string_view name(packet + sizeof(dnsheader), packet_len - sizeof(dnsheader)); - std::basic_string_view::size_type len = 0; + // NOLINTNEXTLINE(cppcoreguidelines-pro-bounds-pointer-arithmetic) + pdns::views::UnsignedCharView name(packet + sizeof(dnsheader), packet_len - sizeof(dnsheader)); + pdns::views::UnsignedCharView::size_type len = 0; while (len < name.length()) { uint8_t labellen = name[len++]; if (labellen == 0) { - ok = true; + wasOK = true; // len is name.length() at max as it was < before the increment return burtleCI(name.data(), len, init); } len += labellen; } // We've encountered a label that is too long - ok = false; + wasOK = false; return init; } diff --git a/pdns/dnsdistdist/Makefile.am b/pdns/dnsdistdist/Makefile.am index f81f8bfb469f..19e682ce0439 100644 --- a/pdns/dnsdistdist/Makefile.am +++ b/pdns/dnsdistdist/Makefile.am @@ -238,6 +238,7 @@ dnsdist_SOURCES = \ tcpiohandler.cc tcpiohandler.hh \ threadname.hh threadname.cc \ uuid-utils.hh uuid-utils.cc \ + views.hh \ xpf.cc xpf.hh testrunner_SOURCES = \ @@ -337,6 +338,7 @@ testrunner_SOURCES = \ testrunner.cc \ threadname.hh threadname.cc \ uuid-utils.hh uuid-utils.cc \ + views.hh \ xpf.cc xpf.hh dnsdist_LDFLAGS = \ diff --git a/pdns/dnsdistdist/views.hh b/pdns/dnsdistdist/views.hh new file mode 120000 index 000000000000..2213b7d90032 --- /dev/null +++ b/pdns/dnsdistdist/views.hh @@ -0,0 +1 @@ +../views.hh \ No newline at end of file diff --git a/pdns/views.hh b/pdns/views.hh new file mode 100644 index 000000000000..b6be93019c1c --- /dev/null +++ b/pdns/views.hh @@ -0,0 +1,73 @@ +/* + * This file is part of PowerDNS or dnsdist. + * Copyright -- PowerDNS.COM B.V. and its contributors + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. + * + * In addition, for the avoidance of any doubt, permission is granted to + * link this program with OpenSSL and to (re)distribute the binaries + * produced as the result of such linking. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + */ +#pragma once + +#include + +namespace pdns::views +{ + +class UnsignedCharView +{ +public: + UnsignedCharView(const char* data_, size_t size_) : + view(data_, size_) + { + } + // NOLINTBEGIN(cppcoreguidelines-pro-type-reinterpret-cast): No unsigned char view in C++17 + UnsignedCharView(const unsigned char* data_, size_t size_) : + view(reinterpret_cast(data_), size_) + { + } + using size_type = std::string_view::size_type; + + [[nodiscard]] const unsigned char& at(size_type pos) const + { + return reinterpret_cast(view.at(pos)); + } + + [[nodiscard]] const unsigned char& operator[](size_type pos) const + { + return reinterpret_cast(view[pos]); + } + + [[nodiscard]] const unsigned char* data() const + { + return reinterpret_cast(view.data()); + } + // NOLINTEND(cppcoreguidelines-pro-type-reinterpret-cast): No unsigned char view in C++17 + + [[nodiscard]] size_t size() const + { + return view.size(); + } + + [[nodiscard]] size_t length() const + { + return view.length(); + } + +private: + std::string_view view; +}; + +}