Skip to content

Commit

Permalink
dns.cc: use pdns::views::UnsignedCharView
Browse files Browse the repository at this point in the history
Includes minor cleanup and additions to make UnsignedCharView usable for this use case.
Supersedes PowerDNS#14356
Fixes
/usr/include/c++/v1/__fwd/string_view.h:22:41: warning: 'char_traits<unsigned char>' is deprecated: char_traits<T> 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]
  • Loading branch information
omoerbeek authored and rgacogne committed Jul 12, 2024
1 parent de84985 commit fc0021a
Show file tree
Hide file tree
Showing 4 changed files with 84 additions and 7 deletions.
15 changes: 8 additions & 7 deletions pdns/dns.cc
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#endif
#include "dns.hh"
#include "misc.hh"
#include "views.hh"
#include <stdexcept>
#include <iostream>
#include <boost/algorithm/string.hpp>
Expand Down Expand Up @@ -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<uint8_t> name(packet + sizeof(dnsheader), packet_len - sizeof(dnsheader));
std::basic_string_view<uint8_t>::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;
}

2 changes: 2 additions & 0 deletions pdns/dnsdistdist/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -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 = \
Expand Down Expand Up @@ -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 = \
Expand Down
1 change: 1 addition & 0 deletions pdns/dnsdistdist/views.hh
73 changes: 73 additions & 0 deletions pdns/views.hh
Original file line number Diff line number Diff line change
@@ -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 <string_view>

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<const char*>(data_), size_)
{
}
using size_type = std::string_view::size_type;

[[nodiscard]] const unsigned char& at(size_type pos) const
{
return reinterpret_cast<const unsigned char&>(view.at(pos));
}

[[nodiscard]] const unsigned char& operator[](size_type pos) const
{
return reinterpret_cast<const unsigned char&>(view[pos]);
}

[[nodiscard]] const unsigned char* data() const
{
return reinterpret_cast<const unsigned char*>(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;
};

}

0 comments on commit fc0021a

Please sign in to comment.