From 6de304e0ddeed6d194707a271c9cf5ef6a1736e4 Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Mon, 2 Oct 2023 10:08:38 -0700 Subject: [PATCH] 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 0424eefd96107afb89259ee7456155ddf5717b86) --- src/DNS_Mgr.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/DNS_Mgr.cc b/src/DNS_Mgr.cc index a907be6a35..8b6fec3ac2 100644 --- a/src/DNS_Mgr.cc +++ b/src/DNS_Mgr.cc @@ -1032,8 +1032,8 @@ void DNS_Mgr::Resolve() { for ( int i = 0; i < nfds; i++ ) { - 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 rdfd = pollfds[i].revents & POLLIN ? 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 ) ares_process_fd(channel, rdfd, wrfd);