Browse Source

refactor name_from_dns in hostname lookup backend

loop over an address family / resource record mapping to avoid
repetitive code.
master
Natanael Copa 10 years ago
committed by Rich Felker
parent
commit
4adc6c33e7
  1. 27
      src/network/lookup_name.c

27
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 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] = {
if (family != AF_INET6) { { .af = AF_INET6, .rr = RR_A },
qlens[nq] = __res_mkquery(0, name, 1, RR_A, 0, 0, 0, { .af = AF_INET, .rr = RR_AAAA },
qbuf[nq], sizeof *qbuf); };
if (qlens[nq] == -1)
return EAI_NONAME; for (i=0; i<2; i++) {
nq++; if (family != afrr[i].af) {
} qlens[nq] = __res_mkquery(0, name, 1, afrr[i].rr,
if (family != AF_INET) { 0, 0, 0, qbuf[nq], sizeof *qbuf);
qlens[nq] = __res_mkquery(0, name, 1, RR_AAAA, 0, 0, 0, if (qlens[nq] == -1)
qbuf[nq], sizeof *qbuf); return EAI_NONAME;
if (qlens[nq] == -1) nq++;
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)

Loading…
Cancel
Save