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

[AFD]

Browse source 
- Fix several bugs related to the FD_WRITE event
- We would not set the sendable poll state if the socket had data waiting to be sent even if there was buffer space
- We did not set the poll state after performing a send
- We did not clear the sendable poll state if we ran out of buffer space

svn path=/trunk/; revision=52492
This commit is contained in:
Cameron Gutman 2011-06-30 06:04:09 +00:00
parent ab849501e7
commit 97b25874fc
1 changed files with 25 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

32
reactos/drivers/network/afd/afd/write.c
View file

@ -157,10 +157,20 @@ static NTSTATUS NTAPI SendComplete
break; break;
} }
/* Some data is still waiting */ if (FCB->Send.Size - FCB->Send.BytesUsed != 0)
if( FCB->Send.BytesUsed ) { {
FCB->PollState &= ~AFD_EVENT_SEND; FCB->PollState |= AFD_EVENT_SEND;
FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS;
PollReeval( FCB->DeviceExt, FCB->FileObject );
}
else
{
FCB->PollState &= ~AFD_EVENT_SEND;
}
/* Some data is still waiting */
if( FCB->Send.BytesUsed )
{
Status = TdiSend( &FCB->SendIrp.InFlightRequest, Status = TdiSend( &FCB->SendIrp.InFlightRequest,
FCB->Connection.Object, FCB->Connection.Object,
0, 0,
@ -171,10 +181,6 @@ static NTSTATUS NTAPI SendComplete
FCB ); FCB );
RetryDisconnectCompletion(FCB); RetryDisconnectCompletion(FCB);
} else {
FCB->PollState |= AFD_EVENT_SEND;
FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS;
PollReeval( FCB->DeviceExt, FCB->FileObject );
} }
SocketStateUnlock( FCB ); SocketStateUnlock( FCB );
@ -388,6 +394,7 @@ AfdConnectedSocketWriteData(PDEVICE_OBJECT DeviceObject, PIRP Irp,
} }
else else
{ {
FCB->PollState &= ~AFD_EVENT_SEND;
if( SendReq->AfdFlags & AFD_IMMEDIATE ) { if( SendReq->AfdFlags & AFD_IMMEDIATE ) {
AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); AFD_DbgPrint(MID_TRACE,("Nonblocking\n"));
UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE );
@ -417,6 +424,17 @@ AfdConnectedSocketWriteData(PDEVICE_OBJECT DeviceObject, PIRP Irp,
Status, TotalBytesCopied)); Status, TotalBytesCopied));
} }
if (SpaceAvail)
{
FCB->PollState |= AFD_EVENT_SEND;
FCB->PollStatus[FD_WRITE_BIT] = STATUS_SUCCESS;
PollReeval( FCB->DeviceExt, FCB->FileObject );
}
else
{
FCB->PollState &= ~AFD_EVENT_SEND;
}
RetryDisconnectCompletion(FCB); RetryDisconnectCompletion(FCB);
return UnlockAndMaybeComplete return UnlockAndMaybeComplete