Ros-diffs August 2012

ros-diffs@reactos.org

14 participants
198 discussions

[cgutman] 57178: [AFD] - Fix broken overlapped I/O on sockets
by cgutman＠svn.reactos.org 27 Aug '12

27 Aug '12

Author: cgutman Date: Mon Aug 27 06:50:01 2012 New Revision: 57178 URL: http://svn.reactos.org/svn/reactos?rev=57178&view=rev Log: [AFD] - Fix broken overlapped I/O on sockets Modified: trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/write.c Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Mon Aug 27 06:50:01 2012 @@ -491,7 +491,8 @@ return UnlockAndMaybeComplete(FCB, Status, Irp, Irp->IoStatus.Information); } - else if( (RecvReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking) ) + else if (!(RecvReq->AfdFlags & AFD_OVERLAPPED) && + ((RecvReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking))) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); Status = STATUS_CANT_WAIT; @@ -517,7 +518,8 @@ Status = ReceiveActivity( FCB, Irp ); if( Status == STATUS_PENDING && - ((RecvReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking)) ) { + !(RecvReq->AfdFlags & AFD_OVERLAPPED) && + ((RecvReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking))) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); Status = STATUS_CANT_WAIT; TotalBytesCopied = 0; @@ -758,7 +760,8 @@ return UnlockAndMaybeComplete(FCB, Status, Irp, Irp->IoStatus.Information); } - else if( (RecvReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking) ) + else if (!(RecvReq->AfdFlags & AFD_OVERLAPPED) && + ((RecvReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking))) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); Status = STATUS_CANT_WAIT; Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Mon Aug 27 06:50:01 2012 @@ -386,7 +386,8 @@ AFD_DbgPrint(MID_TRACE,("Socket state %d\n", FCB->State)); if( FCB->State != SOCKET_STATE_CONNECTED ) { - if( (SendReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking) ) { + if (!(SendReq->AfdFlags & AFD_OVERLAPPED) && + ((SendReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking))) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); return UnlockAndMaybeComplete( FCB, STATUS_CANT_WAIT, Irp, 0 ); @@ -478,7 +479,8 @@ else { FCB->PollState &= ~AFD_EVENT_SEND; - if( (SendReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking) ) { + if (!(SendReq->AfdFlags & AFD_OVERLAPPED) && + ((SendReq->AfdFlags & AFD_IMMEDIATE) || (FCB->NonBlocking))) { AFD_DbgPrint(MID_TRACE,("Nonblocking\n")); UnlockBuffers( SendReq->BufferArray, SendReq->BufferCount, FALSE ); return UnlockAndMaybeComplete( FCB, STATUS_CANT_WAIT, Irp, 0 );

1 0

[cgutman] 57177: [MSAFD] - Add error translation for STATUS_ACCESS_VIOLATION
by cgutman＠svn.reactos.org 27 Aug '12

27 Aug '12

Author: cgutman Date: Mon Aug 27 06:34:21 2012 New Revision: 57177 URL: http://svn.reactos.org/svn/reactos?rev=57177&view=rev Log: [MSAFD] - Add error translation for STATUS_ACCESS_VIOLATION Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/msafd/misc/dllma… ============================================================================== --- trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] (original) +++ trunk/reactos/dll/win32/msafd/misc/dllmain.c [iso-8859-1] Mon Aug 27 06:34:21 2012 @@ -375,6 +375,10 @@ case STATUS_REMOTE_DISCONNECT: DbgPrint("MSAFD: STATUS_REMOTE_DISCONNECT\n"); return WSAECONNRESET; + + case STATUS_ACCESS_VIOLATION: + DbgPrint("MSAFD: STATUS_ACCESS_VIOLATION\n"); + return WSAEFAULT; default: DbgPrint("MSAFD: Unhandled NTSTATUS value: 0x%x\n", Status);

1 0

[cgutman] 57176: [AFD] - Fix a bug causing the event passed to WSAEnumNetworkEvents to remain set after the call
by cgutman＠svn.reactos.org 27 Aug '12

27 Aug '12

Author: cgutman Date: Mon Aug 27 06:19:19 2012 New Revision: 57176 URL: http://svn.reactos.org/svn/reactos?rev=57176&view=rev Log: [AFD] - Fix a bug causing the event passed to WSAEnumNetworkEvents to remain set after the call Modified: trunk/reactos/drivers/network/afd/afd/select.c Modified: trunk/reactos/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Mon Aug 27 06:19:19 2012 @@ -324,6 +324,8 @@ PAFD_ENUM_NETWORK_EVENTS_INFO EnumReq = (PAFD_ENUM_NETWORK_EVENTS_INFO)LockRequest( Irp, IrpSp, TRUE ); PAFD_FCB FCB = FileObject->FsContext; + PKEVENT UserEvent; + NTSTATUS Status; AFD_DbgPrint(MID_TRACE,("Called (FCB %x)\n", FCB)); @@ -335,6 +337,23 @@ return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); } + Status = ObReferenceObjectByHandle(EnumReq->Event, + EVENT_ALL_ACCESS, + ExEventObjectType, + UserMode, + (PVOID *)&UserEvent, + NULL); + if (!NT_SUCCESS(Status)) + { + AFD_DbgPrint(MIN_TRACE,("Unable to reference event %x\n", Status)); + return UnlockAndMaybeComplete(FCB, Status, Irp, 0); + } + + /* Clear the event */ + KeClearEvent(UserEvent); + ObDereferenceObject(UserEvent); + + /* Copy the poll state */ EnumReq->PollEvents = FCB->PollState; RtlCopyMemory( EnumReq->EventStatus, FCB->PollStatus,

1 0

[cgutman] 57175: [AFD] - Fix one of the worst bugs in AFD of all time. Our AFD code operated under the assumption that none of the input parameters would change once we called LockRequest. This ass...
by cgutman＠svn.reactos.org 27 Aug '12

27 Aug '12

Author: cgutman Date: Mon Aug 27 04:16:28 2012 New Revision: 57175 URL: http://svn.reactos.org/svn/reactos?rev=57175&view=rev Log: [AFD] - Fix one of the worst bugs in AFD of all time. Our AFD code operated under the assumption that none of the input parameters would change once we called LockRequest. This assumption is completely false. The only guarantee that made was that the pages never disappeared from us, not they they couldn't be modified. There are frequent cases where the user-mode buffer was modified from underneath us (WSPRecv allocates the struct on stack which makes it invalid during overlapped operations that complete later). When this happened, we would bugcheck when we tried to unlock the buffers since we accessed this in a member of the struct the caller passed us. - I've fixed this by adding a parameter to LockRequest which specifies whether the buffer should be copied back when it is unlocked. - This bug has been around for ages and I was never able to figure out why we just freed garbage sometimes. Now that the ws2_32_winetest exposed it reliably, I was finally able to fix it. Modified: trunk/reactos/drivers/network/afd/afd/bind.c trunk/reactos/drivers/network/afd/afd/connect.c trunk/reactos/drivers/network/afd/afd/context.c trunk/reactos/drivers/network/afd/afd/info.c trunk/reactos/drivers/network/afd/afd/listen.c trunk/reactos/drivers/network/afd/afd/lock.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/select.c trunk/reactos/drivers/network/afd/afd/write.c trunk/reactos/drivers/network/afd/include/afd.h Modified: trunk/reactos/drivers/network/afd/afd/bind.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/bi… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/bind.c [iso-8859-1] Mon Aug 27 04:16:28 2012 @@ -81,7 +81,7 @@ AFD_DbgPrint(MID_TRACE,("Called\n")); if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - if( !(BindReq = LockRequest( Irp, IrpSp )) ) + if( !(BindReq = LockRequest( Irp, IrpSp, FALSE )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); Modified: trunk/reactos/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/connect.c [iso-8859-1] Mon Aug 27 04:16:28 2012 @@ -44,7 +44,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PVOID ConnectOptions = LockRequest(Irp, IrpSp); + PVOID ConnectOptions = LockRequest(Irp, IrpSp, FALSE); UINT ConnectOptionsSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -80,7 +80,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PUINT ConnectOptionsSize = LockRequest(Irp, IrpSp); + PUINT ConnectOptionsSize = LockRequest(Irp, IrpSp, FALSE); UINT BufferSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -144,7 +144,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PVOID ConnectData = LockRequest(Irp, IrpSp); + PVOID ConnectData = LockRequest(Irp, IrpSp, FALSE); UINT ConnectDataSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -179,7 +179,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PUINT ConnectDataSize = LockRequest(Irp, IrpSp); + PUINT ConnectDataSize = LockRequest(Irp, IrpSp, FALSE); UINT BufferSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -406,7 +406,7 @@ AFD_DbgPrint(MID_TRACE,("Called on %x\n", FCB)); if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - if( !(ConnectReq = LockRequest( Irp, IrpSp )) ) + if( !(ConnectReq = LockRequest( Irp, IrpSp, FALSE )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); Modified: trunk/reactos/drivers/network/afd/afd/context.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/co… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/context.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/context.c [iso-8859-1] Mon Aug 27 04:16:28 2012 @@ -60,7 +60,7 @@ PIO_STACK_LOCATION IrpSp ) { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PVOID Context = LockRequest(Irp, IrpSp); + PVOID Context = LockRequest(Irp, IrpSp, FALSE); if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); Modified: trunk/reactos/drivers/network/afd/afd/info.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/in… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/info.c [iso-8859-1] Mon Aug 27 04:16:28 2012 @@ -13,7 +13,7 @@ AfdGetInfo( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp ) { NTSTATUS Status = STATUS_SUCCESS; - PAFD_INFO InfoReq = LockRequest(Irp, IrpSp); + PAFD_INFO InfoReq = LockRequest(Irp, IrpSp, TRUE); PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; PLIST_ENTRY CurrentEntry; @@ -99,7 +99,7 @@ AfdSetInfo( PDEVICE_OBJECT DeviceObject, PIRP Irp, PIO_STACK_LOCATION IrpSp ) { NTSTATUS Status = STATUS_SUCCESS; - PAFD_INFO InfoReq = LockRequest(Irp, IrpSp); + PAFD_INFO InfoReq = LockRequest(Irp, IrpSp, FALSE); PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; PCHAR NewBuffer; Modified: trunk/reactos/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/li… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/listen.c [iso-8859-1] Mon Aug 27 04:16:28 2012 @@ -217,7 +217,7 @@ if( !SocketAcquireStateLock( FCB ) ) return LostSocket( Irp ); - if( !(ListenReq = LockRequest( Irp, IrpSp )) ) + if( !(ListenReq = LockRequest( Irp, IrpSp, FALSE )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Mon Aug 27 04:16:28 2012 @@ -12,12 +12,13 @@ PVOID GetLockedData(PIRP Irp, PIO_STACK_LOCATION IrpSp) { ASSERT(Irp->MdlAddress); - - return MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); + ASSERT(Irp->Tail.Overlay.DriverContext[0]); + + return Irp->Tail.Overlay.DriverContext[0]; } /* Lock a method_neither request so it'll be available from DISPATCH_LEVEL */ -PVOID LockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp ) { +PVOID LockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp, BOOLEAN Output ) { BOOLEAN LockFailed = FALSE; ASSERT(!Irp->MdlAddress); @@ -84,12 +85,55 @@ return NULL; } + /* The mapped address goes in index 1 */ + Irp->Tail.Overlay.DriverContext[1] = MmGetSystemAddressForMdlSafe(Irp->MdlAddress, NormalPagePriority); + if (!Irp->Tail.Overlay.DriverContext[1]) + { + AFD_DbgPrint(MIN_TRACE,("Failed to get mapped address\n")); + MmUnlockPages(Irp->MdlAddress); + IoFreeMdl( Irp->MdlAddress ); + Irp->MdlAddress = NULL; + return NULL; + } + + /* The allocated address goes in index 0 */ + Irp->Tail.Overlay.DriverContext[0] = ExAllocatePool(NonPagedPool, MmGetMdlByteCount(Irp->MdlAddress)); + if (!Irp->Tail.Overlay.DriverContext[0]) + { + AFD_DbgPrint(MIN_TRACE,("Failed to allocate memory\n")); + MmUnlockPages(Irp->MdlAddress); + IoFreeMdl( Irp->MdlAddress ); + Irp->MdlAddress = NULL; + return NULL; + } + + RtlCopyMemory(Irp->Tail.Overlay.DriverContext[0], + Irp->Tail.Overlay.DriverContext[1], + MmGetMdlByteCount(Irp->MdlAddress)); + + /* If we don't want a copy back, we zero the mapped address pointer */ + if (!Output) + { + Irp->Tail.Overlay.DriverContext[1] = NULL; + } + return GetLockedData(Irp, IrpSp); } VOID UnlockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp ) { ASSERT(Irp->MdlAddress); + ASSERT(Irp->Tail.Overlay.DriverContext[0]); + + /* Check if we need to copy stuff back */ + if (Irp->Tail.Overlay.DriverContext[1] != NULL) + { + RtlCopyMemory(Irp->Tail.Overlay.DriverContext[1], + Irp->Tail.Overlay.DriverContext[0], + MmGetMdlByteCount(Irp->MdlAddress)); + } + + ExFreePool(Irp->Tail.Overlay.DriverContext[0]); MmUnlockPages( Irp->MdlAddress ); IoFreeMdl( Irp->MdlAddress ); Irp->MdlAddress = NULL; Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Mon Aug 27 04:16:28 2012 @@ -72,7 +72,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PVOID DisconnectOptions = LockRequest(Irp, IrpSp); + PVOID DisconnectOptions = LockRequest(Irp, IrpSp, FALSE); UINT DisconnectOptionsSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -108,7 +108,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PUINT DisconnectOptionsSize = LockRequest(Irp, IrpSp); + PUINT DisconnectOptionsSize = LockRequest(Irp, IrpSp, FALSE); UINT BufferSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -172,7 +172,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PVOID DisconnectData = LockRequest(Irp, IrpSp); + PVOID DisconnectData = LockRequest(Irp, IrpSp, FALSE); UINT DisconnectDataSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -208,7 +208,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PUINT DisconnectDataSize = LockRequest(Irp, IrpSp); + PUINT DisconnectDataSize = LockRequest(Irp, IrpSp, FALSE); UINT BufferSize = IrpSp->Parameters.DeviceIoControl.InputBufferLength; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -244,7 +244,7 @@ { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_FCB FCB = FileObject->FsContext; - PULONG HandleFlags = LockRequest(Irp, IrpSp); + PULONG HandleFlags = LockRequest(Irp, IrpSp, TRUE); PAFD_TDI_HANDLE_DATA HandleData = Irp->UserBuffer; if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); @@ -680,7 +680,7 @@ if (!SocketAcquireStateLock(FCB)) return LostSocket(Irp); - if (!(DisReq = LockRequest(Irp, IrpSp))) + if (!(DisReq = LockRequest(Irp, IrpSp, FALSE))) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Mon Aug 27 04:16:28 2012 @@ -445,7 +445,7 @@ Irp, 0 ); } - if( !(RecvReq = LockRequest( Irp, IrpSp )) ) + if( !(RecvReq = LockRequest( Irp, IrpSp, FALSE )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); @@ -715,7 +715,7 @@ return UnlockAndMaybeComplete(FCB, STATUS_FILE_CLOSED, Irp, 0); } - if( !(RecvReq = LockRequest( Irp, IrpSp )) ) + if( !(RecvReq = LockRequest( Irp, IrpSp, FALSE )) ) return UnlockAndMaybeComplete(FCB, STATUS_NO_MEMORY, Irp, 0); AFD_DbgPrint(MID_TRACE,("Recv flags %x\n", RecvReq->AfdFlags)); Modified: trunk/reactos/drivers/network/afd/afd/select.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/se… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/select.c [iso-8859-1] Mon Aug 27 04:16:28 2012 @@ -259,7 +259,7 @@ PFILE_OBJECT FileObject = IrpSp->FileObject; NTSTATUS Status = STATUS_NO_MEMORY; PAFD_EVENT_SELECT_INFO EventSelectInfo = - (PAFD_EVENT_SELECT_INFO)LockRequest( Irp, IrpSp ); + (PAFD_EVENT_SELECT_INFO)LockRequest( Irp, IrpSp, FALSE ); PAFD_FCB FCB = FileObject->FsContext; if( !SocketAcquireStateLock( FCB ) ) { @@ -322,7 +322,7 @@ PIO_STACK_LOCATION IrpSp ) { PFILE_OBJECT FileObject = IrpSp->FileObject; PAFD_ENUM_NETWORK_EVENTS_INFO EnumReq = - (PAFD_ENUM_NETWORK_EVENTS_INFO)LockRequest( Irp, IrpSp ); + (PAFD_ENUM_NETWORK_EVENTS_INFO)LockRequest( Irp, IrpSp, TRUE ); PAFD_FCB FCB = FileObject->FsContext; AFD_DbgPrint(MID_TRACE,("Called (FCB %x)\n", FCB)); Modified: trunk/reactos/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/wr… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/write.c [iso-8859-1] Mon Aug 27 04:16:28 2012 @@ -299,7 +299,7 @@ 0 ); } - if( !(SendReq = LockRequest( Irp, IrpSp )) ) + if( !(SendReq = LockRequest( Irp, IrpSp, FALSE )) ) return UnlockAndMaybeComplete( FCB, STATUS_NO_MEMORY, Irp, 0 ); /* Must lock buffers before handing off user data */ @@ -369,7 +369,7 @@ return UnlockAndMaybeComplete(FCB, STATUS_FILE_CLOSED, Irp, 0); } - if( !(SendReq = LockRequest( Irp, IrpSp )) ) + if( !(SendReq = LockRequest( Irp, IrpSp, FALSE )) ) return UnlockAndMaybeComplete ( FCB, STATUS_NO_MEMORY, Irp, TotalBytesCopied ); @@ -516,7 +516,7 @@ return UnlockAndMaybeComplete(FCB, STATUS_FILE_CLOSED, Irp, 0); } - if( !(SendReq = LockRequest( Irp, IrpSp )) ) + if( !(SendReq = LockRequest( Irp, IrpSp, FALSE )) ) return UnlockAndMaybeComplete(FCB, STATUS_NO_MEMORY, Irp, 0); if (FCB->State == SOCKET_STATE_CREATED) Modified: trunk/reactos/drivers/network/afd/include/afd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/includ… ============================================================================== --- trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/include/afd.h [iso-8859-1] Mon Aug 27 04:16:28 2012 @@ -308,7 +308,7 @@ NTSTATUS LostSocket( PIRP Irp ); PAFD_HANDLE LockHandles( PAFD_HANDLE HandleArray, UINT HandleCount ); VOID UnlockHandles( PAFD_HANDLE HandleArray, UINT HandleCount ); -PVOID LockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp ); +PVOID LockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp, BOOLEAN Output ); VOID UnlockRequest( PIRP Irp, PIO_STACK_LOCATION IrpSp ); PVOID GetLockedData( PIRP Irp, PIO_STACK_LOCATION IrpSp ); NTSTATUS LeaveIrpUntilLater( PAFD_FCB FCB, PIRP Irp, UINT Function );

1 0

[cgutman] 57174: [AFD] - Fix some size assumptions that fail on 64-bit
by cgutman＠svn.reactos.org 27 Aug '12

27 Aug '12

Author: cgutman Date: Mon Aug 27 03:43:40 2012 New Revision: 57174 URL: http://svn.reactos.org/svn/reactos?rev=57174&view=rev Log: [AFD] - Fix some size assumptions that fail on 64-bit Modified: trunk/reactos/drivers/network/afd/afd/lock.c Modified: trunk/reactos/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/lo… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/lock.c [iso-8859-1] Mon Aug 27 03:43:40 2012 @@ -105,15 +105,15 @@ UINT i; /* Copy the buffer array so we don't lose it */ UINT Lock = LockAddress ? 2 : 0; - UINT Size = sizeof(AFD_WSABUF) * (Count + Lock); - PAFD_WSABUF NewBuf = ExAllocatePool( PagedPool, Size * 2 ); + UINT Size = (sizeof(AFD_WSABUF) + sizeof(AFD_MAPBUF)) * (Count + Lock); + PAFD_WSABUF NewBuf = ExAllocatePool( PagedPool, Size ); BOOLEAN LockFailed = FALSE; PAFD_MAPBUF MapBuf; AFD_DbgPrint(MID_TRACE,("Called(%08x)\n", NewBuf)); if( NewBuf ) { - RtlZeroMemory(NewBuf, Size * 2); + RtlZeroMemory(NewBuf, Size); MapBuf = (PAFD_MAPBUF)(NewBuf + Count + Lock);

1 0

[cgutman] 57173: [AFD] - Only access stack parameters when we're sure that the major function is correct
by cgutman＠svn.reactos.org 27 Aug '12

27 Aug '12

Author: cgutman Date: Mon Aug 27 03:42:28 2012 New Revision: 57173 URL: http://svn.reactos.org/svn/reactos?rev=57173&view=rev Log: [AFD] - Only access stack parameters when we're sure that the major function is correct Modified: trunk/reactos/drivers/network/afd/afd/main.c Modified: trunk/reactos/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/ma… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/main.c [iso-8859-1] Mon Aug 27 03:42:28 2012 @@ -1046,23 +1046,38 @@ PAFD_SEND_INFO SendReq; PAFD_POLL_INFO PollReq; - if (IrpSp->Parameters.DeviceIoControl.IoControlCode == IOCTL_AFD_RECV || - IrpSp->MajorFunction == IRP_MJ_READ) + if (IrpSp->MajorFunction == IRP_MJ_READ) { RecvReq = GetLockedData(Irp, IrpSp); UnlockBuffers(RecvReq->BufferArray, RecvReq->BufferCount, CheckUnlockExtraBuffers(FCB, IrpSp)); } - else if (IrpSp->Parameters.DeviceIoControl.IoControlCode == IOCTL_AFD_SEND || - IrpSp->MajorFunction == IRP_MJ_WRITE) + else if (IrpSp->MajorFunction == IRP_MJ_WRITE) { SendReq = GetLockedData(Irp, IrpSp); UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, CheckUnlockExtraBuffers(FCB, IrpSp)); } - else if (IrpSp->Parameters.DeviceIoControl.IoControlCode == IOCTL_AFD_SELECT) - { - PollReq = Irp->AssociatedIrp.SystemBuffer; - ZeroEvents(PollReq->Handles, PollReq->HandleCount); - SignalSocket(Poll, NULL, PollReq, STATUS_CANCELLED); + else + { + ASSERT(IrpSp->MajorFunction == IRP_MJ_DEVICE_CONTROL); + + if (IrpSp->Parameters.DeviceIoControl.IoControlCode == IOCTL_AFD_RECV) + { + RecvReq = GetLockedData(Irp, IrpSp); + UnlockBuffers(RecvReq->BufferArray, RecvReq->BufferCount, CheckUnlockExtraBuffers(FCB, IrpSp)); + } + else if (IrpSp->Parameters.DeviceIoControl.IoControlCode == IOCTL_AFD_SEND) + { + SendReq = GetLockedData(Irp, IrpSp); + UnlockBuffers(SendReq->BufferArray, SendReq->BufferCount, CheckUnlockExtraBuffers(FCB, IrpSp)); + } + else if (IrpSp->Parameters.DeviceIoControl.IoControlCode == IOCTL_AFD_SELECT) + { + ASSERT(Poll); + + PollReq = Irp->AssociatedIrp.SystemBuffer; + ZeroEvents(PollReq->Handles, PollReq->HandleCount); + SignalSocket(Poll, NULL, PollReq, STATUS_CANCELLED); + } } }

1 0

[jgardou] 57172: [CRT] - Fix some UNICODE vs non UNICODE definition mess.
by jgardou＠svn.reactos.org 26 Aug '12

26 Aug '12

Author: jgardou Date: Sun Aug 26 23:54:52 2012 New Revision: 57172 URL: http://svn.reactos.org/svn/reactos?rev=57172&view=rev Log: [CRT] - Fix some UNICODE vs non UNICODE definition mess. Modified: trunk/reactos/lib/sdk/crt/process/process.c trunk/reactos/lib/sdk/crt/stdio/access.c Modified: trunk/reactos/lib/sdk/crt/process/process.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/process/proces… ============================================================================== --- trunk/reactos/lib/sdk/crt/process/process.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/process/process.c [iso-8859-1] Sun Aug 26 23:54:52 2012 @@ -18,6 +18,7 @@ #define do_spawnT do_spawnW #define valisttosT valisttosW #define extT extW + #define access_dirT access_dirW #else #define sT "s" #define find_execT find_execA @@ -25,6 +26,7 @@ #define do_spawnT do_spawnA #define valisttosT valisttosA #define extT extA + #define access_dirT access_dirA #endif #define MK_STR(s) #s Modified: trunk/reactos/lib/sdk/crt/stdio/access.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/stdio/access.c… ============================================================================== --- trunk/reactos/lib/sdk/crt/stdio/access.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/stdio/access.c [iso-8859-1] Sun Aug 26 23:54:52 2012 @@ -4,9 +4,11 @@ #ifdef _UNICODE #define _TS S #define sT "S" + #define access_dirT access_dirW #else #define _TS s #define sT "s" + #define access_dirT access_dirA #endif #define MK_STR(s) #s

1 0

[jgardou] 57171: [MINGWEX] - mark DllMain as a weak symbol for GCC. - supply a stubbed DllMain for MSVC. - DllMain is optional, and some DLLs don't implement it. That doesn't mean that they have no...
by jgardou＠svn.reactos.org 26 Aug '12

26 Aug '12

Author: jgardou Date: Sun Aug 26 23:31:49 2012 New Revision: 57171 URL: http://svn.reactos.org/svn/reactos?rev=57171&view=rev Log: [MINGWEX] - mark DllMain as a weak symbol for GCC. - supply a stubbed DllMain for MSVC. - DllMain is optional, and some DLLs don't implement it. That doesn't mean that they have no entry point, it means "I have nothing more to initialize than the CRT". Added: trunk/reactos/lib/sdk/crt/startup/mscdllmain.c (with props) Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake trunk/reactos/lib/sdk/crt/startup/crtdll.c Modified: trunk/reactos/lib/sdk/crt/msvcrtex.cmake URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/msvcrtex.cmake… ============================================================================== --- trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/msvcrtex.cmake [iso-8859-1] Sun Aug 26 23:31:49 2012 @@ -66,7 +66,9 @@ endif() if(MSVC) - list(APPEND MSVCRTEX_SOURCE startup/mscmain.c) + list(APPEND MSVCRTEX_SOURCE + startup/mscmain.c + startup/mscdllmain.c) else() list(APPEND MSVCRTEX_SOURCE startup/gccmain.c) endif() Modified: trunk/reactos/lib/sdk/crt/startup/crtdll.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/crtdll… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/crtdll.c [iso-8859-1] (original) +++ trunk/reactos/lib/sdk/crt/startup/crtdll.c [iso-8859-1] Sun Aug 26 23:31:49 2012 @@ -50,7 +50,19 @@ extern int mingw_app_type; +/* + * It is possible that a DLL provides no DllMain entry point. + * Mark it as a weak symbol for GCC. + * Tests show that at link time, MSVC looks for a function first in the object files provided, and then + * in the libraries. This means that we must provide a basic implementation in msvcrtex, which will be used + * if none is found in the object files provided to link.exe. + * This also means that we can't rely on a DllMain function implemented in a static library when linking a DLL. + */ +#ifdef __GNUC__ +extern WINBOOL WINAPI DllMain (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) __attribute__((weak)); +#else extern WINBOOL WINAPI DllMain (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved); +#endif extern WINBOOL WINAPI DllEntryPoint (HANDLE, DWORD, LPVOID); @@ -198,10 +210,12 @@ } if (dwReason == DLL_PROCESS_ATTACH) __main (); - retcode = DllMain(hDllHandle,dwReason,lpreserved); + if(DllMain) + retcode = DllMain(hDllHandle,dwReason,lpreserved); if (dwReason == DLL_PROCESS_ATTACH && ! retcode) { - DllMain (hDllHandle, DLL_PROCESS_DETACH, lpreserved); + if(DllMain) + DllMain (hDllHandle, DLL_PROCESS_DETACH, lpreserved); DllEntryPoint (hDllHandle, DLL_PROCESS_DETACH, lpreserved); _CRT_INIT (hDllHandle, DLL_PROCESS_DETACH, lpreserved); } Added: trunk/reactos/lib/sdk/crt/startup/mscdllmain.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/sdk/crt/startup/mscdll… ============================================================================== --- trunk/reactos/lib/sdk/crt/startup/mscdllmain.c (added) +++ trunk/reactos/lib/sdk/crt/startup/mscdllmain.c [iso-8859-1] Sun Aug 26 23:31:49 2012 @@ -1,0 +1,11 @@ +#include <oscalls.h> +#define _DECL_DLLMAIN +#include <process.h> + +WINBOOL WINAPI DllMain (HANDLE hDllHandle, DWORD dwReason, LPVOID lpreserved) +{ + /* If the DLL provides no DllMain, then chances are that it doesn't bother with thread initialization */ + if(dwReason == DLL_PROCESS_ATTACH) + DisableThreadLibraryCalls(hDllHandle); + return TRUE; +} Propchange: trunk/reactos/lib/sdk/crt/startup/mscdllmain.c ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cgutman] 57170: [AFD] - Change AFD to a very aggressive buffering policy - It now attempts to keep its 64K receive buffer completely full at all times - This increases network performance signific...
by cgutman＠svn.reactos.org 26 Aug '12

26 Aug '12

Author: cgutman Date: Sun Aug 26 22:31:18 2012 New Revision: 57170 URL: http://svn.reactos.org/svn/reactos?rev=57170&view=rev Log: [AFD] - Change AFD to a very aggressive buffering policy - It now attempts to keep its 64K receive buffer completely full at all times - This increases network performance significantly Modified: trunk/reactos/drivers/network/afd/afd/read.c Modified: trunk/reactos/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/afd/afd/re… ============================================================================== --- trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/afd/afd/read.c [iso-8859-1] Sun Aug 26 22:31:18 2012 @@ -6,52 +6,83 @@ * PROGRAMMER: Art Yerkes (ayerkes(a)speakeasy.net) * UPDATE HISTORY: * 20040708 Created - * - * Improve buffering code - * - * We're keeping data receiving in one of two states: - * A) Some data available in the FCB - * FCB->Recv.BytesUsed != FCB->Recv.Content - * FCB->ReceiveIrp.InFlightRequest == NULL - * AFD_EVENT_RECEIVE set in FCB->PollState - * B) No data available in the FCB - * FCB->Recv.BytesUsed == FCB->Recv.Content (== 0) - * FCB->RecieveIrp.InFlightRequest != NULL - * AFD_EVENT_RECEIVED not set in FCB->PollState - * So basically we either have data available or a TDI receive - * in flight. */ #include "afd.h" +static VOID RefillSocketBuffer( PAFD_FCB FCB ) +{ + /* Make sure nothing's in flight first */ + if (FCB->ReceiveIrp.InFlightRequest) return; + + /* Now ensure that receive is still allowed */ + if (FCB->TdiReceiveClosed) return; + + /* Check if the buffer is full */ + if (FCB->Recv.Content == FCB->Recv.Size) + { + /* If there are bytes used, we can solve this problem */ + if (FCB->Recv.BytesUsed != 0) + { + /* Reposition the unused portion to the beginning of the receive window */ + RtlMoveMemory(FCB->Recv.Window, + FCB->Recv.Window + FCB->Recv.BytesUsed, + FCB->Recv.Content - FCB->Recv.BytesUsed); + + FCB->Recv.Content -= FCB->Recv.BytesUsed; + FCB->Recv.BytesUsed = 0; + } + else + { + /* No space in the buffer to receive */ + return; + } + } + + AFD_DbgPrint(MID_TRACE,("Replenishing buffer\n")); + + TdiReceive( &FCB->ReceiveIrp.InFlightRequest, + FCB->Connection.Object, + TDI_RECEIVE_NORMAL, + FCB->Recv.Window + FCB->Recv.Content, + FCB->Recv.Size - FCB->Recv.Content, + &FCB->ReceiveIrp.Iosb, + ReceiveComplete, + FCB ); +} + static VOID HandleReceiveComplete( PAFD_FCB FCB, NTSTATUS Status, ULONG_PTR Information ) { - 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 */ - else if (Status == STATUS_SUCCESS && Information) - { - FCB->Recv.Content = Information; - } - /* Receive successful with no data (graceful closure) */ + FCB->Recv.BytesUsed = 0; + } + /* Receive successful */ else if (Status == STATUS_SUCCESS) { - FCB->Recv.Content = 0; - FCB->TdiReceiveClosed = TRUE; - - /* Signal graceful receive shutdown */ - FCB->PollState |= AFD_EVENT_DISCONNECT; - FCB->PollStatus[FD_CLOSE_BIT] = Status; - - PollReeval( FCB->DeviceExt, FCB->FileObject ); + FCB->Recv.Content += Information; + ASSERT(FCB->Recv.Content <= FCB->Recv.Size); + + /* Check for graceful closure */ + if (Information == 0) + { + FCB->TdiReceiveClosed = TRUE; + + /* Signal graceful receive shutdown */ + FCB->PollState |= AFD_EVENT_DISCONNECT; + FCB->PollStatus[FD_CLOSE_BIT] = Status; + + PollReeval( FCB->DeviceExt, FCB->FileObject ); + } + + /* Issue another receive IRP to keep the buffer well stocked */ + RefillSocketBuffer(FCB); } /* Receive failed with no data (unexpected closure) */ else { + FCB->Recv.BytesUsed = 0; FCB->Recv.Content = 0; FCB->TdiReceiveClosed = TRUE; @@ -67,22 +98,6 @@ UINT BytesAvailable = FCB->Recv.Content - FCB->Recv.BytesUsed; return !BytesAvailable && FCB->TdiReceiveClosed; -} - -static VOID RefillSocketBuffer( PAFD_FCB FCB ) { - if( !FCB->ReceiveIrp.InFlightRequest && - !FCB->TdiReceiveClosed ) { - AFD_DbgPrint(MID_TRACE,("Replenishing buffer\n")); - - TdiReceive( &FCB->ReceiveIrp.InFlightRequest, - FCB->Connection.Object, - TDI_RECEIVE_NORMAL, - FCB->Recv.Window, - FCB->Recv.Size, - &FCB->ReceiveIrp.Iosb, - ReceiveComplete, - FCB ); - } } static NTSTATUS TryToSatisfyRecvRequestFromBuffer( PAFD_FCB FCB, @@ -137,13 +152,8 @@ } } - /* If there's nothing left in our buffer start a new request */ - if( FCB->Recv.BytesUsed == FCB->Recv.Content ) { - FCB->Recv.BytesUsed = FCB->Recv.Content = 0; - FCB->PollState &= ~AFD_EVENT_RECEIVE; - - RefillSocketBuffer( FCB ); - } + /* Issue another receive IRP to keep the buffer well stocked */ + RefillSocketBuffer(FCB); return STATUS_SUCCESS; }

1 0

[cgutman] 57169: [LWIP] - Fix broken handling of partial receives
by cgutman＠svn.reactos.org 26 Aug '12

26 Aug '12

Author: cgutman Date: Sun Aug 26 22:24:49 2012 New Revision: 57169 URL: http://svn.reactos.org/svn/reactos?rev=57169&view=rev Log: [LWIP] - Fix broken handling of partial receives Modified: trunk/reactos/lib/drivers/lwip/src/include/rosip.h trunk/reactos/lib/drivers/lwip/src/rostcp.c Modified: trunk/reactos/lib/drivers/lwip/src/include/rosip.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/inclu… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/include/rosip.h [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/include/rosip.h [iso-8859-1] Sun Aug 26 22:24:49 2012 @@ -15,6 +15,7 @@ typedef struct _QUEUE_ENTRY { struct pbuf *p; + ULONG Offset; LIST_ENTRY ListEntry; } QUEUE_ENTRY, *PQUEUE_ENTRY; Modified: trunk/reactos/lib/drivers/lwip/src/rostcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/lwip/src/rostc… ============================================================================== --- trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/lwip/src/rostcp.c [iso-8859-1] Sun Aug 26 22:24:49 2012 @@ -60,6 +60,7 @@ qp = (PQUEUE_ENTRY)ExAllocateFromNPagedLookasideList(&QueueEntryLookasideList); qp->p = p; + qp->Offset = 0; ExInterlockedInsertTailList(&Connection->PacketQueue, &qp->ListEntry, &Connection->Lock); } @@ -82,9 +83,10 @@ { PQUEUE_ENTRY qp; struct pbuf* p; - NTSTATUS Status = STATUS_PENDING; - UINT ReadLength, ExistingDataLength; + NTSTATUS Status; + UINT ReadLength, PayloadLength; KIRQL OldIrql; + PUCHAR Payload; (*Received) = 0; @@ -95,49 +97,53 @@ while ((qp = LibTCPDequeuePacket(Connection)) != NULL) { p = qp->p; - ExistingDataLength = (*Received); + + /* Calculate the payload first */ + Payload = p->payload; + Payload += qp->Offset; + PayloadLength = p->len; + PayloadLength -= qp->Offset; + + /* Check if we're reading the whole buffer */ + ReadLength = MIN(PayloadLength, RecvLen); + if (ReadLength != PayloadLength) + { + /* Save this one for later */ + qp->Offset += ReadLength; + InsertHeadList(&Connection->PacketQueue, &qp->ListEntry); + qp = NULL; + } + + UnlockObject(Connection, OldIrql); + + /* Return to a lower IRQL because the receive buffer may be pageable memory */ + RtlCopyMemory(RecvBuffer, + Payload, + ReadLength); + + LockObject(Connection, &OldIrql); + + /* Update trackers */ + RecvLen -= ReadLength; + RecvBuffer += ReadLength; + (*Received) += ReadLength; + + if (qp != NULL) + { + /* Use this special pbuf free callback function because we're outside tcpip thread */ + pbuf_free_callback(qp->p); + + ExFreeToNPagedLookasideList(&QueueEntryLookasideList, qp); + } + else + { + /* If we get here, it means we've filled the buffer */ + ASSERT(RecvLen == 0); + } Status = STATUS_SUCCESS; - ReadLength = MIN(p->tot_len, RecvLen); - if (ReadLength != p->tot_len) - { - if (ExistingDataLength) - { - /* The packet was too big but we used some data already so give it another shot later */ - InsertHeadList(&Connection->PacketQueue, &qp->ListEntry); - break; - } - else - { - /* The packet is just too big to fit fully in our buffer, even when empty so - * return an informative status but still copy all the data we can fit. - */ - Status = STATUS_BUFFER_OVERFLOW; - } - } - - UnlockObject(Connection, OldIrql); - - /* Return to a lower IRQL because the receive buffer may be pageable memory */ - for (; (*Received) < ReadLength + ExistingDataLength; (*Received) += p->len, p = p->next) - { - RtlCopyMemory(RecvBuffer + (*Received), p->payload, p->len); - } - - LockObject(Connection, &OldIrql); - - RecvLen -= ReadLength; - - /* Use this special pbuf free callback function because we're outside tcpip thread */ - pbuf_free_callback(qp->p); - - ExFreeToNPagedLookasideList(&QueueEntryLookasideList, qp); - if (!RecvLen) - break; - - if (Status != STATUS_SUCCESS) break; } } @@ -196,6 +202,8 @@ InternalRecvEventHandler(void *arg, PTCP_PCB pcb, struct pbuf *p, const err_t err) { PCONNECTION_ENDPOINT Connection = arg; + struct pbuf *pb; + ULONG RecvLen; /* Make sure the socket didn't get closed */ if (!arg) @@ -208,9 +216,19 @@ if (p) { - LibTCPEnqueuePacket(Connection, p); - - tcp_recved(pcb, p->tot_len); + pb = p; + RecvLen = 0; + while (pb != NULL) + { + /* Enqueue this buffer */ + LibTCPEnqueuePacket(Connection, pb); + RecvLen += pb->len; + + /* Advance and unchain the buffer */ + pb = pbuf_dechain(pb);; + } + + tcp_recved(pcb, RecvLen); TCPRecvEventHandler(arg); }

1 0

← Newer
1
2
3
4
5
6
7
...
20
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs August 2012