diff options
| author |   eric <eric@openbsd.org> | 2014-03-25 19:48:11 +0000 |
|---|---|---|
| committer | eric <eric@openbsd.org> | 2014-03-25 19:48:11 +0000 |
| commit | 5be03f8ff4bfdb72cf93ab0aee9dc90ee972fe34 (patch) | |
| tree | 92483103a5d24c93d4432a673656d433981b4a98 /lib/libc/asr/getnameinfo_async.c | |
| parent | sync, hopefully better this time (diff) | |
| download | wireguard-openbsd-5be03f8ff4bfdb72cf93ab0aee9dc90ee972fe34.tar.xz wireguard-openbsd-5be03f8ff4bfdb72cf93ab0aee9dc90ee972fe34.zip | |
Cleanup and simplify the API to be exposed. Use better names for
structures, functions and defines.
discussed with and ok deraadt@ guenther@
Diffstat (limited to 'lib/libc/asr/getnameinfo_async.c')
| -rw-r--r-- | lib/libc/asr/getnameinfo_async.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/lib/libc/asr/getnameinfo_async.c b/lib/libc/asr/getnameinfo_async.c index 55f0e68b1b3..6f8965c0b7c 100644 --- a/lib/libc/asr/getnameinfo_async.c +++ b/lib/libc/asr/getnameinfo_async.c @@ -1,4 +1,4 @@ -/* $OpenBSD: getnameinfo_async.c,v 1.7 2013/07/12 14:36:22 eric Exp $ */ +/* $OpenBSD: getnameinfo_async.c,v 1.8 2014/03/25 19:48:11 eric Exp $ */ /* * Copyright (c) 2012 Eric Faurot <eric@openbsd.org> * @@ -31,16 +31,16 @@ #include "asr.h" #include "asr_private.h" -static int getnameinfo_async_run(struct async *, struct async_res *); -static int _servname(struct async *); -static int _numerichost(struct async *); +static int getnameinfo_async_run(struct asr_query *, struct asr_result *); +static int _servname(struct asr_query *); +static int _numerichost(struct asr_query *); -struct async * +struct asr_query * getnameinfo_async(const struct sockaddr *sa, socklen_t slen, char *host, - size_t hostlen, char *serv, size_t servlen, int flags, struct asr *asr) + size_t hostlen, char *serv, size_t servlen, int flags, void *asr) { - struct asr_ctx *ac; - struct async *as; + struct asr_ctx *ac; + struct asr_query *as; ac = asr_use_resolver(asr); if ((as = asr_async_new(ac, ASR_GETNAMEINFO)) == NULL) @@ -70,7 +70,7 @@ getnameinfo_async(const struct sockaddr *sa, socklen_t slen, char *host, } static int -getnameinfo_async_run(struct async *as, struct async_res *ar) +getnameinfo_async_run(struct asr_query *as, struct asr_result *ar) { void *addr; socklen_t addrlen; @@ -153,7 +153,7 @@ getnameinfo_async_run(struct async *as, struct async_res *ar) case ASR_STATE_SUBQUERY: - if ((r = asr_async_run(as->as.ni.subq, ar)) == ASYNC_COND) + if ((r = asr_run(as->as.ni.subq, ar)) == ASYNC_COND) return (ASYNC_COND); /* @@ -206,7 +206,7 @@ getnameinfo_async_run(struct async *as, struct async_res *ar) * return (-1) if the buffer is too small. */ static int -_servname(struct async *as) +_servname(struct asr_query *as) { struct servent s; struct servent_data sd; @@ -244,7 +244,7 @@ _servname(struct async *as) * Write the numeric address */ static int -_numerichost(struct async *as) +_numerichost(struct asr_query *as) { unsigned int ifidx; char scope[IF_NAMESIZE + 1], *ifname; |