Author: cgutman
Date: Wed Aug 20 13:50:26 2008
New Revision: 35485
URL:
http://svn.reactos.org/svn/reactos?rev=35485&view=rev
Log:
- Fix IRP cancellation issues
- Ping doesn't hang anymore
Modified:
branches/aicom-network-fixes/drivers/network/afd/afd/main.c
branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c
branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c
Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net…
==============================================================================
--- branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] (original)
+++ branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] Wed Aug 20
13:50:26 2008
@@ -190,9 +190,7 @@
if( InFlightRequest[i]->InFlightRequest ) {
AFD_DbgPrint(MID_TRACE,("Cancelling in flight irp %d (%x)\n",
i, InFlightRequest[i]->InFlightRequest));
- InFlightRequest[i]->InFlightRequest->IoStatus.Status = STATUS_CANCELLED;
- InFlightRequest[i]->InFlightRequest->IoStatus.Information = 0;
- IoCancelIrp( InFlightRequest[i]->InFlightRequest );
+ InFlightRequest[i]->InFlightRequest = NULL;
}
}
Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net…
==============================================================================
--- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1]
(original)
+++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Wed
Aug 20 13:50:26 2008
@@ -52,34 +52,6 @@
return IRPFinish(Irp, STATUS_CANCELLED);
}
-
-
-VOID DispCancelComplete(
- PVOID Context)
-/*
- * FUNCTION: Completes a cancel request
- * ARGUMENTS:
- * Context = Pointer to context information (FILE_OBJECT)
- */
-{
- /*KIRQL OldIrql;*/
- PFILE_OBJECT FileObject;
- PTRANSPORT_CONTEXT TranContext;
-
- TI_DbgPrint(DEBUG_IRP, ("Called.\n"));
-
- FileObject = (PFILE_OBJECT)Context;
- TranContext = (PTRANSPORT_CONTEXT)FileObject->FsContext;
-
- /* Set the cleanup event */
- KeSetEvent(&TranContext->CleanupEvent, 0, FALSE);
-
- /* We are expected to release the cancel spin lock */
- /*IoReleaseCancelSpinLock(OldIrql);*/
-
- TI_DbgPrint(DEBUG_IRP, ("Leaving.\n"));
-}
-
VOID DispDataRequestComplete(
PVOID Context,
@@ -155,8 +127,6 @@
TI_DbgPrint(DEBUG_IRP, ("PostCancel: DoDisconnect done\n"));
DispDataRequestComplete(DisType->Irp, STATUS_CANCELLED, 0);
-
- DispCancelComplete(DisType->FileObject);
}
VOID NTAPI DispCancelRequest(
@@ -209,24 +179,20 @@
if( !ChewCreate( &WorkItem, sizeof(DISCONNECT_TYPE),
DispDoDisconnect, &DisType ) )
ASSERT(0);
- break;
+ return;
case TDI_SEND_DATAGRAM:
if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) {
TI_DbgPrint(MIN_TRACE, ("TDI_SEND_DATAGRAM, but no address
file.\n"));
- break;
}
-
- /*DGCancelSendRequest(TranContext->Handle.AddressHandle, Irp);*/
break;
case TDI_RECEIVE_DATAGRAM:
if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) {
TI_DbgPrint(MIN_TRACE, ("TDI_RECEIVE_DATAGRAM, but no address
file.\n"));
- break;
}
- /*DGCancelReceiveRequest(TranContext->Handle.AddressHandle, Irp);*/
+ DGRemoveIRP(TranContext->Handle.AddressHandle, Irp);
break;
default:
@@ -235,6 +201,7 @@
}
IoReleaseCancelSpinLock(Irp->CancelIrql);
+ IoCompleteRequest(Irp, IO_NO_INCREMENT);
TI_DbgPrint(MAX_TRACE, ("Leaving.\n"));
}
@@ -279,8 +246,6 @@
IoReleaseCancelSpinLock(Irp->CancelIrql);
DispDataRequestComplete(Irp, STATUS_CANCELLED, 0);
-
- DispCancelComplete(FileObject);
TI_DbgPrint(MAX_TRACE, ("Leaving.\n"));
}
Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c
URL:
http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net…
==============================================================================
--- branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c [iso-8859-1]
(original)
+++ branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c [iso-8859-1] Wed Aug
20 13:50:26 2008
@@ -138,7 +138,6 @@
}
CP
Context->CancelIrps = FALSE;
- KeInitializeEvent(&Context->CleanupEvent, NotificationEvent, FALSE);
CP
IrpSp = IoGetCurrentIrpStackLocation(Irp);
IrpSp->FileObject->FsContext = Context;
@@ -253,36 +252,6 @@
return Status;
}
-
-VOID TiCleanupFileObjectComplete(
- PVOID Context,
- NTSTATUS Status)
-/*
- * FUNCTION: Completes an object cleanup IRP I/O request
- * ARGUMENTS:
- * Context = Pointer to the IRP for this request
- * Status = Final status of the operation
- */
-{
- PIRP Irp;
- PIO_STACK_LOCATION IrpSp;
- PTRANSPORT_CONTEXT TranContext;
- KIRQL OldIrql;
-
- Irp = (PIRP)Context;
- IrpSp = IoGetCurrentIrpStackLocation(Irp);
- TranContext = (PTRANSPORT_CONTEXT)IrpSp->FileObject->FsContext;
-
- Irp->IoStatus.Status = Status;
-
- IoAcquireCancelSpinLock(&OldIrql);
-
- KeSetEvent(&TranContext->CleanupEvent, 0, FALSE);
-
- IoReleaseCancelSpinLock(OldIrql);
-}
-
-
/*
* FUNCTION: Releases resources used by a file object
* ARGUMENTS:
@@ -313,12 +282,8 @@
IoAcquireCancelSpinLock(&OldIrql);
Context->CancelIrps = TRUE;
- KeResetEvent(&Context->CleanupEvent);
IoReleaseCancelSpinLock(OldIrql);
-
- Request.RequestNotifyObject = TiCleanupFileObjectComplete;
- Request.RequestContext = Irp;
switch ((ULONG_PTR)IrpSp->FileObject->FsContext2) {
case TDI_TRANSPORT_ADDRESS_FILE:
@@ -345,19 +310,8 @@
Context->CancelIrps = FALSE;
IoReleaseCancelSpinLock(OldIrql);
- Irp->IoStatus.Status = STATUS_INVALID_PARAMETER;
-
- return Irp->IoStatus.Status;
- }
-
- if (Status != STATUS_PENDING)
- {
- IoAcquireCancelSpinLock(&OldIrql);
- KeSetEvent(&Context->CleanupEvent, 0, FALSE);
- IoReleaseCancelSpinLock(OldIrql);
-
- KeWaitForSingleObject(&Context->CleanupEvent,
- UserRequest, KernelMode, FALSE, NULL);
+ Status = STATUS_INVALID_PARAMETER;
+
}
Irp->IoStatus.Status = Status;