Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-05 18:52:57 +00:00
Code Issues Projects Releases Packages Wiki Activity

- Fix several bugs so select() will now recognize when a connection gets closed

Browse source 
svn path=/trunk/; revision=42661
This commit is contained in:
Cameron Gutman 2009-08-14 00:09:59 +00:00
parent e90b905e0b
commit a1a8e7a706
4 changed files with 11 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

3
reactos/dll/win32/msafd/misc/dllmain.c
View file

@ -777,6 +777,7 @@ WSPSelect(int nfds,
PollInfo->Handles[j].Events = AFD_EVENT_RECEIVE | PollInfo->Handles[j].Events = AFD_EVENT_RECEIVE |
AFD_EVENT_DISCONNECT | AFD_EVENT_DISCONNECT |
AFD_EVENT_ABORT | AFD_EVENT_ABORT |
AFD_EVENT_CLOSE |
AFD_EVENT_ACCEPT; AFD_EVENT_ACCEPT;
} }
} }
@ -2397,7 +2398,7 @@ VOID SockProcessAsyncSelect(PSOCKET_INFORMATION Socket, PASYNC_DATA AsyncData)
if (lNetworkEvents & FD_CLOSE) if (lNetworkEvents & FD_CLOSE)
{ {
AsyncData->AsyncSelectInfo.Handles[0].Events |= AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT; AsyncData->AsyncSelectInfo.Handles[0].Events |= AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT | AFD_EVENT_CLOSE;
} }
if (lNetworkEvents & FD_QOS) if (lNetworkEvents & FD_QOS)

4
reactos/dll/win32/msafd/misc/event.c
View file

@ -76,7 +76,7 @@ WSPEventSelect(
} }
if (lNetworkEvents & FD_CLOSE) { if (lNetworkEvents & FD_CLOSE) {
EventSelectInfo.Events |= AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT; EventSelectInfo.Events |= AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT | AFD_EVENT_CLOSE;
} }
if (lNetworkEvents & FD_QOS) { if (lNetworkEvents & FD_QOS) {
@ -206,7 +206,7 @@ WSPEnumNetworkEvents(
} }
if (EnumReq.PollEvents & if (EnumReq.PollEvents &
(AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT)) { (AFD_EVENT_DISCONNECT | AFD_EVENT_ABORT | AFD_EVENT_CLOSE)) {
lpNetworkEvents->lNetworkEvents |= FD_CLOSE; lpNetworkEvents->lNetworkEvents |= FD_CLOSE;
} }

2
reactos/drivers/network/afd/afd/main.c
View file

@ -184,6 +184,8 @@ AfdCloseSocket(PDEVICE_OBJECT DeviceObject, PIRP Irp,
if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED; if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED;
FCB->State = SOCKET_STATE_CLOSED; FCB->State = SOCKET_STATE_CLOSED;
FCB->PollState = AFD_EVENT_CLOSE;
PollReeval( FCB->DeviceExt, FCB->FileObject );
InFlightRequest[0] = &FCB->ListenIrp; InFlightRequest[0] = &FCB->ListenIrp;
InFlightRequest[1] = &FCB->ReceiveIrp; InFlightRequest[1] = &FCB->ReceiveIrp;

19
reactos/drivers/network/afd/afd/select.c
View file

@ -145,7 +145,7 @@ VOID KillSelectsForFCB( PAFD_DEVICE_EXTENSION DeviceExt,
if( (PVOID)HandleArray[i].Handle == FileObject && if( (PVOID)HandleArray[i].Handle == FileObject &&
(!OnlyExclusive || (OnlyExclusive && Poll->Exclusive)) ) { (!OnlyExclusive || (OnlyExclusive && Poll->Exclusive)) ) {
ZeroEvents( PollReq->Handles, PollReq->HandleCount ); ZeroEvents( PollReq->Handles, PollReq->HandleCount );
SignalSocket( Poll, NULL, PollReq, STATUS_SUCCESS ); SignalSocket( Poll, NULL, PollReq, STATUS_CANCELLED );
} }
} }
} }
@ -353,20 +353,11 @@ static BOOLEAN UpdatePollWithFCB( PAFD_ACTIVE_POLL Poll, PFILE_OBJECT FileObject
FileObject = (PFILE_OBJECT)AFD_HANDLES(PollReq)[i].Handle; FileObject = (PFILE_OBJECT)AFD_HANDLES(PollReq)[i].Handle;
FCB = FileObject->FsContext; FCB = FileObject->FsContext;
if( (FCB->PollState & AFD_EVENT_CLOSE) || PollReq->Handles[i].Status = PollReq->Handles[i].Events & FCB->PollState;
(PollReq->Handles[i].Status & AFD_EVENT_CLOSE) ) { if( PollReq->Handles[i].Status ) {
AFD_HANDLES(PollReq)[i].Handle = 0; AFD_DbgPrint(MID_TRACE,("Signalling %x with %x\n",
PollReq->Handles[i].Events = 0;
PollReq->Handles[i].Status = AFD_EVENT_CLOSE;
Signalled++;
} else {
PollReq->Handles[i].Status =
PollReq->Handles[i].Events & FCB->PollState;
if( PollReq->Handles[i].Status ) {
AFD_DbgPrint(MID_TRACE,("Signalling %x with %x\n",
FCB, FCB->PollState)); FCB, FCB->PollState));
Signalled++; Signalled++;
}
} }
} }