refactor name_from_dns in hostname lookup backend

loop over an address family / resource record mapping to avoid
repetitive code.
This commit is contained in:
Natanael Copa
2016-06-15 20:27:46 +02:00
committed by Rich Felker
parent 04bced403d
commit 4adc6c33e7

View File

@ -141,20 +141,19 @@ static int name_from_dns(struct address buf[static MAXADDRS], char canon[static
int qlens[2], alens[2]; int qlens[2], alens[2];
int i, nq = 0; int i, nq = 0;
struct dpc_ctx ctx = { .addrs = buf, .canon = canon }; struct dpc_ctx ctx = { .addrs = buf, .canon = canon };
static const struct { int af; int rr; } afrr[2] = {
{ .af = AF_INET6, .rr = RR_A },
{ .af = AF_INET, .rr = RR_AAAA },
};
if (family != AF_INET6) { for (i=0; i<2; i++) {
qlens[nq] = __res_mkquery(0, name, 1, RR_A, 0, 0, 0, if (family != afrr[i].af) {
qbuf[nq], sizeof *qbuf); qlens[nq] = __res_mkquery(0, name, 1, afrr[i].rr,
0, 0, 0, qbuf[nq], sizeof *qbuf);
if (qlens[nq] == -1) if (qlens[nq] == -1)
return EAI_NONAME; return EAI_NONAME;
nq++; 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++;
} }
if (__res_msend_rc(nq, qp, qlens, ap, alens, sizeof *abuf, conf) < 0) if (__res_msend_rc(nq, qp, qlens, ap, alens, sizeof *abuf, conf) < 0)