generic-library/libzmq
1
0
Fork 0
mirror of https://github.com/zeromq/libzmq.git synced 2025-01-06 00:31:13 +01:00
Code Issues Projects Releases Wiki Activity

Problem: WSAEventSelect checks for FD_OOB, but select does not

Browse Source 
WSAEventSelect is used on Windows (when select is the polling method)
only if waiting for more than one socket family, excluding IPv4/6.
It is then passed FD_OOB, which means it can be woken by OOB messages,
but select later on never checks for it.
Remove FD_OOB as it's not actually used for anything.
This commit is contained in:
Luca Boccassi 2019-11-01 09:34:03 +00:00
parent 854354bbd6
commit 9ced36e407
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/select.cpp
View File

@ -376,16 +376,13 @@ void zmq::select_t::loop ()
rc = rc =
WSAEventSelect (fd, wsa_events.events[3], WSAEventSelect (fd, wsa_events.events[3],
FD_READ | FD_ACCEPT | FD_CLOSE FD_READ | FD_ACCEPT | FD_CLOSE
| FD_WRITE | FD_CONNECT | FD_OOB); | FD_WRITE | FD_CONNECT);
else if (FD_ISSET (fd, &family_entry.fds_set.read)) else if (FD_ISSET (fd, &family_entry.fds_set.read))
rc = WSAEventSelect (fd, wsa_events.events[0], rc = WSAEventSelect (fd, wsa_events.events[0],
FD_READ | FD_ACCEPT | FD_CLOSE FD_READ | FD_ACCEPT | FD_CLOSE);
| FD_OOB);
else if (FD_ISSET (fd, &family_entry.fds_set.write)) else if (FD_ISSET (fd, &family_entry.fds_set.write))
rc = WSAEventSelect (fd, wsa_events.events[1], rc = WSAEventSelect (fd, wsa_events.events[1],
FD_WRITE | FD_CONNECT | FD_OOB); FD_WRITE | FD_CONNECT);
else if (FD_ISSET (fd, &family_entry.fds_set.error))
rc = WSAEventSelect (fd, wsa_events.events[2], FD_OOB);
else else
rc = 0; rc = 0;