diff options
| author | Natanael Copa <ncopa@alpinelinux.org> | 2016-06-15 20:27:46 +0200 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2016-06-29 11:59:25 -0400 |
| commit | 4adc6c33e769e647b6fe73752f727c58d09e4e53 (patch) | |
| tree | 65aa06cef6bb2f10d2dfb973e5fdd4581cb3d69b /src/network | |
| parent | 04bced403dead13d20a46a1bd00ab1eb2c50b882 (diff) | |
| download | musl-4adc6c33e769e647b6fe73752f727c58d09e4e53.tar.gz musl-4adc6c33e769e647b6fe73752f727c58d09e4e53.tar.xz musl-4adc6c33e769e647b6fe73752f727c58d09e4e53.zip | |
refactor name_from_dns in hostname lookup backend
loop over an address family / resource record mapping to avoid repetitive code.
Diffstat (limited to 'src/network')
| -rw-r--r-- | src/network/lookup_name.c | 27 |
1 files changed, 13 insertions, 14 deletions
diff --git a/src/network/lookup_name.c b/src/network/lookup_name.c index d3d97b48..fb7303a3 100644 --- a/src/network/lookup_name.c +++ b/src/network/lookup_name.c @@ -141,20 +141,19 @@ static int name_from_dns(struct address buf[static MAXADDRS], char canon[static int qlens[2], alens[2]; int i, nq = 0; struct dpc_ctx ctx = { .addrs = buf, .canon = canon }; - - if (family != AF_INET6) { - qlens[nq] = __res_mkquery(0, name, 1, RR_A, 0, 0, 0, - qbuf[nq], sizeof *qbuf); - if (qlens[nq] == -1) - return EAI_NONAME; - nq++; - } - if (family != AF_INET) { - qlens[nq] = __res_mkquery(0, name, 1, RR_AAAA, 0, 0, 0, - qbuf[nq], sizeof *qbuf); - if (qlens[nq] == -1) - return EAI_NONAME; - nq++; + static const struct { int af; int rr; } afrr[2] = { + { .af = AF_INET6, .rr = RR_A }, + { .af = AF_INET, .rr = RR_AAAA }, + }; + + for (i=0; i<2; i++) { + if (family != afrr[i].af) { + qlens[nq] = __res_mkquery(0, name, 1, afrr[i].rr, + 0, 0, 0, qbuf[nq], sizeof *qbuf); + if (qlens[nq] == -1) + return EAI_NONAME; + nq++; + } } if (__res_msend_rc(nq, qp, qlens, ap, alens, sizeof *abuf, conf) < 0) |