JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* fhandler_socket.cc (fhandler_socket::evaluate_events): Circumvent

Browse Source 
potential race condition.
	(fhandler_socket::recv_internal): Fix MSG_PEEK bug on blocking sockets
	and simplify recv loop.
	(fhandler_socket::send_internal): Only lock when changing wsock_events.
This commit is contained in:
Corinna Vinschen 2006-07-31 12:55:20 +00:00
parent a947b6879f
commit 1f7dbb011a
2 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/cygwin/ChangeLog
View File

@ -1,3 +1,11 @@
2006-07-31 Corinna Vinschen <corinna@vinschen.de>
* fhandler_socket.cc (fhandler_socket::evaluate_events): Circumvent
potential race condition.
(fhandler_socket::recv_internal): Fix MSG_PEEK bug on blocking sockets
and simplify recv loop.
(fhandler_socket::send_internal): Only lock when changing wsock_events.
2006-07-31 Corinna Vinschen <corinna@vinschen.de> 2006-07-31 Corinna Vinschen <corinna@vinschen.de>
* autoload.cc: Drop LoadDLLprime for wsock32 since no wsock32 function * autoload.cc: Drop LoadDLLprime for wsock32 since no wsock32 function

37
winsup/cygwin/fhandler_socket.cc
View File

@ -494,6 +494,7 @@ fhandler_socket::evaluate_events (const long event_mask, long &events,
bool erase) bool erase)
{ {
int ret = 0; int ret = 0;
long events_now = 0;
WSANETWORKEVENTS evts = { 0 }; WSANETWORKEVENTS evts = { 0 };
if (!(WSAEnumNetworkEvents (get_socket (), wsock_evt, &evts))) if (!(WSAEnumNetworkEvents (get_socket (), wsock_evt, &evts)))
@ -502,6 +503,7 @@ fhandler_socket::evaluate_events (const long event_mask, long &events,
{ {
LOCK_EVENTS; LOCK_EVENTS;
wsock_events->events |= evts.lNetworkEvents; wsock_events->events |= evts.lNetworkEvents;
events_now = (wsock_events->events & event_mask);
if (evts.lNetworkEvents & FD_CONNECT) if (evts.lNetworkEvents & FD_CONNECT)
wsock_events->connect_errorcode = evts.iErrorCode[FD_CONNECT_BIT]; wsock_events->connect_errorcode = evts.iErrorCode[FD_CONNECT_BIT];
UNLOCK_EVENTS; UNLOCK_EVENTS;
@ -511,7 +513,8 @@ fhandler_socket::evaluate_events (const long event_mask, long &events,
} }
LOCK_EVENTS; LOCK_EVENTS;
if ((events = (wsock_events->events & event_mask)) != 0) if ((events = events_now) != 0
|| (events = (wsock_events->events & event_mask)) != 0)
{ {
if (events & FD_CONNECT) if (events & FD_CONNECT)
{ {
@ -1154,27 +1157,15 @@ fhandler_socket::recv_internal (WSABUF *wsabuf, DWORD wsacnt, DWORD flags,
int evt_mask = FD_READ | ((flags & MSG_OOB) ? FD_OOB : 0); int evt_mask = FD_READ | ((flags & MSG_OOB) ? FD_OOB : 0);
flags &= MSG_WINMASK; flags &= MSG_WINMASK;
if (flags & MSG_PEEK) /* Note: Don't call WSARecvFrom(MSG_PEEK) without actually having data
waiting in the buffers, otherwise the event handling gets messed up
for some reason. */
while (!(res = wait_for_events (evt_mask | FD_CLOSE)))
{ {
LOCK_EVENTS;
res = WSARecvFrom (get_socket (), wsabuf, wsacnt, &ret, res = WSARecvFrom (get_socket (), wsabuf, wsacnt, &ret,
&flags, from, fromlen, NULL, NULL); &flags, from, fromlen, NULL, NULL);
wsock_events->events &= ~evt_mask; if (!res || WSAGetLastError () != WSAEWOULDBLOCK)
UNLOCK_EVENTS; break;
}
else
{
do
{
LOCK_EVENTS;
res = WSARecvFrom (get_socket (), wsabuf, wsacnt, &ret,
&flags, from, fromlen, NULL, NULL);
wsock_events->events &= ~evt_mask;
UNLOCK_EVENTS;
}
while (res && WSAGetLastError () == WSAEWOULDBLOCK
&& !(res = wait_for_events (evt_mask | FD_CLOSE)))
;
} }
if (res == SOCKET_ERROR) if (res == SOCKET_ERROR)
@ -1267,12 +1258,14 @@ fhandler_socket::send_internal (struct _WSABUF *wsabuf, DWORD wsacnt, int flags,
do do
{ {
LOCK_EVENTS;
if ((res = WSASendTo (get_socket (), wsabuf, wsacnt, &ret, if ((res = WSASendTo (get_socket (), wsabuf, wsacnt, &ret,
flags & MSG_WINMASK, to, tolen, NULL, NULL)) flags & MSG_WINMASK, to, tolen, NULL, NULL))
&& (err = WSAGetLastError ()) == WSAEWOULDBLOCK) && (err = WSAGetLastError ()) == WSAEWOULDBLOCK)
wsock_events->events &= ~FD_WRITE; {
UNLOCK_EVENTS; LOCK_EVENTS;
wsock_events->events &= ~FD_WRITE;
UNLOCK_EVENTS;
}
} }
while (res && err == WSAEWOULDBLOCK while (res && err == WSAEWOULDBLOCK
&& !(res = wait_for_events (FD_WRITE | FD_CLOSE))); && !(res = wait_for_events (FD_WRITE | FD_CLOSE)));