+++ /dev/null
-/*
- dns.c -- hostname resolving functions
- Copyright (C) 2019 Guus Sliepen <guus@meshlink.io>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#include "system.h"
-
-#include <pthread.h>
-
-#include "adns.h"
-#include "devtools.h"
-#include "logger.h"
-#include "xalloc.h"
-
-typedef struct adns_item {
- adns_cb_t cb;
- void *data;
- time_t deadline;
- struct addrinfo *ai;
- int err;
- char *host;
- char *serv;
-} adns_item_t;
-
-static void *adns_loop(void *data) {
- meshlink_handle_t *mesh = data;
-
- while(true) {
- adns_item_t *item = meshlink_queue_pop_cond(&mesh->adns_queue, &mesh->adns_cond);
-
- if(!item) {
- break;
- }
-
- if(time(NULL) < item->deadline) {
- logger(mesh, MESHLINK_DEBUG, "Resolving %s port %s", item->host, item->serv);
- devtool_adns_resolve_probe();
- int result = getaddrinfo(item->host, item->serv, NULL, &item->ai);
-
- if(result) {
- item->ai = NULL;
- item->err = errno;
- }
- } else {
- logger(mesh, MESHLINK_WARNING, "Deadline passed for DNS request %s port %s", item->host, item->serv);
- item->ai = NULL;
- item->err = ETIMEDOUT;
- }
-
- if(meshlink_queue_push(&mesh->adns_done_queue, item)) {
- signal_trigger(&mesh->loop, &mesh->adns_signal);
- } else {
- free(item->host);
- free(item->serv);
- free(item);
- }
- }
-
- return NULL;
-}
-
-static void adns_cb_handler(event_loop_t *loop, void *data) {
- (void)loop;
- meshlink_handle_t *mesh = data;
-
- for(adns_item_t *item; (item = meshlink_queue_pop(&mesh->adns_done_queue));) {
- item->cb(mesh, item->host, item->serv, item->data, item->ai, item->err);
- free(item);
- }
-}
-
-void init_adns(meshlink_handle_t *mesh) {
- meshlink_queue_init(&mesh->adns_queue);
- meshlink_queue_init(&mesh->adns_done_queue);
- signal_add(&mesh->loop, &mesh->adns_signal, adns_cb_handler, mesh, 1);
- pthread_create(&mesh->adns_thread, NULL, adns_loop, mesh);
-}
-
-void exit_adns(meshlink_handle_t *mesh) {
- if(!mesh->adns_signal.cb) {
- return;
- }
-
- /* Drain the queue of any pending ADNS requests */
- for(adns_item_t *item; (item = meshlink_queue_pop(&mesh->adns_queue));) {
- free(item->host);
- free(item->serv);
- free(item);
- }
-
- /* Signal the ADNS thread to stop */
- if(!meshlink_queue_push(&mesh->adns_queue, NULL)) {
- abort();
- }
-
- pthread_cond_signal(&mesh->adns_cond);
-
- pthread_join(mesh->adns_thread, NULL);
- meshlink_queue_exit(&mesh->adns_queue);
- signal_del(&mesh->loop, &mesh->adns_signal);
-}
-
-void adns_queue(meshlink_handle_t *mesh, char *host, char *serv, adns_cb_t cb, void *data, int timeout) {
- adns_item_t *item = xmalloc(sizeof(*item));
- item->cb = cb;
- item->data = data;
- item->deadline = time(NULL) + timeout;
- item->host = host;
- item->serv = serv;
-
- logger(mesh, MESHLINK_DEBUG, "Enqueueing DNS request for %s port %s", item->host, item->serv);
-
- if(!meshlink_queue_push(&mesh->adns_queue, item)) {
- abort();
- }
-
- pthread_cond_signal(&mesh->adns_cond);
-}
-
-struct adns_blocking_info {
- meshlink_handle_t *mesh;
- pthread_mutex_t mutex;
- pthread_cond_t cond;
- char *host;
- char *serv;
- struct addrinfo *ai;
- int socktype;
- bool done;
-};
-
-static void *adns_blocking_handler(void *data) {
- struct adns_blocking_info *info = data;
-
- logger(info->mesh, MESHLINK_DEBUG, "Resolving %s port %s", info->host, info->serv);
- devtool_adns_resolve_probe();
-
- struct addrinfo hint = {
- .ai_family = AF_UNSPEC,
- .ai_socktype = info->socktype,
- };
-
- if(getaddrinfo(info->host, info->serv, &hint, &info->ai)) {
- info->ai = NULL;
- }
-
- if(pthread_mutex_lock(&info->mutex) != 0) {
- abort();
- }
-
- bool cleanup = info->done;
-
- if(!info->done) {
- info->done = true;
- pthread_cond_signal(&info->cond);
- }
-
- pthread_mutex_unlock(&info->mutex);
-
- if(cleanup) {
- free(info->host);
- free(info->serv);
- free(info);
- }
-
- return NULL;
-}
-
-struct addrinfo *adns_blocking_request(meshlink_handle_t *mesh, char *host, char *serv, int socktype, int timeout) {
- struct adns_blocking_info *info = xzalloc(sizeof(*info));
-
- info->mesh = mesh;
- info->host = host;
- info->serv = serv;
- info->socktype = socktype;
- pthread_mutex_init(&info->mutex, NULL);
- pthread_cond_init(&info->cond, NULL);
-
- struct timespec deadline;
- clock_gettime(CLOCK_REALTIME, &deadline);
- deadline.tv_sec += timeout;
-
- pthread_t thread;
-
- if(pthread_create(&thread, NULL, adns_blocking_handler, info)) {
- free(info->host);
- free(info->serv);
- free(info);
- return NULL;
- } else {
- pthread_detach(thread);
- }
-
- if(pthread_mutex_lock(&info->mutex) != 0) {
- abort();
- }
-
- pthread_cond_timedwait(&info->cond, &info->mutex, &deadline);
-
- struct addrinfo *result = NULL;
- bool cleanup = info->done;
-
- if(info->done) {
- result = info->ai;
- } else {
- logger(mesh, MESHLINK_WARNING, "Deadline passed for DNS request %s port %s", host, serv);
- info->done = true;
- }
-
- pthread_mutex_unlock(&info->mutex);
-
- if(cleanup) {
- free(info->host);
- free(info->serv);
- free(info);
- }
-
- return result;
-}
+++ /dev/null
-#ifndef MESHLINK_ADNS_H
-#define MESHLINK_ADNS_H
-
-/*
- adns.h -- header file for adns.c
- Copyright (C) 2019 Guus Sliepen <guus@meshlink.io>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License along
- with this program; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-*/
-
-#include "meshlink_internal.h"
-
-typedef void (*adns_cb_t)(meshlink_handle_t *mesh, char *host, char *serv, void *data, struct addrinfo *ai, int err);
-
-void init_adns(meshlink_handle_t *mesh);
-void exit_adns(meshlink_handle_t *mesh);
-void adns_queue(meshlink_handle_t *mesh, char *host, char *serv, adns_cb_t cb, void *data, int timeout);
-struct addrinfo *adns_blocking_request(meshlink_handle_t *mesh, char *host, char *serv, int socktype, int timeout);
-
-#endif
#include "system.h"
#include <pthread.h>
-#include "adns.h"
#include "crypto.h"
#include "ecdsagen.h"
#include "logger.h"
}
logger(mesh, MESHLINK_DEBUG, "Trying to discover externally visible hostname...\n");
- struct addrinfo *ai = adns_blocking_request(mesh, xstrdup(host), xstrdup(port ? port : "80"), SOCK_STREAM, 5);
+ struct addrinfo *ai = str2addrinfo(host, port ? port : "80", SOCK_STREAM);
char line[256];
char *hostname = NULL;
pthread_mutex_init(&mesh->mutex, &attr);
pthread_cond_init(&mesh->cond, NULL);
- pthread_cond_init(&mesh->adns_cond, NULL);
-
mesh->threadstarted = false;
event_loop_init(&mesh->loop);
mesh->loop.data = mesh;
}
init_outgoings(mesh);
- init_adns(mesh);
// Start the main thread
}
}
- exit_adns(mesh);
exit_outgoings(mesh);
// Try to write out any changed node config files, ignore errors at this point.
}
// Connect to the meshlink daemon mentioned in the URL.
- struct addrinfo *ai = adns_blocking_request(mesh, xstrdup(address), xstrdup(port), SOCK_STREAM, 30);
+ struct addrinfo *ai = str2addrinfo(address, port, SOCK_STREAM);
if(ai) {
for(struct addrinfo *aip = ai; aip; aip = aip->ai_next) {
#include "system.h"
-#include "adns.h"
#include "conf.h"
#include "connection.h"
#include "list.h"
}
}
-static void canonical_resolve_cb(meshlink_handle_t *mesh, char *host, char *serv, void *data, struct addrinfo *ai, int err) {
- (void)serv;
- (void)err;
- node_t *n = data;
-
- free(host);
- free(serv);
-
- for list_each(outgoing_t, outgoing, mesh->outgoings) {
- if(outgoing->node == n) {
- if(outgoing->state == OUTGOING_CANONICAL_RESOLVE) {
- outgoing->ai = ai;
- outgoing->aip = NULL;
- outgoing->state = OUTGOING_CANONICAL;
- do_outgoing_connection(mesh, outgoing);
- }
-
- return;
- }
- }
-}
-
static bool get_next_outgoing_address(meshlink_handle_t *mesh, outgoing_t *outgoing) {
(void)mesh;
if(port) {
*port++ = 0;
- port = xstrdup(port);
- adns_queue(mesh, address, port, canonical_resolve_cb, outgoing->node, 2);
- return false;
+ outgoing->ai = str2addrinfo(address, port, SOCK_STREAM);
+ outgoing->aip = NULL;
+ outgoing->state = OUTGOING_CANONICAL;
} else {
logger(mesh, MESHLINK_ERROR, "Canonical address for %s is missing port number", n->name);
- free(address);
outgoing->state = OUTGOING_RECENT;
}
+ free(address);
} else {
outgoing->state = OUTGOING_RECENT;
}
projects / meshlink-tiny / commitdiff