mirror of
https://github.com/oxen-io/lokinet.git
synced 2024-11-07 15:20:31 +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
96 lines
2.4 KiB
C++
96 lines
2.4 KiB
C++
#ifndef LLARP_DNS_SERVER_HPP
|
|
#define LLARP_DNS_SERVER_HPP
|
|
|
|
#include <dns/message.hpp>
|
|
#include <ev/ev.hpp>
|
|
#include <net/net.hpp>
|
|
#include <util/thread/logic.hpp>
|
|
#include <dns/unbound_resolver.hpp>
|
|
|
|
#include <unordered_map>
|
|
|
|
namespace llarp
|
|
{
|
|
namespace dns
|
|
{
|
|
/// handler of dns query hooking
|
|
class IQueryHandler
|
|
{
|
|
public:
|
|
virtual ~IQueryHandler() = default;
|
|
|
|
/// return true if we should hook this message
|
|
virtual bool
|
|
ShouldHookDNSMessage(const Message& msg) const = 0;
|
|
|
|
/// handle a hooked message
|
|
virtual bool
|
|
HandleHookedDNSMessage(Message query, std::function<void(Message)> sendReply) = 0;
|
|
};
|
|
|
|
// Base class for DNS lookups
|
|
class PacketHandler : public std::enable_shared_from_this<PacketHandler>
|
|
{
|
|
public:
|
|
using Logic_ptr = std::shared_ptr<Logic>;
|
|
|
|
explicit PacketHandler(Logic_ptr logic, IQueryHandler* handler);
|
|
|
|
virtual ~PacketHandler() = default;
|
|
|
|
virtual bool
|
|
Start(SockAddr localaddr, std::vector<IpAddress> upstreamResolvers);
|
|
|
|
void
|
|
Stop();
|
|
|
|
void
|
|
Restart();
|
|
|
|
void
|
|
HandlePacket(const SockAddr& resolver, const SockAddr& from, llarp_buffer_t buf);
|
|
|
|
bool
|
|
ShouldHandlePacket(const SockAddr& to, const SockAddr& from, llarp_buffer_t buf) const;
|
|
|
|
protected:
|
|
virtual void
|
|
SendServerMessageBufferTo(const SockAddr& from, const SockAddr& to, llarp_buffer_t buf) = 0;
|
|
|
|
private:
|
|
void
|
|
HandleUpstreamFailure(const SockAddr& from, const SockAddr& to, Message msg);
|
|
|
|
bool
|
|
SetupUnboundResolver(std::vector<IpAddress> resolvers);
|
|
|
|
IQueryHandler* const m_QueryHandler;
|
|
std::set<IpAddress> m_Resolvers;
|
|
std::shared_ptr<UnboundResolver> m_UnboundResolver;
|
|
Logic_ptr m_Logic;
|
|
};
|
|
|
|
// Proxying DNS handler that listens on a UDP port for proper DNS requests.
|
|
class Proxy : public PacketHandler
|
|
{
|
|
public:
|
|
using Logic_ptr = std::shared_ptr<Logic>;
|
|
explicit Proxy(EventLoop_ptr loop, Logic_ptr logic, IQueryHandler* handler);
|
|
|
|
bool
|
|
Start(SockAddr localaddr, std::vector<IpAddress> resolvers) override;
|
|
|
|
protected:
|
|
void
|
|
SendServerMessageBufferTo(
|
|
const SockAddr& from, const SockAddr& to, llarp_buffer_t buf) override;
|
|
|
|
private:
|
|
std::shared_ptr<UDPHandle> m_Server;
|
|
EventLoop_ptr m_Loop;
|
|
};
|
|
} // namespace dns
|
|
} // namespace llarp
|
|
|
|
#endif
|