Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-08-04 02:20:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

[AFD]

Browse source 
- Fix shutdown() for datagram sockets
- Share some code between SD_BOTH and SD_RECEIVE

svn path=/trunk/; revision=53144
This commit is contained in:
Cameron Gutman 2011-08-08 21:57:06 +00:00
parent 2c6c184457
commit 44bc45f23c
3 changed files with 54 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -680,38 +680,52 @@ AfdDisconnect(PDEVICE_OBJECT DeviceObject, PIRP Irp,
return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY,
Irp, 0 );
/* Shutdown(SD_SEND) */
/* Send direction only */
if ((DisReq->DisconnectType & AFD_DISCONNECT_SEND) &&
!(DisReq->DisconnectType & AFD_DISCONNECT_RECV))
{
/* Perform a controlled disconnect */
Flags = TDI_DISCONNECT_RELEASE;
}
/* Shutdown(SD_RECEIVE) */
else if ((DisReq->DisconnectType & AFD_DISCONNECT_RECV) &&
!(DisReq->DisconnectType & AFD_DISCONNECT_SEND))
/* Receive direction or both */
else
{
/* Mark that we can't issue another receive request */
FCB->TdiReceiveClosed = TRUE;
/* Discard any pending data */
FCB->Recv.Content = 0;
FCB->Recv.BytesUsed = 0;
/* These are only for connection-oriented sockets */
if (!(FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS))
{
/* Try to cancel a pending TDI receive IRP if there was one in progress */
if (FCB->ReceiveIrp.InFlightRequest)
IoCancelIrp(FCB->ReceiveIrp.InFlightRequest);
/* Mark us as overread to complete future reads with an error */
FCB->Overread = TRUE;
/* Discard any pending data */
FCB->Recv.Content = 0;
FCB->Recv.BytesUsed = 0;
/* Mark us as overread to complete future reads with an error */
FCB->Overread = TRUE;
/* Set a successful close status to indicate a shutdown on overread */
FCB->PollStatus[FD_CLOSE_BIT] = STATUS_SUCCESS;
}
/* Clear the receive event */
FCB->PollState &= ~AFD_EVENT_RECEIVE;
/* We're done (no need to tell the TDI transport driver) */
return UnlockAndMaybeComplete( FCB, STATUS_SUCCESS, Irp, 0 );
}
/* Shutdown(SD_BOTH) */
else
{
/* Perform an abortive disconnect */
Flags = TDI_DISCONNECT_ABORT;
/* Receive direction only */
if ((DisReq->DisconnectType & AFD_DISCONNECT_RECV) &&
!(DisReq->DisconnectType & AFD_DISCONNECT_SEND))
{
/* No need to tell the transport driver for receive direction only */
return UnlockAndMaybeComplete( FCB, STATUS_SUCCESS, Irp, 0 );
}
else
{
/* Perform an abortive disconnect */
Flags = TDI_DISCONNECT_ABORT;
}
}
if (!(FCB->Flags & AFD_ENDPOINT_CONNECTIONLESS))
@ -785,9 +799,10 @@ AfdDisconnect(PDEVICE_OBJECT DeviceObject, PIRP Irp,
ExFreePool(FCB->RemoteAddress);
FCB->RemoteAddress = NULL;
FCB->PollState &= ~AFD_EVENT_SEND;
}
FCB->PollState &= ~AFD_EVENT_SEND;
FCB->SendClosed = TRUE;
}
return UnlockAndMaybeComplete( FCB, Status, Irp, 0 );

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

@ -27,8 +27,13 @@ static VOID HandleReceiveComplete( PAFD_FCB FCB, NTSTATUS Status, ULONG_PTR Info
{
FCB->Recv.BytesUsed = 0;
/* We got closed while the receive was in progress */
if (FCB->TdiReceiveClosed)
{
FCB->Recv.Content = 0;
}
/* Receive successful with new data */
if (Status == STATUS_SUCCESS && Information)
else if (Status == STATUS_SUCCESS && Information)
{
FCB->Recv.Content = Information;
}
@ -693,6 +698,13 @@ AfdPacketSocketReadData(PDEVICE_OBJECT DeviceObject, PIRP Irp,
return UnlockAndMaybeComplete
( FCB, STATUS_INVALID_PARAMETER, Irp, 0 );
}
if (FCB->TdiReceiveClosed)
{
AFD_DbgPrint(MIN_TRACE,("Receive closed\n"));
return UnlockAndMaybeComplete(FCB, STATUS_FILE_CLOSED, Irp, 0);
}
if( !(RecvReq = LockRequest( Irp, IrpSp )) )
return UnlockAndMaybeComplete
( FCB, STATUS_NO_MEMORY, Irp, 0 );

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

@ -516,6 +516,13 @@ AfdPacketSocketWriteData(PDEVICE_OBJECT DeviceObject, PIRP Irp,
return UnlockAndMaybeComplete
( FCB, STATUS_INVALID_PARAMETER, Irp, 0 );
}
if (FCB->SendClosed)
{
AFD_DbgPrint(MIN_TRACE,("No more sends\n"));
return UnlockAndMaybeComplete(FCB, STATUS_FILE_CLOSED, Irp, 0);
}
if( !(SendReq = LockRequest( Irp, IrpSp )) )
return UnlockAndMaybeComplete
( FCB, STATUS_NO_MEMORY, Irp, 0 );