diff --git a/pdns/dns.cc b/pdns/dns.cc index 99bbd72aa65e..5e7e45e1f604 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 @@ -102,27 +103,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/views.hh b/pdns/views.hh index c3c8c898b3fe..b6be93019c1c 100644 --- a/pdns/views.hh +++ b/pdns/views.hh @@ -33,21 +33,39 @@ public: view(data_, size_) { } - // NOLINTNEXTLINE(cppcoreguidelines-pro-type-reinterpret-cast): No unsigned char view in C++17 + // 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_) { } - const unsigned char& at(std::string_view::size_type pos) const + using size_type = std::string_view::size_type; + + [[nodiscard]] const unsigned char& at(size_type pos) const { return reinterpret_cast(view.at(pos)); } - size_t size() const + [[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; };