diff options
| author | Rich Felker <dalias@aerifal.cx> | 2022-09-21 18:49:53 -0400 |
|---|---|---|
| committer | Rich Felker <dalias@aerifal.cx> | 2022-09-21 18:49:53 -0400 |
| commit | c87d75f2aa6fde49a99cf3287e535a14f354f781 (patch) | |
| tree | f9779263b016f8627dd70158131ad4864cbff34f /src | |
| parent | 85050ac5a2677a8ebf2722e93b5c037ec675c036 (diff) | |
| download | musl-c87d75f2aa6fde49a99cf3287e535a14f354f781.tar.gz musl-c87d75f2aa6fde49a99cf3287e535a14f354f781.tar.xz musl-c87d75f2aa6fde49a99cf3287e535a14f354f781.zip | |
adapt res_msend DNS query core for working with multiple sockets
this is groundwork for TCP fallback support, but does not itself change behavior in any way.
Diffstat (limited to 'src')
| -rw-r--r-- | src/network/res_msend.c | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/src/network/res_msend.c b/src/network/res_msend.c index 9adaea13..98e6d8a3 100644 --- a/src/network/res_msend.c +++ b/src/network/res_msend.c @@ -16,7 +16,9 @@ static void cleanup(void *p) { - __syscall(SYS_close, (intptr_t)p); + struct pollfd *pfd = p; + for (int i=0; pfd[i].fd >= -1; i++) + if (pfd[i].fd >= 0) __syscall(SYS_close, pfd[i].fd); } static unsigned long mtime() @@ -44,7 +46,7 @@ int __res_msend_rc(int nqueries, const unsigned char *const *queries, int next; int i, j; int cs; - struct pollfd pfd; + struct pollfd pfd[nqueries+2]; unsigned long t0, t1, t2; pthread_setcancelstate(PTHREAD_CANCEL_DISABLE, &cs); @@ -92,7 +94,12 @@ int __res_msend_rc(int nqueries, const unsigned char *const *queries, * yield either no reply (indicated by zero length) or an answer * packet which is up to the caller to interpret. */ - pthread_cleanup_push(cleanup, (void *)(intptr_t)fd); + for (i=0; i<nqueries; i++) pfd[i].fd = -1; + pfd[nqueries].fd = fd; + pfd[nqueries].events = POLLIN; + pfd[nqueries+1].fd = -2; + + pthread_cleanup_push(cleanup, pfd); pthread_setcancelstate(cs, 0); /* Convert any IPv4 addresses in a mixed environment to v4-mapped */ @@ -112,8 +119,6 @@ int __res_msend_rc(int nqueries, const unsigned char *const *queries, memset(alens, 0, sizeof *alens * nqueries); - pfd.fd = fd; - pfd.events = POLLIN; retry_interval = timeout / attempts; next = 0; t0 = t2 = mtime(); @@ -133,7 +138,7 @@ int __res_msend_rc(int nqueries, const unsigned char *const *queries, } /* Wait for a response, or until time to retry */ - if (poll(&pfd, 1, t1+retry_interval-t2) <= 0) continue; + if (poll(pfd, nqueries+1, t1+retry_interval-t2) <= 0) continue; while ((rlen = recvfrom(fd, answers[next], asize, 0, (void *)&sa, (socklen_t[1]){sl})) >= 0) { |