Archives/lokinet
2
0
Fork 0
mirror of https://github.com/oxen-io/lokinet.git synced 2024-11-15 12:13:24 +00:00
Code Issues Projects Releases Wiki Activity

move logic into client

Browse Source
This commit is contained in:
Ryan Tharp 2018-09-22 03:22:18 -07:00
parent e53e093e17
commit 31595d209d
2 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
llarp/dnsd.cpp
View File

@ -384,8 +384,8 @@ raw_handle_recvfrom(int *sockfd, const struct sockaddr *saddr, const void *buf,
} }
bool bool
llarp_dnsd_init(struct dnsd_context *dnsd, struct llarp_ev_loop *netloop, llarp_dnsd_init(struct dnsd_context *dnsd, struct llarp_logic *logic,
struct llarp_logic *logic, const char *dnsd_ifname, struct llarp_ev_loop *netloop, const char *dnsd_ifname,
uint16_t dnsd_port, const char *dnsc_hostname, uint16_t dnsd_port, const char *dnsc_hostname,
uint16_t dnsc_port) uint16_t dnsc_port)
{ {
@ -400,12 +400,13 @@ llarp_dnsd_init(struct dnsd_context *dnsd, struct llarp_ev_loop *netloop,
dns_udp_tracker.dnsd = dnsd; dns_udp_tracker.dnsd = dnsd;
dnsd->tracker = &dns_udp_tracker; // register global tracker with context dnsd->tracker = &dns_udp_tracker; // register global tracker with context
dnsd->logic = logic; // set logic worker for timers // dnsd->logic = logic; // set logic worker for timers
dnsd->intercept = nullptr; // set default intercepter dnsd->intercept = nullptr; // set default intercepter
// configure dns client // configure dns client
if(!llarp_dnsc_init(&dnsd->client, &dnsd->udp, dnsc_hostname, dnsc_port)) if(!llarp_dnsc_init(&dnsd->client, logic, &dnsd->udp, dnsc_hostname,
dnsc_port))
{ {
llarp::LogError("Couldnt init dns client"); llarp::LogError("Couldnt init dns client");
return false; return false;

10
llarp/dnsd.hpp
View File

@ -53,13 +53,11 @@ struct dnsd_context
{ {
/// DNS daemon socket to listen on /// DNS daemon socket to listen on
struct llarp_udp_io udp; struct llarp_udp_io udp;
/// for timers (MAYBEFIXME? maybe we decouple this, yes pls have a generic passed in) /// udp tracker
struct llarp_logic *logic;
/// tracker
struct dns_tracker *tracker; struct dns_tracker *tracker;
/// upstream DNS client context to use /// upstream DNS client context to use
dnsc_context client; dnsc_context client;
/// custom data for intercept query hook /// custom data for intercept query hook (used for configuration of hook)
void *user; void *user;
/// hook function for intercepting dns requests /// hook function for intercepting dns requests
intercept_query_hook intercept; intercept_query_hook intercept;
@ -83,8 +81,8 @@ writesend_dnss_response(struct sockaddr *hostRes, const struct sockaddr *from,
/// initialize dns subsystem and bind socket /// initialize dns subsystem and bind socket
/// returns true on bind success otherwise returns false /// returns true on bind success otherwise returns false
bool bool
llarp_dnsd_init(struct dnsd_context *dnsd, struct llarp_ev_loop *netloop, llarp_dnsd_init(struct dnsd_context *dnsd, struct llarp_logic *logic,
struct llarp_logic *logic, const char *dnsd_ifname, struct llarp_ev_loop *netloop, const char *dnsd_ifname,
uint16_t dnsd_port, const char *dnsc_hostname, uint16_t dnsd_port, const char *dnsc_hostname,
uint16_t dnsc_port); uint16_t dnsc_port);