X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fadns.c;h=cb9611e1594b246ab71f8364ef624d33d2ddf3b4;hb=8e4f6238558c28cd05bd580cc947d7178d2bac90;hp=a04310149f07a76cf3ff7ae2d05db369fb921d23;hpb=8d4b96efb7955eaa96174af4804597f92e124041;p=meshlink diff --git a/src/adns.c b/src/adns.c index a0431014..cb9611e1 100644 --- a/src/adns.c +++ b/src/adns.c @@ -138,6 +138,7 @@ struct adns_blocking_info { char *host; char *serv; struct addrinfo *ai; + int socktype; bool done; }; @@ -147,7 +148,12 @@ static void *adns_blocking_handler(void *data) { logger(info->mesh, MESHLINK_DEBUG, "Resolving %s port %s", info->host, info->serv); devtool_adns_resolve_probe(); - if(getaddrinfo(info->host, info->serv, NULL, &info->ai)) { + struct addrinfo hint = { + .ai_family = AF_UNSPEC, + .ai_socktype = info->socktype, + }; + + if(getaddrinfo(info->host, info->serv, &hint, &info->ai)) { info->ai = NULL; } @@ -171,12 +177,15 @@ static void *adns_blocking_handler(void *data) { return NULL; } -struct addrinfo *adns_blocking_request(meshlink_handle_t *mesh, char *host, char *serv, int timeout) { +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);