Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-12-28 10:04:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

Made a nice function CantReadMore which tells if we can't possibly fill

Browse source 
the buffer any longer, and don't have waiting data.
Return an EOF in every case where a read could hit EOF from tcpip,
Return a hard error thereafter.

svn path=/trunk/; revision=13474
This commit is contained in:
Art Yerkes 2005-02-09 08:38:46 +00:00
parent cf6b823a18
commit 877b125678
1 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
reactos/drivers/net/afd/afd/read.c
View file

@ -28,6 +28,13 @@
static VOID ProcessClose( PAFD_FCB FCB ); static VOID ProcessClose( PAFD_FCB FCB );
BOOLEAN CantReadMore( PAFD_FCB FCB ) {
UINT BytesAvailable = FCB->Recv.Content - FCB->Recv.BytesUsed;
return !BytesAvailable &&
(FCB->PollState & (AFD_EVENT_CLOSE | AFD_EVENT_DISCONNECT));
}
NTSTATUS TryToSatisfyRecvRequestFromBuffer( PAFD_FCB FCB, NTSTATUS TryToSatisfyRecvRequestFromBuffer( PAFD_FCB FCB,
PAFD_RECV_INFO RecvReq, PAFD_RECV_INFO RecvReq,
PUINT TotalBytesCopied ) { PUINT TotalBytesCopied ) {
@ -41,7 +48,7 @@ NTSTATUS TryToSatisfyRecvRequestFromBuffer( PAFD_FCB FCB,
AFD_DbgPrint(MID_TRACE,("Called, BytesAvailable = %d\n", AFD_DbgPrint(MID_TRACE,("Called, BytesAvailable = %d\n",
BytesAvailable)); BytesAvailable));
if( FCB->PollState & AFD_EVENT_CLOSE ) return STATUS_SUCCESS; if( CantReadMore(FCB) ) return STATUS_SUCCESS;
if( !BytesAvailable ) return STATUS_PENDING; if( !BytesAvailable ) return STATUS_PENDING;
Map = (PAFD_MAPBUF)(RecvReq->BufferArray + RecvReq->BufferCount); Map = (PAFD_MAPBUF)(RecvReq->BufferArray + RecvReq->BufferCount);
@ -213,6 +220,24 @@ NTSTATUS DDKAPI ReceiveComplete
Status = STATUS_SUCCESS; Status = STATUS_SUCCESS;
} else { } else {
/* Success here means that we got an EOF. Close all pending reads
* with EOF. Data won't have been available before. */
while( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_RECV] ) ) {
NextIrpEntry =
RemoveHeadList(&FCB->PendingIrpList[FUNCTION_RECV]);
NextIrp =
CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry);
NextIrpSp = IoGetCurrentIrpStackLocation( NextIrp );
RecvReq = NextIrpSp->Parameters.DeviceIoControl.Type3InputBuffer;
AFD_DbgPrint(MID_TRACE,("Completing recv %x (%d)\n", NextIrp,
TotalBytesCopied));
UnlockBuffers( RecvReq->BufferArray,
RecvReq->BufferCount, FALSE );
NextIrp->IoStatus.Status = Status;
NextIrp->IoStatus.Information = 0;
IoCompleteRequest( NextIrp, IO_NETWORK_INCREMENT );
}
ProcessClose( FCB ); ProcessClose( FCB );
} }
@ -272,7 +297,7 @@ AfdConnectedSocketReadData(PDEVICE_OBJECT DeviceObject, PIRP Irp,
/* Check if we're not closed down yet */ /* Check if we're not closed down yet */
if( !(FCB->PollState & AFD_EVENT_CLOSE ) ) { if( !CantReadMore(FCB) ) {
AFD_DbgPrint(MID_TRACE,("Not EOF yet\n")); AFD_DbgPrint(MID_TRACE,("Not EOF yet\n"));
if( FCB->ReceiveIrp.InFlightRequest ) { if( FCB->ReceiveIrp.InFlightRequest ) {
AFD_DbgPrint(MID_TRACE,("We're waiting on a previous irp\n")); AFD_DbgPrint(MID_TRACE,("We're waiting on a previous irp\n"));
@ -288,6 +313,9 @@ AfdConnectedSocketReadData(PDEVICE_OBJECT DeviceObject, PIRP Irp,
Status = STATUS_END_OF_FILE; Status = STATUS_END_OF_FILE;
ProcessClose( FCB ); ProcessClose( FCB );
return UnlockAndMaybeComplete
( FCB, STATUS_SUCCESS, Irp, 0, NULL, FALSE);
} }
if( NT_SUCCESS(Status) ) { if( NT_SUCCESS(Status) ) {