Merge remote-tracking branch 'origin/topic/awelzel/3309-dns-mgr-revents-ouch'

* origin/topic/awelzel/3309-dns-mgr-revents-ouch:
  DNS_Mgr: Fix | vs & for pollfd.revents

(cherry picked from commit 0424eefd96)
This commit is contained in:
Tim Wojtulewicz 2023-10-02 10:08:38 -07:00
parent 7291ac4f26
commit 6de304e0dd

View file

@ -1032,8 +1032,8 @@ void DNS_Mgr::Resolve()
{ {
for ( int i = 0; i < nfds; i++ ) for ( int i = 0; i < nfds; i++ )
{ {
int rdfd = pollfds[i].revents | POLLIN ? pollfds[i].fd : ARES_SOCKET_BAD; int rdfd = pollfds[i].revents & POLLIN ? pollfds[i].fd : ARES_SOCKET_BAD;
int wrfd = pollfds[i].revents | POLLOUT ? pollfds[i].fd : ARES_SOCKET_BAD; int wrfd = pollfds[i].revents & POLLOUT ? pollfds[i].fd : ARES_SOCKET_BAD;
if ( rdfd != ARES_SOCKET_BAD || wrfd != ARES_SOCKET_BAD ) if ( rdfd != ARES_SOCKET_BAD || wrfd != ARES_SOCKET_BAD )
ares_process_fd(channel, rdfd, wrfd); ares_process_fd(channel, rdfd, wrfd);