Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-02-24 09:25:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

[AFD]

Browse source 
- Fix signaling socket termination events on disconnect
- Fixes bug 4951

svn path=/trunk/; revision=47156
This commit is contained in:
Cameron Gutman 2010-05-10 21:14:26 +00:00
parent 7335bf8947
commit 609171f4ac
1 changed files with 49 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
reactos/drivers/network/afd/afd/read.c
View file

@ -26,10 +26,38 @@
#include "tdiconn.h" #include "tdiconn.h"
#include "debug.h" #include "debug.h"
static BOOLEAN CantReadMore( PAFD_FCB FCB ) { static NTSTATUS RefillSocketBuffer( PAFD_FCB FCB ) {
UINT BytesAvailable = FCB->Recv.Content - FCB->Recv.BytesUsed; NTSTATUS Status = STATUS_PENDING;
return !BytesAvailable; if( !FCB->ReceiveIrp.InFlightRequest ) {
AFD_DbgPrint(MID_TRACE,("Replenishing buffer\n"));
Status = TdiReceive( &FCB->ReceiveIrp.InFlightRequest,
FCB->Connection.Object,
TDI_RECEIVE_NORMAL,
FCB->Recv.Window,
FCB->Recv.Size,
&FCB->ReceiveIrp.Iosb,
ReceiveComplete,
FCB );
if( ( Status == STATUS_SUCCESS && !FCB->ReceiveIrp.Iosb.Information ) ||
( !NT_SUCCESS( Status ) ) )
{
/* The socket has been closed */
FCB->PollState |= AFD_EVENT_DISCONNECT;
FCB->Overread = TRUE;
Status = STATUS_FILE_CLOSED;
}
else if( Status == STATUS_SUCCESS )
{
FCB->Recv.Content = FCB->ReceiveIrp.Iosb.Information;
FCB->PollState |= AFD_EVENT_RECEIVE;
}
PollReeval( FCB->DeviceExt, FCB->FileObject );
}
return Status;
} }
static NTSTATUS TryToSatisfyRecvRequestFromBuffer( PAFD_FCB FCB, static NTSTATUS TryToSatisfyRecvRequestFromBuffer( PAFD_FCB FCB,
@ -46,7 +74,22 @@ static NTSTATUS TryToSatisfyRecvRequestFromBuffer( PAFD_FCB FCB,
AFD_DbgPrint(MID_TRACE,("Called, BytesAvailable = %d\n", AFD_DbgPrint(MID_TRACE,("Called, BytesAvailable = %d\n",
BytesAvailable)); BytesAvailable));
if( CantReadMore(FCB) ) return STATUS_PENDING; if( FCB->Overread ) return STATUS_FILE_CLOSED;
if( !BytesAvailable ) {
FCB->Recv.Content = FCB->Recv.BytesUsed = 0;
Status = RefillSocketBuffer( FCB );
if ( Status != STATUS_SUCCESS )
return Status;
/* If RefillSocketBuffer returns STATUS_SUCCESS, we're good to go
* If RefillSocketBuffer returns STATUS_PENDING, then it's waiting on the transport for data
* If RefillSocketBuffer returns STATUS_FILE_CLOSED, then the connection was terminated
*/
/* Recalculate BytesAvailable based on new data */
BytesAvailable = FCB->Recv.Content - FCB->Recv.BytesUsed;
ASSERT(BytesAvailable);
}
Map = (PAFD_MAPBUF)(RecvReq->BufferArray + RecvReq->BufferCount); Map = (PAFD_MAPBUF)(RecvReq->BufferArray + RecvReq->BufferCount);
@ -88,23 +131,8 @@ static NTSTATUS TryToSatisfyRecvRequestFromBuffer( PAFD_FCB FCB,
if( FCB->Recv.BytesUsed == FCB->Recv.Content ) { if( FCB->Recv.BytesUsed == FCB->Recv.Content ) {
FCB->Recv.BytesUsed = FCB->Recv.Content = 0; FCB->Recv.BytesUsed = FCB->Recv.Content = 0;
FCB->PollState &= ~AFD_EVENT_RECEIVE; FCB->PollState &= ~AFD_EVENT_RECEIVE;
PollReeval( FCB->DeviceExt, FCB->FileObject );
if( !FCB->ReceiveIrp.InFlightRequest ) { RefillSocketBuffer( FCB );
AFD_DbgPrint(MID_TRACE,("Replenishing buffer\n"));
Status = TdiReceive( &FCB->ReceiveIrp.InFlightRequest,
FCB->Connection.Object,
TDI_RECEIVE_NORMAL,
FCB->Recv.Window,
FCB->Recv.Size,
&FCB->ReceiveIrp.Iosb,
ReceiveComplete,
FCB );
if( Status == STATUS_SUCCESS )
FCB->Recv.Content = FCB->ReceiveIrp.Iosb.Information;
}
} }
return STATUS_SUCCESS; return STATUS_SUCCESS;
@ -159,7 +187,7 @@ static NTSTATUS ReceiveActivity( PAFD_FCB FCB, PIRP Irp ) {
} }
} }
if( !CantReadMore(FCB) ) { if( !FCB->Recv.Content ) {
FCB->PollState |= AFD_EVENT_RECEIVE; FCB->PollState |= AFD_EVENT_RECEIVE;
} else } else
FCB->PollState &= ~AFD_EVENT_RECEIVE; FCB->PollState &= ~AFD_EVENT_RECEIVE;