Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 14:48:21 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

DNS_Mgr: Remove usage of ares_getsock from Lookup

Browse source
This commit is contained in:
Tim Wojtulewicz 2024-08-30 10:58:51 -07:00
parent 6739fca645
commit d95057d618
1 changed files with 20 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/DNS_Mgr.cc
View file

@ -887,31 +887,35 @@ void DNS_Mgr::Lookup(const std::string& name, int request_type, LookupCallback*
void DNS_Mgr::Resolve() {
int nfds = 0;
struct timeval *tvp, tv;
struct pollfd pollfds[ARES_GETSOCK_MAXNUM];
ares_socket_t socks[ARES_GETSOCK_MAXNUM];
struct pollfd pollfds[1024];
tv.tv_sec = DNS_TIMEOUT;
tv.tv_usec = 0;
for ( int i = 0; i < MAX_PENDING_REQUESTS; i++ ) {
int nfds = 0;
int bitmap = ares_getsock(channel, socks, ARES_GETSOCK_MAXNUM);
if ( socket_fds.empty() && write_socket_fds.empty() )
break;
for ( int i = 0; i < ARES_GETSOCK_MAXNUM; i++ ) {
bool rd = ARES_GETSOCK_READABLE(bitmap, i);
bool wr = ARES_GETSOCK_WRITABLE(bitmap, i);
if ( rd || wr ) {
pollfds[nfds].fd = socks[i];
pollfds[nfds].events = rd ? POLLIN : 0;
pollfds[nfds].events |= wr ? POLLOUT : 0;
memset(pollfds, 0, sizeof(pollfd) * 1024);
for ( int fd : socket_fds ) {
if ( nfds == 1024 )
break;
pollfds[nfds].fd = fd;
pollfds[nfds].events = POLLIN;
++nfds;
}
}
// Do we have any sockets that are read or writable?
if ( nfds == 0 )
for ( int fd : write_socket_fds ) {
if ( nfds == 1024 )
break;
pollfds[nfds].fd = fd;
pollfds[nfds].events = POLLIN | POLLOUT;
++nfds;
}
// poll() timeout is in milliseconds.
tvp = ares_timeout(channel, &tv, &tv);
int timeout_ms = tvp->tv_sec * 1000 + tvp->tv_usec / 1000;