summaryrefslogtreecommitdiffstats
path: root/lib/libc/asr/asr.c
diff options
context:
space:
mode:
authoreric <eric@openbsd.org>2012-09-05 21:49:12 +0000
committereric <eric@openbsd.org>2012-09-05 21:49:12 +0000
commitc5c8c49b7d93a9614396fdca60ffe24909e44a3b (patch)
tree6f9c14b8f149796d3563694a52b02558c6425fba /lib/libc/asr/asr.c
parentrun regress with the local env too (diff)
downloadwireguard-openbsd-c5c8c49b7d93a9614396fdca60ffe24909e44a3b.tar.xz
wireguard-openbsd-c5c8c49b7d93a9614396fdca60ffe24909e44a3b.zip
Get rid of the hostaddr_async subquery and merge its behaviour
directly into getaddrinfo_async_run. Simplifies everything by a great deal.
Diffstat (limited to 'lib/libc/asr/asr.c')
-rw-r--r--lib/libc/asr/asr.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/lib/libc/asr/asr.c b/lib/libc/asr/asr.c
index a0c7125594d..013c7dc27a5 100644
--- a/lib/libc/asr/asr.c
+++ b/lib/libc/asr/asr.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: asr.c,v 1.5 2012/09/05 15:56:13 eric Exp $ */
+/* $OpenBSD: asr.c,v 1.6 2012/09/05 21:49:12 eric Exp $ */
/*
* Copyright (c) 2010-2012 Eric Faurot <eric@openbsd.org>
*
@@ -301,21 +301,14 @@ async_free(struct async *as)
free(as->as.ai.hostname);
if (as->as.ai.servname)
free(as->as.ai.servname);
+ if (as->as.ai.fqdn)
+ free(as->as.ai.fqdn);
break;
case ASR_GETNAMEINFO:
if (as->as.ni.subq)
async_free(as->as.ni.subq);
break;
-
- case ASR_HOSTADDR:
- if (as->as.ai.hostname)
- free(as->as.ai.hostname);
- if (as->as.ai.subq)
- async_free(as->as.ai.subq);
- if (as->as.ai.aifirst)
- freeaddrinfo(as->as.ai.aifirst);
- break;
}
asr_ctx_unref(as->as_ctx);