mirror of
https://github.com/oxen-io/lokinet.git
synced 2024-11-07 15:20:31 +00: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).
135 lines
3.2 KiB
C++
135 lines
3.2 KiB
C++
#include "rr.hpp"
|
|
#include "dns.hpp"
|
|
#include <llarp/util/mem.hpp>
|
|
#include <llarp/util/logging.hpp>
|
|
#include <llarp/util/printer.hpp>
|
|
|
|
namespace llarp
|
|
{
|
|
namespace dns
|
|
{
|
|
ResourceRecord::ResourceRecord(const ResourceRecord& other)
|
|
: rr_name(other.rr_name)
|
|
, rr_type(other.rr_type)
|
|
, rr_class(other.rr_class)
|
|
, ttl(other.ttl)
|
|
, rData(other.rData)
|
|
{}
|
|
|
|
ResourceRecord::ResourceRecord(ResourceRecord&& other)
|
|
: rr_name(std::move(other.rr_name))
|
|
, rr_type(std::move(other.rr_type))
|
|
, rr_class(std::move(other.rr_class))
|
|
, ttl(std::move(other.ttl))
|
|
, rData(std::move(other.rData))
|
|
{}
|
|
|
|
ResourceRecord::ResourceRecord(Name_t name, RRType_t type, RR_RData_t data)
|
|
: rr_name{std::move(name)}
|
|
, rr_type{type}
|
|
, rr_class{qClassIN}
|
|
, ttl{1}
|
|
, rData{std::move(data)}
|
|
{}
|
|
|
|
bool
|
|
ResourceRecord::Encode(llarp_buffer_t* buf) const
|
|
{
|
|
if (not EncodeName(buf, rr_name))
|
|
return false;
|
|
if (!buf->put_uint16(rr_type))
|
|
{
|
|
return false;
|
|
}
|
|
if (!buf->put_uint16(rr_class))
|
|
{
|
|
return false;
|
|
}
|
|
if (!buf->put_uint32(ttl))
|
|
{
|
|
return false;
|
|
}
|
|
if (!EncodeRData(buf, rData))
|
|
{
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
ResourceRecord::Decode(llarp_buffer_t* buf)
|
|
{
|
|
uint16_t discard;
|
|
if (!buf->read_uint16(discard))
|
|
return false;
|
|
if (!buf->read_uint16(rr_type))
|
|
{
|
|
llarp::LogDebug("failed to decode rr type");
|
|
return false;
|
|
}
|
|
if (!buf->read_uint16(rr_class))
|
|
{
|
|
llarp::LogDebug("failed to decode rr class");
|
|
return false;
|
|
}
|
|
if (!buf->read_uint32(ttl))
|
|
{
|
|
llarp::LogDebug("failed to decode ttl");
|
|
return false;
|
|
}
|
|
if (!DecodeRData(buf, rData))
|
|
{
|
|
llarp::LogDebug("failed to decode rr rdata ", *this);
|
|
return false;
|
|
}
|
|
return true;
|
|
}
|
|
|
|
util::StatusObject
|
|
ResourceRecord::ToJSON() const
|
|
{
|
|
return util::StatusObject{
|
|
{"name", rr_name},
|
|
{"type", rr_type},
|
|
{"class", rr_class},
|
|
{"ttl", ttl},
|
|
{"rdata", std::string{reinterpret_cast<const char*>(rData.data()), rData.size()}}};
|
|
}
|
|
|
|
std::ostream&
|
|
ResourceRecord::print(std::ostream& stream, int level, int spaces) const
|
|
{
|
|
Printer printer(stream, level, spaces);
|
|
printer.printAttribute("name", rr_name);
|
|
printer.printAttribute("type", rr_type);
|
|
printer.printAttribute("class", rr_class);
|
|
printer.printAttribute("ttl", ttl);
|
|
printer.printAttribute("rdata", rData.size());
|
|
|
|
return stream;
|
|
}
|
|
|
|
std::string
|
|
ResourceRecord::ToString() const
|
|
{
|
|
std::ostringstream o;
|
|
print(o, -1, -1);
|
|
return o.str();
|
|
}
|
|
|
|
bool
|
|
ResourceRecord::HasCNameForTLD(const std::string& tld) const
|
|
{
|
|
if (rr_type != qTypeCNAME)
|
|
return false;
|
|
Name_t name;
|
|
llarp_buffer_t buf(rData);
|
|
if (not DecodeName(&buf, name))
|
|
return false;
|
|
return name.find(tld) != std::string::npos
|
|
&& name.rfind(tld) == (name.size() - tld.size()) - 1;
|
|
}
|
|
|
|
} // namespace dns
|
|
} // namespace llarp
|