mirror of
https://github.com/oxen-io/lokinet.git
synced 2024-11-07 15:20:31 +00:00
9ea82edc07
Fixes: - tighten reserved name detection to not match fooloki.loki, but instead only match "foo.loki.loki" and "loki.loki" (and similar for reserved name "snode.loki"). - IPv6 PTR parsing was completely broken. - Added tests for the above two issues. Cleanups: - Eliminate llarp::dns::Name_t typedef for std::string - Use optional return instead of bool + output param - Use string_views; we were doing a *lot* of string substr's during parsing, each of which allocates a new string. - Use fmt instead of stringstream - Simplify IPv4 PTR parsing
73 lines
1.5 KiB
C++
73 lines
1.5 KiB
C++
#pragma once
|
|
|
|
#include "serialize.hpp"
|
|
#include "name.hpp"
|
|
#include <llarp/net/net_int.hpp>
|
|
|
|
namespace llarp
|
|
{
|
|
namespace dns
|
|
{
|
|
using QType_t = uint16_t;
|
|
using QClass_t = uint16_t;
|
|
|
|
struct Question : public Serialize
|
|
{
|
|
Question() = default;
|
|
|
|
explicit Question(std::string name, QType_t type);
|
|
|
|
Question(Question&& other);
|
|
Question(const Question& other);
|
|
bool
|
|
Encode(llarp_buffer_t* buf) const override;
|
|
|
|
bool
|
|
Decode(llarp_buffer_t* buf) override;
|
|
|
|
std::string
|
|
ToString() const;
|
|
|
|
bool
|
|
operator==(const Question& other) const
|
|
{
|
|
return qname == other.qname && qtype == other.qtype && qclass == other.qclass;
|
|
}
|
|
|
|
std::string qname;
|
|
QType_t qtype;
|
|
QClass_t qclass;
|
|
|
|
/// determine if we match a name
|
|
bool
|
|
IsName(const std::string& other) const;
|
|
|
|
/// is the name [something.]localhost.loki. ?
|
|
bool
|
|
IsLocalhost() const;
|
|
|
|
/// return true if we have subdomains in ths question
|
|
bool
|
|
HasSubdomains() const;
|
|
|
|
/// get subdomain(s), if any, from qname
|
|
std::string
|
|
Subdomains() const;
|
|
|
|
/// return qname with no trailing .
|
|
std::string
|
|
Name() const;
|
|
|
|
/// determine if we are using this TLD
|
|
bool
|
|
HasTLD(const std::string& tld) const;
|
|
|
|
util::StatusObject
|
|
ToJSON() const override;
|
|
};
|
|
} // namespace dns
|
|
} // namespace llarp
|
|
|
|
template <>
|
|
constexpr inline bool llarp::IsToStringFormattable<llarp::dns::Question> = true;
|