fluencelabs/musl
1
0
Fork 0
mirror of https://github.com/fluencelabs/musl synced 2025-06-30 07:02:41 +00:00
Code Issues Projects Releases Wiki Activity

reuse parsed resolv.conf in dns core to avoid re-reading/re-parsing

Browse Source
This commit is contained in:
Rich Felker
2016-01-28 20:51:31 -05:00
parent dcad020c9c
commit 1563587b45
2 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/network/lookup_name.c
View File

@ -93,7 +93,7 @@ struct dpc_ctx {
int __dns_parse(const unsigned char *, int, int (*)(void *, int, const void *, int, const void *), void *); int __dns_parse(const unsigned char *, int, int (*)(void *, int, const void *, int, const void *), void *);
int __dn_expand(const unsigned char *, const unsigned char *, const unsigned char *, char *, int); int __dn_expand(const unsigned char *, const unsigned char *, const unsigned char *, char *, int);
int __res_mkquery(int, const char *, int, int, const unsigned char *, int, const unsigned char*, unsigned char *, int); int __res_mkquery(int, const char *, int, int, const unsigned char *, int, const unsigned char*, unsigned char *, int);
int __res_msend(int, const unsigned char *const *, const int *, unsigned char *const *, int *, int); int __res_msend_rc(int, const unsigned char *const *, const int *, unsigned char *const *, int *, int, const struct resolvconf *);
#define RR_A 1 #define RR_A 1
#define RR_CNAME 5 #define RR_CNAME 5
@ -125,7 +125,7 @@ static int dns_parse_callback(void *c, int rr, const void *data, int len, const
return 0; return 0;
} }
static int name_from_dns(struct address buf[static MAXADDRS], char canon[static 256], const char *name, int family) static int name_from_dns(struct address buf[static MAXADDRS], char canon[static 256], const char *name, int family, const struct resolvconf *conf)
{ {
unsigned char qbuf[2][280], abuf[2][512]; unsigned char qbuf[2][280], abuf[2][512];
const unsigned char *qp[2] = { qbuf[0], qbuf[1] }; const unsigned char *qp[2] = { qbuf[0], qbuf[1] };
@ -145,7 +145,8 @@ static int name_from_dns(struct address buf[static MAXADDRS], char canon[static
nq++; nq++;
} }
if (__res_msend(nq, qp, qlens, ap, alens, sizeof *abuf) < 0) return EAI_SYSTEM; if (__res_msend_rc(nq, qp, qlens, ap, alens, sizeof *abuf, conf) < 0)
return EAI_SYSTEM;
for (i=0; i<nq; i++) for (i=0; i<nq; i++)
__dns_parse(abuf[i], alens[i], dns_parse_callback, &ctx); __dns_parse(abuf[i], alens[i], dns_parse_callback, &ctx);
@ -188,13 +189,13 @@ static int name_from_dns_search(struct address buf[static MAXADDRS], char canon[
if (z-p < 256 - l - 1) { if (z-p < 256 - l - 1) {
memcpy(canon+l+1, p, z-p); memcpy(canon+l+1, p, z-p);
canon[z-p+1+l] = 0; canon[z-p+1+l] = 0;
int cnt = name_from_dns(buf, canon, canon, family); int cnt = name_from_dns(buf, canon, canon, family, &conf);
if (cnt) return cnt; if (cnt) return cnt;
} }
} }
canon[l] = 0; canon[l] = 0;
return name_from_dns(buf, canon, name, family); return name_from_dns(buf, canon, name, family, &conf);
} }
static const struct policy { static const struct policy {

27
src/network/res_msend.c
View File

@ -27,8 +27,9 @@ static unsigned long mtime()
+ ts.tv_nsec / 1000000; + ts.tv_nsec / 1000000;
} }
int __res_msend(int nqueries, const unsigned char *const *queries, int __res_msend_rc(int nqueries, const unsigned char *const *queries,
const int *qlens, unsigned char *const *answers, int *alens, int asize) const int *qlens, unsigned char *const *answers, int *alens, int asize,
const struct resolvconf *conf)
{ {
int fd; int fd;
int timeout, attempts, retry_interval, servfail_retry; int timeout, attempts, retry_interval, servfail_retry;
@ -45,19 +46,15 @@ int __res_msend(int nqueries, const unsigned char *const *queries,
int cs; int cs;
struct pollfd pfd; struct pollfd pfd;
unsigned long t0, t1, t2; unsigned long t0, t1, t2;
struct resolvconf conf;
pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs);
/* Get nameservers & timeout/retry settings from resolv.conf */ timeout = 1000*conf->timeout;
if (__get_resolv_conf(&conf, 0, 0) < 0) return -1; attempts = conf->attempts;
timeout = 1000*conf.timeout; nns = conf->nns;
attempts = conf.attempts; for (nns=0; nns<conf->nns; nns++) {
const struct address *iplit = &conf->ns[nns];
nns = conf.nns;
for (nns=0; nns<conf.nns; nns++) {
struct address *iplit = &conf.ns[nns];
if (iplit->family == AF_INET) { if (iplit->family == AF_INET) {
memcpy(&ns[nns].sin.sin_addr, iplit->addr, 4); memcpy(&ns[nns].sin.sin_addr, iplit->addr, 4);
ns[nns].sin.sin_port = htons(53); ns[nns].sin.sin_port = htons(53);
@ -178,3 +175,11 @@ out:
return 0; return 0;
} }
int __res_msend(int nqueries, const unsigned char *const *queries,
const int *qlens, unsigned char *const *answers, int *alens, int asize)
{
struct resolvconf conf;
if (__get_resolv_conf(&conf, 0, 0) < 0) return -1;
return __res_msend_rc(nqueries, queries, qlens, answers, alens, asize, &conf);
}