[ros-diffs] [cgutman] 35484: - Revert 35477-35481
cgutman at svn.reactos.org
cgutman at svn.reactos.org
Wed Aug 20 20:46:39 CEST 2008
Author: cgutman
Date: Wed Aug 20 13:46:38 2008
New Revision: 35484
URL: http://svn.reactos.org/svn/reactos?rev=35484&view=rev
Log:
- Revert 35477-35481
Modified:
branches/aicom-network-fixes/drivers/network/afd/afd/listen.c
branches/aicom-network-fixes/drivers/network/afd/afd/lock.c
branches/aicom-network-fixes/drivers/network/afd/afd/main.c
branches/aicom-network-fixes/drivers/network/afd/afd/read.c
branches/aicom-network-fixes/drivers/network/afd/afd/tdiconn.c
branches/aicom-network-fixes/drivers/network/afd/afd/write.c
branches/aicom-network-fixes/drivers/network/afd/include/afd.h
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/listen.c
URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/network/afd/afd/listen.c?rev=35484&r1=35483&r2=35484&view=diff
==============================================================================
--- branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] (original)
+++ branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] Wed Aug 20 13:46:38 2008
@@ -87,14 +87,14 @@
PAFD_FCB FCB = (PAFD_FCB)Context;
PAFD_TDI_OBJECT_QELT Qelt;
+ if( !SocketAcquireStateLock( FCB ) ) return Status;
+
+ FCB->ListenIrp.InFlightRequest = NULL;
+
if( Irp->Cancel ) {
- if( FCB ) FCB->ListenIrp.InFlightRequest = NULL;
- return STATUS_CANCELLED;
- }
-
- if( !SocketAcquireStateLock( FCB ) ) return Status;
-
- FCB->ListenIrp.InFlightRequest = NULL;
+ SocketStateUnlock( FCB );
+ return STATUS_SUCCESS;
+ }
if( FCB->State == SOCKET_STATE_CLOSED ) {
SocketStateUnlock( FCB );
Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c
URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/network/afd/afd/lock.c?rev=35484&r1=35483&r2=35484&view=diff
==============================================================================
--- branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] (original)
+++ branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] Wed Aug 20 13:46:38 2008
@@ -68,7 +68,7 @@
BOOLEAN Write, BOOLEAN LockAddress ) {
UINT i;
/* Copy the buffer array so we don't lose it */
- UINT Lock = LockAddress ? 2 : 0;
+ UINT Lock = (LockAddress && AddressLen) ? 2 : 0;
UINT Size = sizeof(AFD_WSABUF) * (Count + Lock);
PAFD_WSABUF NewBuf = ExAllocatePool( PagedPool, Size * 2 );
PMDL NewMdl;
@@ -80,16 +80,13 @@
_SEH_TRY {
RtlCopyMemory( NewBuf, Buf, sizeof(AFD_WSABUF) * Count );
- if( LockAddress && AddressLen ) {
+ if( LockAddress ) {
NewBuf[Count].buf = AddressBuf;
NewBuf[Count].len = *AddressLen;
Count++;
NewBuf[Count].buf = (PVOID)AddressLen;
NewBuf[Count].len = sizeof(*AddressLen);
Count++;
- } else if( LockAddress ) {
- RtlZeroMemory(NewBuf, sizeof(*NewBuf) * 2);
- Count += 2;
}
} _SEH_HANDLE {
AFD_DbgPrint(MIN_TRACE,("Access violation copying buffer info "
Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c
URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/network/afd/afd/main.c?rev=35484&r1=35483&r2=35484&view=diff
==============================================================================
--- 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:46:38 2008
@@ -153,7 +153,52 @@
}
VOID DestroySocket( PAFD_FCB FCB ) {
+ UINT i;
+ BOOLEAN ReturnEarly = FALSE;
+ PAFD_IN_FLIGHT_REQUEST InFlightRequest[IN_FLIGHT_REQUESTS];
+
AFD_DbgPrint(MIN_TRACE,("Called (%x)\n", FCB));
+
+ if( !SocketAcquireStateLock( FCB ) ) return;
+
+ FCB->State = SOCKET_STATE_CLOSED;
+
+ InFlightRequest[0] = &FCB->ListenIrp;
+ InFlightRequest[1] = &FCB->ReceiveIrp;
+ InFlightRequest[2] = &FCB->SendIrp;
+ InFlightRequest[3] = &FCB->ConnectIrp;
+
+ /* Return early here because we might be called in the mean time. */
+ if( FCB->Critical ||
+ FCB->ListenIrp.InFlightRequest ||
+ FCB->ReceiveIrp.InFlightRequest ||
+ FCB->SendIrp.InFlightRequest ||
+ FCB->ConnectIrp.InFlightRequest ) {
+ AFD_DbgPrint(MIN_TRACE,("Leaving socket alive (%x %x %x %x)\n",
+ FCB->ListenIrp.InFlightRequest,
+ FCB->ReceiveIrp.InFlightRequest,
+ FCB->SendIrp.InFlightRequest,
+ FCB->ConnectIrp.InFlightRequest));
+ ReturnEarly = TRUE;
+ }
+
+ /* After PoolReeval, this FCB should not be involved in any outstanding
+ * poll requests */
+
+ /* Cancel our pending requests */
+ for( i = 0; i < IN_FLIGHT_REQUESTS; i++ ) {
+ 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 );
+ }
+ }
+
+ SocketStateUnlock( FCB );
+
+ if( ReturnEarly ) return;
if( FCB->Recv.Window )
ExFreePool( FCB->Recv.Window );
@@ -182,12 +227,8 @@
AfdCloseSocket(PDEVICE_OBJECT DeviceObject, PIRP Irp,
PIO_STACK_LOCATION IrpSp)
{
- UINT i;
- AFD_IN_FLIGHT_REQUEST InFlightRequest[IN_FLIGHT_REQUESTS];
PFILE_OBJECT FileObject = IrpSp->FileObject;
PAFD_FCB FCB = FileObject->FsContext;
-
- if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp);
AFD_DbgPrint(MID_TRACE,
("AfdClose(DeviceObject %p Irp %p)\n", DeviceObject, Irp));
@@ -201,57 +242,15 @@
if( FCB->EventSelect ) ObDereferenceObject( FCB->EventSelect );
FileObject->FsContext = NULL;
-
- FCB->State = SOCKET_STATE_CLOSED;
- SocketStateUnlock(FCB);
-
- InFlightRequest[0] = FCB->ListenIrp;
- InFlightRequest[1] = FCB->ReceiveIrp;
- InFlightRequest[2] = FCB->SendIrp;
- InFlightRequest[3] = FCB->ConnectIrp;
-
- /* Return early here because we might be called in the mean time. */
- if( !(FCB->Critical ||
- FCB->ListenIrp.InFlightRequest ||
- FCB->ReceiveIrp.InFlightRequest ||
- FCB->SendIrp.InFlightRequest ||
- FCB->ConnectIrp.InFlightRequest) ) {
- AFD_DbgPrint(MIN_TRACE,("Leaving socket alive (%x %x %x)\n",
- FCB->ListenIrp.InFlightRequest,
- FCB->ReceiveIrp.InFlightRequest,
- FCB->SendIrp.InFlightRequest));
- Irp->IoStatus.Status = STATUS_SUCCESS;
- Irp->IoStatus.Information = 0;
- IoCompleteRequest(Irp, IO_NO_INCREMENT);
- }
- else
- {
- /* After PoolReeval, this FCB should not be involved in any outstanding
- * poll requests */
-
- /* Cancel our pending requests */
- for( i = 0; i < IN_FLIGHT_REQUESTS; i++ ) {
- NTSTATUS Status = STATUS_NO_SUCH_FILE;
- 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;
- InFlightRequest[i].InFlightRequest->IoStatus.Information = 0;
- IoCancelIrp( InFlightRequest[i].InFlightRequest );
- }
- }
-
- FCB->PendingClose = Irp;
- DestroySocket( FCB );
-
- Irp->IoStatus.Status = STATUS_SUCCESS;
- Irp->IoStatus.Information = 0;
- IoCompleteRequest(Irp, IO_NO_INCREMENT);
- }
+ DestroySocket( FCB );
+
+ Irp->IoStatus.Status = STATUS_SUCCESS;
+ Irp->IoStatus.Information = 0;
+ IoCompleteRequest(Irp, IO_NO_INCREMENT);
AFD_DbgPrint(MID_TRACE, ("Returning success.\n"));
- return Irp->IoStatus.Status;
+ return STATUS_SUCCESS;
}
static NTSTATUS STDCALL
Modified: branches/aicom-network-fixes/drivers/network/afd/afd/read.c
URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/network/afd/afd/read.c?rev=35484&r1=35483&r2=35484&view=diff
==============================================================================
--- branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] (original)
+++ branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] Wed Aug 20 13:46:38 2008
@@ -233,11 +233,6 @@
ASSERT_IRQL(APC_LEVEL);
- if( Irp->Cancel ) {
- if( FCB ) FCB->ReceiveIrp.InFlightRequest = NULL;
- return STATUS_CANCELLED;
- }
-
if( !SocketAcquireStateLock( FCB ) ) return Status;
FCB->ReceiveIrp.InFlightRequest = NULL;
@@ -247,6 +242,7 @@
if( FCB->State == SOCKET_STATE_CLOSED ) {
AFD_DbgPrint(MIN_TRACE,("!!! CLOSED SOCK GOT A RECEIVE COMPLETE !!!\n"));
SocketStateUnlock( FCB );
+ DestroySocket( FCB );
return STATUS_SUCCESS;
} else if( FCB->State == SOCKET_STATE_LISTENING ) {
AFD_DbgPrint(MIN_TRACE,("!!! LISTENER GOT A RECEIVE COMPLETE !!!\n"));
@@ -453,17 +449,13 @@
AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB));
- if( Irp->Cancel ) {
- if( FCB ) FCB->ReceiveIrp.InFlightRequest = NULL;
- return STATUS_CANCELLED;
- }
-
if( !SocketAcquireStateLock( FCB ) ) return STATUS_FILE_CLOSED;
FCB->ReceiveIrp.InFlightRequest = NULL;
if( FCB->State == SOCKET_STATE_CLOSED ) {
SocketStateUnlock( FCB );
+ DestroySocket( FCB );
return STATUS_SUCCESS;
}
Modified: branches/aicom-network-fixes/drivers/network/afd/afd/tdiconn.c
URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/network/afd/afd/tdiconn.c?rev=35484&r1=35483&r2=35484&view=diff
==============================================================================
--- branches/aicom-network-fixes/drivers/network/afd/afd/tdiconn.c [iso-8859-1] (original)
+++ branches/aicom-network-fixes/drivers/network/afd/afd/tdiconn.c [iso-8859-1] Wed Aug 20 13:46:38 2008
@@ -172,6 +172,54 @@
return Status;
}
+NTSTATUS
+TdiBuildConnectionInfoPair
+( PTDI_CONNECTION_INFO_PAIR ConnectionInfo,
+ PTRANSPORT_ADDRESS From, PTRANSPORT_ADDRESS To )
+ /*
+ * FUNCTION: Fill a TDI_CONNECTION_INFO_PAIR struct will the two addresses
+ * given.
+ * ARGUMENTS:
+ * ConnectionInfo: The pair
+ * From: The from address
+ * To: The to address
+ * RETURNS:
+ * Status of the operation
+ */
+{
+ PCHAR LayoutFrame;
+ UINT SizeOfEntry;
+ ULONG TdiAddressSize;
+ PTDI_CONNECTION_INFORMATION FromTdiConn, ToTdiConn;
+
+ /* FIXME: Get from socket information */
+ TdiAddressSize = TdiAddressSizeFromType(From->Address[0].AddressType);
+ SizeOfEntry = TdiAddressSize + sizeof(TDI_CONNECTION_INFORMATION);
+
+ LayoutFrame = (PCHAR)ExAllocatePool(NonPagedPool, 2 * SizeOfEntry);
+
+ if (!LayoutFrame) {
+ AFD_DbgPrint(MIN_TRACE, ("Insufficient resources.\n"));
+ return STATUS_INSUFFICIENT_RESOURCES;
+ }
+
+ RtlZeroMemory( LayoutFrame, 2 * SizeOfEntry );
+
+ FromTdiConn = (PTDI_CONNECTION_INFORMATION)LayoutFrame;
+ ToTdiConn = (PTDI_CONNECTION_INFORMATION)LayoutFrame + SizeOfEntry;
+
+ if (From != NULL) {
+ TdiBuildConnectionInfoInPlace( FromTdiConn, From );
+ } else {
+ TdiBuildNullConnectionInfoInPlace( FromTdiConn,
+ From->Address[0].AddressType );
+ }
+
+ TdiBuildConnectionInfoInPlace( ToTdiConn, To );
+
+ return STATUS_SUCCESS;
+}
+
PTA_ADDRESS TdiGetRemoteAddress( PTDI_CONNECTION_INFORMATION TdiConn )
/*
* Convenience function that rounds out the abstraction of
Modified: branches/aicom-network-fixes/drivers/network/afd/afd/write.c
URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/network/afd/afd/write.c?rev=35484&r1=35483&r2=35484&view=diff
==============================================================================
--- branches/aicom-network-fixes/drivers/network/afd/afd/write.c [iso-8859-1] (original)
+++ branches/aicom-network-fixes/drivers/network/afd/afd/write.c [iso-8859-1] Wed Aug 20 13:46:38 2008
@@ -40,11 +40,6 @@
ASSERT_IRQL(APC_LEVEL);
- if( Irp->Cancel ) {
- if( FCB ) FCB->SendIrp.InFlightRequest = NULL;
- return STATUS_CANCELLED;
- }
-
if( !SocketAcquireStateLock( FCB ) ) return Status;
FCB->SendIrp.InFlightRequest = NULL;
@@ -52,6 +47,7 @@
if( FCB->State == SOCKET_STATE_CLOSED ) {
SocketStateUnlock( FCB );
+ DestroySocket( FCB );
return STATUS_SUCCESS;
}
@@ -174,11 +170,6 @@
Irp->IoStatus.Status,
Irp->IoStatus.Information));
- if( Irp->Cancel ) {
- if( FCB ) FCB->SendIrp.InFlightRequest = NULL;
- return STATUS_CANCELLED;
- }
-
/* It's ok if the FCB already died */
if( !SocketAcquireStateLock( FCB ) ) return STATUS_SUCCESS;
@@ -187,6 +178,12 @@
FCB->SendIrp.InFlightRequest = NULL;
/* Request is not in flight any longer */
+
+ if( FCB->State == SOCKET_STATE_CLOSED ) {
+ SocketStateUnlock( FCB );
+ DestroySocket( FCB );
+ return STATUS_SUCCESS;
+ }
SocketStateUnlock( FCB );
Modified: branches/aicom-network-fixes/drivers/network/afd/include/afd.h
URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/network/afd/include/afd.h?rev=35484&r1=35483&r2=35484&view=diff
==============================================================================
--- branches/aicom-network-fixes/drivers/network/afd/include/afd.h [iso-8859-1] (original)
+++ branches/aicom-network-fixes/drivers/network/afd/include/afd.h [iso-8859-1] Wed Aug 20 13:46:38 2008
@@ -196,7 +196,6 @@
PVOID Context;
DWORD PollState;
UINT ContextSize;
- PIRP PendingClose;
LIST_ENTRY PendingIrpList[MAX_FUNCTIONS];
LIST_ENTRY DatagramList;
LIST_ENTRY PendingConnections;
Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c
URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/network/tcpip/tcpip/dispatch.c?rev=35484&r1=35483&r2=35484&view=diff
==============================================================================
--- 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:46:38 2008
@@ -52,6 +52,34 @@
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,
@@ -127,14 +155,8 @@
TI_DbgPrint(DEBUG_IRP, ("PostCancel: DoDisconnect done\n"));
DispDataRequestComplete(DisType->Irp, STATUS_CANCELLED, 0);
-}
-
-VOID DispDoPacketCancel( PVOID Data ) {
- TI_DbgPrint(DEBUG_IRP, ("Called.\n"));
- PIRP *IrpP = (PIRP *)Data, Irp = *IrpP;
- Irp->IoStatus.Status = STATUS_CANCELLED;
- Irp->IoStatus.Information = 0;
- IoCompleteRequest(Irp, IO_NO_INCREMENT);
+
+ DispCancelComplete(DisType->FileObject);
}
VOID NTAPI DispCancelRequest(
@@ -153,7 +175,6 @@
UCHAR MinorFunction;
DISCONNECT_TYPE DisType;
PVOID WorkItem;
- PADDRESS_FILE AddrFile;
/*NTSTATUS Status = STATUS_SUCCESS;*/
TI_DbgPrint(DEBUG_IRP, ("Called.\n"));
@@ -188,23 +209,24 @@
if( !ChewCreate( &WorkItem, sizeof(DISCONNECT_TYPE),
DispDoDisconnect, &DisType ) )
ASSERT(0);
- return;
+ break;
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;
}
- /* Nothing to do. We don't keep them around. */
+
+ /*DGCancelSendRequest(TranContext->Handle.AddressHandle, Irp);*/
break;
case TDI_RECEIVE_DATAGRAM:
- AddrFile = (PADDRESS_FILE)TranContext->Handle.AddressHandle;
if (FileObject->FsContext2 != (PVOID)TDI_TRANSPORT_ADDRESS_FILE) {
TI_DbgPrint(MIN_TRACE, ("TDI_RECEIVE_DATAGRAM, but no address file.\n"));
break;
}
- DGRemoveIRP(AddrFile, Irp);
+
+ /*DGCancelReceiveRequest(TranContext->Handle.AddressHandle, Irp);*/
break;
default:
@@ -213,8 +235,7 @@
}
IoReleaseCancelSpinLock(Irp->CancelIrql);
- IoCompleteRequest(Irp, IO_NO_INCREMENT);
-
+
TI_DbgPrint(MAX_TRACE, ("Leaving.\n"));
}
@@ -258,6 +279,9 @@
IoReleaseCancelSpinLock(Irp->CancelIrql);
DispDataRequestComplete(Irp, STATUS_CANCELLED, 0);
+
+ DispCancelComplete(FileObject);
+
TI_DbgPrint(MAX_TRACE, ("Leaving.\n"));
}
@@ -793,6 +817,7 @@
return Status;
}
+
NTSTATUS DispTdiReceiveDatagram(
PIRP Irp)
/*
@@ -809,7 +834,6 @@
TDI_REQUEST Request;
NTSTATUS Status;
ULONG BytesReceived;
- PADDRESS_FILE AddrFile;
TI_DbgPrint(DEBUG_IRP, ("Called.\n"));
@@ -823,8 +847,6 @@
return STATUS_INVALID_ADDRESS;
}
- AddrFile = (PADDRESS_FILE)TranContext->Handle.AddressHandle;
-
/* Initialize a receive request */
Request.Handle.AddressHandle = TranContext->Handle.AddressHandle;
Request.RequestNotifyObject = DispDataRequestComplete;
@@ -844,21 +866,21 @@
&DataBuffer,
&BufferSize );
- Status = DGReceiveDatagram(
- AddrFile,
- DgramInfo->ReceiveDatagramInformation,
- DataBuffer,
- DgramInfo->ReceiveLength,
- DgramInfo->ReceiveFlags,
- DgramInfo->ReturnDatagramInformation,
- &BytesReceived,
- (PDATAGRAM_COMPLETION_ROUTINE)DispDataRequestComplete,
- Irp,
- Irp);
- if (Status != STATUS_PENDING) {
- DispDataRequestComplete(Irp, Status, BytesReceived);
- } else
- IoMarkIrpPending(Irp);
+ Status = DGReceiveDatagram(
+ Request.Handle.AddressHandle,
+ DgramInfo->ReceiveDatagramInformation,
+ DataBuffer,
+ DgramInfo->ReceiveLength,
+ DgramInfo->ReceiveFlags,
+ DgramInfo->ReturnDatagramInformation,
+ &BytesReceived,
+ (PDATAGRAM_COMPLETION_ROUTINE)DispDataRequestComplete,
+ Irp,
+ Irp);
+ if (Status != STATUS_PENDING) {
+ DispDataRequestComplete(Irp, Status, BytesReceived);
+ } else
+ IoMarkIrpPending(Irp);
}
TI_DbgPrint(DEBUG_IRP, ("Leaving. Status is (0x%X)\n", Status));
Modified: branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c
URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/network/tcpip/tcpip/main.c?rev=35484&r1=35483&r2=35484&view=diff
==============================================================================
--- 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:46:38 2008
@@ -138,6 +138,7 @@
}
CP
Context->CancelIrps = FALSE;
+ KeInitializeEvent(&Context->CleanupEvent, NotificationEvent, FALSE);
CP
IrpSp = IoGetCurrentIrpStackLocation(Irp);
IrpSp->FileObject->FsContext = Context;
@@ -265,11 +266,20 @@
{
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);
}
@@ -303,6 +313,7 @@
IoAcquireCancelSpinLock(&OldIrql);
Context->CancelIrps = TRUE;
+ KeResetEvent(&Context->CleanupEvent);
IoReleaseCancelSpinLock(OldIrql);
@@ -337,6 +348,16 @@
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);
}
Irp->IoStatus.Status = Status;
More information about the Ros-diffs
mailing list