mirror of
https://github.com/oxen-io/lokinet.git
synced 2024-11-17 15:25:35 +00:00
5b555ee5aa
- removes all the llarp_ev_* functions, replacing with methods/classes/functions in the llarp
namespace.
- banish ev/ev.h to the void
- Passes various things by const lvalue ref, especially shared_ptr's that don't need to be copied
(to avoid an atomic refcount increment/decrement).
- Add a llarp::UDPHandle abstract class for UDP handling
- Removes the UDP tick handler; code that needs tick can just do a separate handler on the event
loop outside the UDP socket.
- Adds an "OwnedBuffer" which owns its own memory but is implicitly convertible to a llarp_buffer_t.
This is mostly needed to take over ownership of buffers from uvw without copying them as,
currently, uvw does its own allocation (pending some open upstream issues/PRs).
- Logic:
- add `make_caller`/`call_forever`/`call_every` utility functions to abstract Call wrapping and
dependent timed tasks.
- Add inLogicThread() so that code can tell its inside the logic thread (typically for
debugging assertions).
- get rid of janky integer returns and dealing with cancellations on call_later: the other methods
added here and the event loop code remove the need for them.
- Event loop:
- redo everything with uvw instead of libuv
- rename EventLoopWakeup::Wakeup to EventLoopWakeup::Trigger to better reflect what it does.
- add EventLoopRepeater for repeated events, and replace the code that reschedules itself every
time it is called with a repeater.
- Split up `EventLoop::run()` into a non-virtual base method and abstract `run_loop()` methods;
the base method does a couple extra setup/teardown things that don't need to be in the derived class.
- udp_listen is replaced with ev->udp(...) which returns a new UDPHandle object rather that
needing gross C-style-but-not-actually-C-compatible structs.
- Remove unused register_poll_fd_(un)readable
- Use shared_ptr for EventLoopWakeup rather than returning a raw pointer; uvw lets us not have to
worry about having the event loop class maintain ownership of it.
- Add factory EventLoop::create() function to create a default (uvw-based) event loop (previously
this was one of the llarp_ev_blahblah unnamespaced functions).
- ev_libuv: this is mostly rewritten; all of the glue code/structs, in particular, are gone as
they are no longer needed with uvw.
- DNS:
- Rename DnsHandler to DnsInterceptor to better describe what it does (this is the code that
intercepts all DNS to the tun IP range for Android).
- endpoint:
- remove unused "isolated network" code
- remove distinct (but actually always the same) variables for router/endpoint logic objects
- llarp_buffer_t
- make constructors type-safe against being called with points to non-size-1 values
- tun packet reading:
- read all available packets off the device/file descriptor; previously we were reading one packet
at a time then returning to the event loop to poll again.
- ReadNextPacket() now returns a 0-size packet if the read would block (so that we can implement
the previous point).
- ReadNextPacket() now throws on I/O error
- Miscellaneous code cleanups/simplifications
111 lines
2.4 KiB
C++
111 lines
2.4 KiB
C++
#ifndef LLARP_DNS_MESSAGE_HPP
|
|
#define LLARP_DNS_MESSAGE_HPP
|
|
|
|
#include <dns/serialize.hpp>
|
|
#include <dns/rr.hpp>
|
|
#include <dns/question.hpp>
|
|
|
|
namespace llarp
|
|
{
|
|
namespace dns
|
|
{
|
|
struct SRVData;
|
|
|
|
using MsgID_t = uint16_t;
|
|
using Fields_t = uint16_t;
|
|
using Count_t = uint16_t;
|
|
|
|
struct MessageHeader : public Serialize
|
|
{
|
|
static constexpr size_t Size = 12;
|
|
|
|
MessageHeader() = default;
|
|
|
|
MsgID_t id;
|
|
Fields_t fields;
|
|
Count_t qd_count;
|
|
Count_t an_count;
|
|
Count_t ns_count;
|
|
Count_t ar_count;
|
|
|
|
bool
|
|
Encode(llarp_buffer_t* buf) const override;
|
|
|
|
bool
|
|
Decode(llarp_buffer_t* buf) override;
|
|
|
|
bool
|
|
operator==(const MessageHeader& other) const
|
|
{
|
|
return id == other.id && fields == other.fields && qd_count == other.qd_count
|
|
&& an_count == other.an_count && ns_count == other.ns_count
|
|
&& ar_count == other.ar_count;
|
|
}
|
|
};
|
|
|
|
struct Message : public Serialize
|
|
{
|
|
Message(const MessageHeader& hdr);
|
|
|
|
Message(Message&& other);
|
|
Message(const Message& other);
|
|
|
|
void
|
|
AddNXReply(RR_TTL_t ttl = 1);
|
|
|
|
void
|
|
AddServFail(RR_TTL_t ttl = 30);
|
|
|
|
void
|
|
AddMXReply(std::string name, uint16_t priority, RR_TTL_t ttl = 1);
|
|
|
|
void
|
|
AddCNAMEReply(std::string name, RR_TTL_t ttl = 1);
|
|
|
|
void
|
|
AddINReply(llarp::huint128_t addr, bool isV6, RR_TTL_t ttl = 1);
|
|
|
|
void
|
|
AddAReply(std::string name, RR_TTL_t ttl = 1);
|
|
|
|
void
|
|
AddSRVReply(std::vector<SRVData> records, RR_TTL_t ttl = 1);
|
|
|
|
void
|
|
AddNSReply(std::string name, RR_TTL_t ttl = 1);
|
|
|
|
void
|
|
AddTXTReply(std::string value, RR_TTL_t ttl = 1);
|
|
|
|
bool
|
|
Encode(llarp_buffer_t* buf) const override;
|
|
|
|
bool
|
|
Decode(llarp_buffer_t* buf) override;
|
|
|
|
// Wrapper around Encode that encodes into a new buffer and returns it
|
|
[[nodiscard]] OwnedBuffer
|
|
ToBuffer() const;
|
|
|
|
std::ostream&
|
|
print(std::ostream& stream, int level, int spaces) const;
|
|
|
|
MsgID_t hdr_id;
|
|
Fields_t hdr_fields;
|
|
std::vector<Question> questions;
|
|
std::vector<ResourceRecord> answers;
|
|
std::vector<ResourceRecord> authorities;
|
|
std::vector<ResourceRecord> additional;
|
|
};
|
|
|
|
inline std::ostream&
|
|
operator<<(std::ostream& out, const Message& msg)
|
|
{
|
|
msg.print(out, -1, -1);
|
|
return out;
|
|
}
|
|
} // namespace dns
|
|
} // namespace llarp
|
|
|
|
#endif
|