mirror of
https://github.com/oxen-io/lokinet
synced 2023-12-14 06:53:00 +01:00
b81f7025c9
Replaces custom logging system with spdlog-based oxen logging. This
commit mainly replaces the backend logging with the spdlog-based system,
but doesn't (yet) convert all the existing LogWarn, etc. to use the new
format-based logging.
New logging statements will look like:
llarp::log::warning(cat, "blah: {}", val);
where `cat` should be set up in each .cpp or cluster of .cpp files, as
described in the oxen-logging README.
As part of spdlog we get fmt, which gives us nice format strings, where
are applied generously in this commit.
Making types printable now requires two steps:
- add a ToString() method
- add this specialization:
template <>
constexpr inline bool llarp::IsToStringFormattable<llarp::Whatever> = true;
This will then allow the type to be printed as a "{}" value in a
fmt::format string. This is applied to all our printable types here,
and all of the `operator<<` are removed.
This commit also:
- replaces various uses of `operator<<` to ToString()
- replaces various uses of std::stringstream with either fmt::format or
plain std::string
- Rename some to_string and toString() methods to ToString() for
consistency (and to work with fmt)
- Replace `stringify(...)` and `make_exception` usage with fmt::format
(and remove stringify/make_exception from util/str.hpp).
140 lines
3.2 KiB
C++
140 lines
3.2 KiB
C++
#include "question.hpp"
|
|
|
|
#include <llarp/util/logging.hpp>
|
|
#include <llarp/util/printer.hpp>
|
|
#include <llarp/util/str.hpp>
|
|
#include "dns.hpp"
|
|
|
|
namespace llarp
|
|
{
|
|
namespace dns
|
|
{
|
|
Question::Question(Question&& other)
|
|
: qname(std::move(other.qname))
|
|
, qtype(std::move(other.qtype))
|
|
, qclass(std::move(other.qclass))
|
|
{}
|
|
Question::Question(const Question& other)
|
|
: qname(other.qname), qtype(other.qtype), qclass(other.qclass)
|
|
{}
|
|
|
|
Question::Question(std::string name, QType_t type)
|
|
: qname{std::move(name)}, qtype{type}, qclass{qClassIN}
|
|
{
|
|
if (qname.empty())
|
|
throw std::invalid_argument{"qname cannot be empty"};
|
|
}
|
|
|
|
bool
|
|
Question::Encode(llarp_buffer_t* buf) const
|
|
{
|
|
if (!EncodeName(buf, qname))
|
|
return false;
|
|
if (!buf->put_uint16(qtype))
|
|
return false;
|
|
return buf->put_uint16(qclass);
|
|
}
|
|
|
|
bool
|
|
Question::Decode(llarp_buffer_t* buf)
|
|
{
|
|
if (!DecodeName(buf, qname))
|
|
{
|
|
llarp::LogError("failed to decode name");
|
|
return false;
|
|
}
|
|
if (!buf->read_uint16(qtype))
|
|
{
|
|
llarp::LogError("failed to decode type");
|
|
return false;
|
|
}
|
|
if (!buf->read_uint16(qclass))
|
|
{
|
|
llarp::LogError("failed to decode class");
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
util::StatusObject
|
|
Question::ToJSON() const
|
|
{
|
|
return util::StatusObject{{"qname", qname}, {"qtype", qtype}, {"qclass", qclass}};
|
|
}
|
|
|
|
bool
|
|
Question::IsName(const std::string& other) const
|
|
{
|
|
// does other have a . at the end?
|
|
if (other.find_last_of('.') == (other.size() - 1))
|
|
return other == qname;
|
|
// no, add it and retry
|
|
return IsName(other + ".");
|
|
}
|
|
|
|
bool
|
|
Question::IsLocalhost() const
|
|
{
|
|
return (qname == "localhost.loki." or llarp::ends_with(qname, ".localhost.loki."));
|
|
}
|
|
|
|
bool
|
|
Question::HasSubdomains() const
|
|
{
|
|
const auto parts = split(qname, ".", true);
|
|
return parts.size() >= 3;
|
|
}
|
|
|
|
std::string
|
|
Question::Subdomains() const
|
|
{
|
|
if (qname.size() < 2)
|
|
return "";
|
|
|
|
size_t pos;
|
|
|
|
pos = qname.rfind('.', qname.size() - 2);
|
|
if (pos == std::string::npos or pos == 0)
|
|
return "";
|
|
|
|
pos = qname.rfind('.', pos - 1);
|
|
if (pos == std::string::npos or pos == 0)
|
|
return "";
|
|
|
|
return qname.substr(0, pos);
|
|
}
|
|
|
|
std::string
|
|
Question::Name() const
|
|
{
|
|
return qname.substr(0, qname.find_last_of('.'));
|
|
}
|
|
|
|
bool
|
|
Question::HasTLD(const std::string& tld) const
|
|
{
|
|
return qname.find(tld) != std::string::npos
|
|
&& qname.rfind(tld) == (qname.size() - tld.size()) - 1;
|
|
}
|
|
|
|
std::string
|
|
Question::ToString() const
|
|
{
|
|
std::ostringstream o;
|
|
print(o, -1, -1);
|
|
return o.str();
|
|
}
|
|
std::ostream&
|
|
Question::print(std::ostream& stream, int level, int spaces) const
|
|
{
|
|
std::ostringstream o;
|
|
Printer printer(o, level, spaces);
|
|
printer.printAttribute("qname", qname);
|
|
printer.printAttributeAsHex("qtype", qtype);
|
|
printer.printAttributeAsHex("qclass", qclass);
|
|
|
|
return stream;
|
|
}
|
|
} // namespace dns
|
|
} // namespace llarp
|