Ros-diffs July 2011

ros-diffs@reactos.org

24 participants
517 discussions

[jimtabor] 52512: - Fix Release build.
by jimtabor＠svn.reactos.org 03 Jul '11

03 Jul '11

Author: jimtabor Date: Sun Jul 3 08:46:07 2011 New Revision: 52512 URL: http://svn.reactos.org/svn/reactos?rev=52512&view=rev Log: - Fix Release build. Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Sun Jul 3 08:46:07 2011 @@ -150,7 +150,9 @@ OSK_UINT Len, OSK_UINT *OutLen, OSK_UINT Flags ) { +#if DBG struct socket *so = connection; +#endif struct uio uio = { 0 }; struct iovec iov = { 0 }; int error = 0;

1 0

[cgutman] 52511: [TCPIP] - Only wait to bind to a port if INADDR_ANY is specified - Fixes EADDRNOTAVAIL when running Firefox and ws2_32_winetest sock (which now gets further but still doesn't compl...
by cgutman＠svn.reactos.org 03 Jul '11

03 Jul '11

Author: cgutman Date: Sun Jul 3 02:13:57 2011 New Revision: 52511 URL: http://svn.reactos.org/svn/reactos?rev=52511&view=rev Log: [TCPIP] - Only wait to bind to a port if INADDR_ANY is specified - Fixes EADDRNOTAVAIL when running Firefox and ws2_32_winetest sock (which now gets further but still doesn't complete) Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c Modified: trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/fileobjs.c [iso-8859-1] Sun Jul 3 02:13:57 2011 @@ -295,9 +295,21 @@ /* Sanity check */ ASSERT(Address->Address[0].Address[0].sin_port == AddrFile->Port); } + else if (!AddrIsUnspecified(&AddrFile->Address)) + { + /* The client is trying to bind to a local address so allocate a port now too */ + AddrFile->Port = TCPAllocatePort(0); + + /* Check for bind success */ + if (AddrFile->Port == 0xffff) + { + ExFreePoolWithTag(AddrFile, ADDR_FILE_TAG); + return STATUS_ADDRESS_ALREADY_EXISTS; + } + } else { - /* The client wants an unspecified port so we wait to see what the TCP library gives us */ + /* The client wants an unspecified port with an unspecified address so we wait to see what the TCP library gives us */ AddrFile->Port = 0; }

1 0

[cgutman] 52510: [AFD] - We really do need to count the outstanding send IRP in our pending send count (with a detailed explanation of the reason included in the code) - Wait on an outstanding send...
by cgutman＠svn.reactos.org 03 Jul '11

03 Jul '11

Author: cgutman Date: Sun Jul 3 01:53:10 2011 New Revision: 52510 URL: http://svn.reactos.org/svn/reactos?rev=52510&view=rev Log: [AFD] - We really do need to count the outstanding send IRP in our pending send count (with a detailed explanation of the reason included in the code) - Wait on an outstanding send IRP to dispatch the disconnect - When we receive a FIN from the other side and our receive comes back with 0 data, only close receiving on the socket because sending is still legal in this state - Fixes many bugs on the ws2_32_winetest sock and likely lots of other partial disconnect related stuff - Retest network related hanging bugs after this please (ftp dir hang is fixed) Modified: trunk/reactos/drivers/network/afd/afd/info.c trunk/reactos/drivers/network/afd/afd/main.c trunk/reactos/drivers/network/afd/afd/read.c trunk/reactos/drivers/network/afd/afd/write.c 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] Sun Jul 3 01:53:10 2011 @@ -70,7 +70,18 @@ CurrentEntry = CurrentEntry->Flink; } - break; + /* This needs to count too because when this is dispatched + * the user-mode IRP has already been completed and therefore + * will NOT be in our pending IRP list. We count this as one send + * outstanding although it could be multiple since we batch sends + * when waiting for the in flight request to return, so this number + * may not be accurate but it really doesn't matter that much since + * it's more or less a zero/non-zero comparison to determine whether + * we can shutdown the socket + */ + if (FCB->SendIrp.InFlightRequest) + InfoReq->Information.Ulong++; + break; default: AFD_DbgPrint(MID_TRACE,("Unknown info id %x\n", 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] Sun Jul 3 01:53:10 2011 @@ -553,7 +553,8 @@ FCB->DisconnectIrp.InFlightRequest = NULL; ASSERT(FCB->DisconnectPending); - //ASSERT(IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) || (FCB->DisconnectFlags & TDI_DISCONNECT_ABORT)); + ASSERT((IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) && !FCB->SendIrp.InFlightRequest) || + (FCB->DisconnectFlags & TDI_DISCONNECT_ABORT)); if (NT_SUCCESS(Irp->IoStatus.Status) && (FCB->DisconnectFlags & TDI_DISCONNECT_RELEASE)) { @@ -606,6 +607,8 @@ NTSTATUS Status; ASSERT(FCB->DisconnectPending); + ASSERT((IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) && !FCB->SendIrp.InFlightRequest) || + (FCB->DisconnectFlags & TDI_DISCONNECT_ABORT)); if (FCB->DisconnectIrp.InFlightRequest) { @@ -639,7 +642,7 @@ { ASSERT(FCB->RemoteAddress); - if (IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) && FCB->DisconnectPending) + if (IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) && !FCB->SendIrp.InFlightRequest && FCB->DisconnectPending) { /* Sends are done; fire off a TDI_DISCONNECT request */ DoDisconnect(FCB); @@ -704,9 +707,10 @@ Status = QueueUserModeIrp(FCB, Irp, FUNCTION_DISCONNECT); if (Status == STATUS_PENDING) { - if (IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) || (FCB->DisconnectFlags & TDI_DISCONNECT_ABORT)) + if ((IsListEmpty(&FCB->PendingIrpList[FUNCTION_SEND]) && !FCB->SendIrp.InFlightRequest) || + (FCB->DisconnectFlags & TDI_DISCONNECT_ABORT)) { - /* Go ahead an execute the disconnect because we're ready for it */ + /* Go ahead and execute the disconnect because we're ready for it */ Status = DoDisconnect(FCB); } 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 Jul 3 01:53:10 2011 @@ -31,8 +31,8 @@ if( ( Status == STATUS_SUCCESS && !Information ) || ( !NT_SUCCESS( Status ) ) ) { - /* The socket has been closed */ - FCB->PollState |= AFD_EVENT_CLOSE; + /* The socket has been closed by the remote side */ + FCB->PollState |= AFD_EVENT_ABORT; FCB->PollStatus[FD_CLOSE_BIT] = Status; PollReeval( FCB->DeviceExt, FCB->FileObject ); 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] Sun Jul 3 01:53:10 2011 @@ -179,7 +179,10 @@ &FCB->SendIrp.Iosb, SendComplete, FCB ); - + } + else + { + /* Nothing is waiting so try to complete a pending disconnect */ RetryDisconnectCompletion(FCB); } @@ -300,6 +303,12 @@ return UnlockAndMaybeComplete( FCB, Status, Irp, Information ); } + if (FCB->DisconnectPending && (FCB->DisconnectFlags & TDI_DISCONNECT_RELEASE)) + { + /* We're pending a send shutdown so don't accept anymore sends */ + return UnlockAndMaybeComplete(FCB, STATUS_FILE_CLOSED, Irp, 0); + } + if (FCB->PollState & (AFD_EVENT_CLOSE | AFD_EVENT_DISCONNECT)) { if (FCB->PollStatus[FD_CLOSE_BIT] == STATUS_SUCCESS) @@ -435,8 +444,6 @@ FCB->PollState &= ~AFD_EVENT_SEND; } - RetryDisconnectCompletion(FCB); - return UnlockAndMaybeComplete ( FCB, Status, Irp, TotalBytesCopied ); }

1 0

[tkreuzer] 52509: [NTOSKRNL] Fix KiConvertToGuiThread on MSVC builds, by using a raw assembly function instead of a (broken) inline asembly function MSVC built kernel boots further now.
by tkreuzer＠svn.reactos.org 03 Jul '11

03 Jul '11

Author: tkreuzer Date: Sun Jul 3 01:04:01 2011 New Revision: 52509 URL: http://svn.reactos.org/svn/reactos?rev=52509&view=rev Log: [NTOSKRNL] Fix KiConvertToGuiThread on MSVC builds, by using a raw assembly function instead of a (broken) inline asembly function MSVC built kernel boots further now. Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h trunk/reactos/ntoskrnl/ke/i386/trap.s Modified: trunk/reactos/ntoskrnl/include/internal/i386/ke.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/i386/ke.h [iso-8859-1] Sun Jul 3 01:04:01 2011 @@ -707,6 +707,7 @@ // // Converts a base thread to a GUI thread // +#ifdef __GNUC__ NTSTATUS FORCEINLINE KiConvertToGuiThread(VOID) @@ -730,7 +731,6 @@ * on its merry way. * */ -#ifdef __GNUC__ __asm__ __volatile__ ( "movl %%ebp, %1\n" @@ -743,22 +743,15 @@ : : "%esp", "%ecx", "%edx", "memory" ); + return Result; +} #elif defined(_MSC_VER) - NTSTATUS NTAPI PsConvertToGuiThread(VOID); - __asm - { - mov StackFrame, ebp - sub StackFrame, esp - call PsConvertToGuiThread - add StackFrame, esp - mov ebp, StackFrame - mov Result, eax - } +NTSTATUS +NTAPI +KiConvertToGuiThread(VOID); #else #error Unknown Compiler #endif - return Result; -} // // Switches from boot loader to initial kernel stack Modified: trunk/reactos/ntoskrnl/ke/i386/trap.s URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ke/i386/trap.s?re… ============================================================================== --- trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ke/i386/trap.s [iso-8859-1] Sun Jul 3 01:04:01 2011 @@ -156,4 +156,24 @@ KiTrapExitStub KiTrapReturn, (KI_RESTORE_VOLATILES OR KI_RESTORE_SEGMENTS OR KI_EXIT_IRET) KiTrapExitStub KiTrapReturnNoSegments, (KI_RESTORE_VOLATILES OR KI_EXIT_IRET) +#ifdef _MSC_VER +EXTERN _PsConvertToGuiThread@0:PROC + +PUBLIC _KiConvertToGuiThread@0 +_KiConvertToGuiThread@0: + /* Calculate the stack frame offset in ebx */ + mov ebx, ebp + sub ebx, esp + + /* Call the worker function */ + call _PsConvertToGuiThread@0 + + /* Adjust ebp to the new stack */ + mov ebp, esp + add ebp, ebx + + /* return to the caller */ + ret +#endif + END

1 0

[cgutman] 52508: [IP] - Handle an EPIPE error
by cgutman＠svn.reactos.org 03 Jul '11

03 Jul '11

Author: cgutman Date: Sun Jul 3 00:12:25 2011 New Revision: 52508 URL: http://svn.reactos.org/svn/reactos?rev=52508&view=rev Log: [IP] - Handle an EPIPE error Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Sun Jul 3 00:12:25 2011 @@ -654,9 +654,10 @@ Status = STATUS_INSUFFICIENT_RESOURCES; DbgPrint("OskitTCP: ENOMEM/ENOBUFS\n"); break; + case OSK_EPIPE: case OSK_ESHUTDOWN: Status = STATUS_FILE_CLOSED; - DbgPrint("OskitTCP: ESHUTDOWN\n"); + DbgPrint("OskitTCP: ESHUTDOWN/EPIPE\n"); break; case OSK_EMSGSIZE: Status = STATUS_BUFFER_TOO_SMALL;

1 0

[tkreuzer] 52507: [NTOSKNRL] - Change an ASSERT to a KeBugCheck, since the assertion can fail for any invalid memory access and this is not an internal Mm failure. - Remove 2 cases, that "Should NE...
by tkreuzer＠svn.reactos.org 02 Jul '11

02 Jul '11

Author: tkreuzer Date: Sat Jul 2 23:11:06 2011 New Revision: 52507 URL: http://svn.reactos.org/svn/reactos?rev=52507&view=rev Log: [NTOSKNRL] - Change an ASSERT to a KeBugCheck, since the assertion can fail for any invalid memory access and this is not an internal Mm failure. - Remove 2 cases, that "Should NEVER happen on ARM3!!!", but can very well happen. - Do NOT make the code cleaner, by releasing the PFN lock in the same function that acquires it, but keep it 2 functions down. This is because it *SHOULD* be that way, since some internal undocumented functions, that we do not implement but that are (theoretically) called from here, also do release the PFN lock. Thanks Alex for explaining this. Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c Modified: trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/mm/ARM3/pagfault.… ============================================================================== --- trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/mm/ARM3/pagfault.c [iso-8859-1] Sat Jul 2 23:11:06 2011 @@ -583,10 +583,19 @@ } // - // The PTE must be invalid, but not totally blank + // The PTE must be invalid // ASSERT(TempPte.u.Hard.Valid == 0); - ASSERT(TempPte.u.Long != 0); + + /* Check if the PTE is completely empty */ + if (TempPte.u.Long == 0) + { + KeBugCheckEx(PAGE_FAULT_IN_NONPAGED_AREA, + (ULONG_PTR)Address, + StoreInstruction, + (ULONG_PTR)TrapInformation, + 2); + } // // No prototype, transition or page file software PTEs in ARM3 yet @@ -727,11 +736,6 @@ // Writing to a read-only page (the stuff ARM3 works with is write, // so again, moot point). // - if (StoreInstruction) - { - DPRINT1("Should NEVER happen on ARM3!!!\n"); - return STATUS_ACCESS_VIOLATION; - } // // Otherwise, the PDE was probably invalid, and all is good now @@ -776,11 +780,6 @@ // Writing to a read-only page (the stuff ARM3 works with is write, // so again, moot point. // - if (StoreInstruction) - { - DPRINT1("Should NEVER happen on ARM3!!!\n"); - return STATUS_ACCESS_VIOLATION; - } /* Release the working set */ MiUnlockWorkingSet(CurrentThread, WorkingSet);

1 0

[cgutman] 52506: - Fix build
by cgutman＠svn.reactos.org 02 Jul '11

02 Jul '11

Author: cgutman Date: Sat Jul 2 23:07:45 2011 New Revision: 52506 URL: http://svn.reactos.org/svn/reactos?rev=52506&view=rev Log: - Fix build Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Sat Jul 2 23:07:45 2011 @@ -293,7 +293,6 @@ int OskitTCPSend( void *socket, OSK_PCHAR Data, OSK_UINT Len, OSK_UINT *OutLen, OSK_UINT flags ) { - struct socket *so = socket; int error; struct uio uio; struct iovec iov;

1 0

[cgutman] 52505: [OSKITTCP] - Remove socket state checks from OskitTCPRecv and OskitTCPSend - Oskit already returns ESHUTDOWN when sosend is called on a socket with SS_CANTSENDMORE so it is unneces...
by cgutman＠svn.reactos.org 02 Jul '11

02 Jul '11

Author: cgutman Date: Sat Jul 2 22:57:30 2011 New Revision: 52505 URL: http://svn.reactos.org/svn/reactos?rev=52505&view=rev Log: [OSKITTCP] - Remove socket state checks from OskitTCPRecv and OskitTCPSend - Oskit already returns ESHUTDOWN when sosend is called on a socket with SS_CANTSENDMORE so it is unnecessary - The check in OskitTCPRecv broke returning success and 0 bytes on a graceful shutdown (We got the FIN, set SS_CANTRCVMORE, signaled the connection, tried to read and failed with ESHUTDOWN instead of succeeding with 0 bytes) Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/interface.c [iso-8859-1] Sat Jul 2 22:57:30 2011 @@ -158,9 +158,6 @@ if (!connection) return OSK_ESHUTDOWN; - - if (so->so_state & SS_CANTRCVMORE) - return OSK_ESHUTDOWN; OS_DbgPrint(OSK_MID_TRACE, ("so->so_state %x\n", so->so_state)); @@ -302,9 +299,6 @@ struct iovec iov; if (!socket) - return OSK_ESHUTDOWN; - - if (so->so_state & SS_CANTSENDMORE) return OSK_ESHUTDOWN; iov.iov_len = Len;

1 0

[cgutman] 52504: [OSKITTCP] - Signal readable when read is closed and writeable when write is closed - This seems counterintuitive on the surface but signaling the socket in this way ensures that p...
by cgutman＠svn.reactos.org 02 Jul '11

02 Jul '11

Author: cgutman Date: Sat Jul 2 21:47:30 2011 New Revision: 52504 URL: http://svn.reactos.org/svn/reactos?rev=52504&view=rev Log: [OSKITTCP] - Signal readable when read is closed and writeable when write is closed - This seems counterintuitive on the surface but signaling the socket in this way ensures that pending reads and writes are cancelled if either side shuts down send/receive - Graceful close (recv() returns 0 bytes and FD_CLOSE is signaled when we receive a FIN) works much better Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/sleep.c Modified: trunk/reactos/lib/drivers/oskittcp/oskittcp/sleep.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/oskittcp/oskit… ============================================================================== --- trunk/reactos/lib/drivers/oskittcp/oskittcp/sleep.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/oskittcp/oskittcp/sleep.c [iso-8859-1] Sat Jul 2 21:47:30 2011 @@ -31,13 +31,13 @@ OS_DbgPrint(OSK_MID_TRACE,("Socket accepting q\n")); flags |= SEL_ACCEPT; } - if( so->so_rcv.sb_cc > 0 && !(so->so_state & SS_CANTRCVMORE) && - (so->so_state & SS_ISCONNECTED) ) { + if( (so->so_rcv.sb_cc > 0 && (so->so_state & SS_ISCONNECTED)) || + (so->so_state & SS_CANTRCVMORE)) { OS_DbgPrint(OSK_MID_TRACE,("Socket readable\n")); flags |= SEL_READ; } - if( 0 < sbspace(&so->so_snd) && !(so->so_state & SS_CANTSENDMORE) && - (so->so_state & SS_ISCONNECTED) ) { + if( (0 < sbspace(&so->so_snd) && (so->so_state & SS_ISCONNECTED)) || + (so->so_state & SS_CANTSENDMORE)) { OS_DbgPrint(OSK_MID_TRACE,("Socket writeable\n")); flags |= SEL_WRITE; }

1 0

[cgutman] 52503: [TCPIP] - Implement support for timing out disconnects - Add debug prints for oskittcp errors [MSAFD] - Set a disconnect timeout value that actually makes sense (1 second vs 100 na...
by cgutman＠svn.reactos.org 02 Jul '11

02 Jul '11

Author: cgutman Date: Sat Jul 2 20:36:35 2011 New Revision: 52503 URL: http://svn.reactos.org/svn/reactos?rev=52503&view=rev Log: [TCPIP] - Implement support for timing out disconnects - Add debug prints for oskittcp errors [MSAFD] - Set a disconnect timeout value that actually makes sense (1 second vs 100 nanoseconds) Modified: trunk/reactos/dll/win32/msafd/misc/dllmain.c trunk/reactos/drivers/network/tcpip/include/tcp.h trunk/reactos/drivers/network/tcpip/include/titypes.h trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c trunk/reactos/lib/drivers/ip/transport/tcp/tcp.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] Sat Jul 2 20:36:35 2011 @@ -1696,7 +1696,7 @@ break; } - DisconnectInfo.Timeout = RtlConvertLongToLargeInteger(-1); + DisconnectInfo.Timeout = RtlConvertLongToLargeInteger(-1000000); /* Send IOCTL */ Status = NtDeviceIoControlFile((HANDLE)Handle, Modified: trunk/reactos/drivers/network/tcpip/include/tcp.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/tcp.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/tcp.h [iso-8859-1] Sat Jul 2 20:36:35 2011 @@ -138,6 +138,7 @@ NTSTATUS TCPDisconnect( PCONNECTION_ENDPOINT Connection, UINT Flags, + PLARGE_INTEGER Timeout, PTDI_CONNECTION_INFORMATION ConnInfo, PTDI_CONNECTION_INFORMATION ReturnInfo, PTCP_COMPLETION_ROUTINE Complete, Modified: trunk/reactos/drivers/network/tcpip/include/titypes.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/incl… ============================================================================== --- trunk/reactos/drivers/network/tcpip/include/titypes.h [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/include/titypes.h [iso-8859-1] Sat Jul 2 20:36:35 2011 @@ -270,6 +270,10 @@ /* Signals */ UINT SignalState; /* Active signals from oskit */ + + /* Disconnect Timer */ + KTIMER DisconnectTimer; + KDPC DisconnectDpc; struct _CONNECTION_ENDPOINT *Next; /* Next connection in address file list */ } CONNECTION_ENDPOINT, *PCONNECTION_ENDPOINT; Modified: trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/network/tcpip/tcpi… ============================================================================== --- trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] (original) +++ trunk/reactos/drivers/network/tcpip/tcpip/dispatch.c [iso-8859-1] Sat Jul 2 20:36:35 2011 @@ -549,6 +549,7 @@ Status = TCPDisconnect( TranContext->Handle.ConnectionContext, DisReq->RequestFlags, + DisReq->RequestSpecific, DisReq->RequestConnectionInformation, DisReq->ReturnConnectionInformation, DispDataRequestComplete, Modified: trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/transport/t… ============================================================================== --- trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/transport/tcp/tcp.c [iso-8859-1] Sat Jul 2 20:36:35 2011 @@ -278,6 +278,11 @@ TI_DbgPrint(DEBUG_TCP, ("Completing shutdown request: %x %x\n", Bucket->Request, Status)); + + if (KeCancelTimer(&Connection->DisconnectTimer)) + { + DereferenceObject(Connection); + } Bucket->Status = Status; Bucket->Information = 0; @@ -297,6 +302,49 @@ UnlockObjectFromDpcLevel(Connection); } +VOID NTAPI +DisconnectTimeoutDpc(PKDPC Dpc, + PVOID DeferredContext, + PVOID SystemArgument1, + PVOID SystemArgument2) +{ + PCONNECTION_ENDPOINT Connection = DeferredContext; + PLIST_ENTRY Entry; + PTDI_BUCKET Bucket; + + LockObjectAtDpcLevel(Connection); + + /* We timed out waiting for pending sends so force it to shutdown */ + OskitTCPShutdown(Connection->SocketContext, FWRITE); + + while (!IsListEmpty(&Connection->SendRequest)) + { + Entry = RemoveHeadList(&Connection->SendRequest); + + Bucket = CONTAINING_RECORD(Entry, TDI_BUCKET, Entry); + + Bucket->Information = 0; + Bucket->Status = STATUS_FILE_CLOSED; + + CompleteBucket(Connection, Bucket); + } + + while (!IsListEmpty(&Connection->ShutdownRequest)) { + Entry = RemoveHeadList( &Connection->ShutdownRequest ); + + Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry ); + + Bucket->Status = STATUS_TIMEOUT; + Bucket->Information = 0; + + CompleteBucket(Connection, Bucket); + } + + UnlockObjectFromDpcLevel(Connection); + + DereferenceObject(Connection); +} + VOID ConnectionFree(PVOID Object) { PCONNECTION_ENDPOINT Connection = Object; KIRQL OldIrql; @@ -328,10 +376,12 @@ InitializeListHead(&Connection->ReceiveRequest); InitializeListHead(&Connection->SendRequest); InitializeListHead(&Connection->ShutdownRequest); + + KeInitializeTimer(&Connection->DisconnectTimer); + KeInitializeDpc(&Connection->DisconnectDpc, DisconnectTimeoutDpc, Connection); /* Save client context pointer */ Connection->ClientContext = ClientContext; - Connection->RefCount = 2; Connection->Free = ConnectionFree; @@ -569,22 +619,61 @@ switch( OskitError ) { case 0: Status = STATUS_SUCCESS; break; - case OSK_EADDRNOTAVAIL: Status = STATUS_INVALID_ADDRESS; break; - case OSK_EADDRINUSE: Status = STATUS_ADDRESS_ALREADY_EXISTS; break; - case OSK_EAFNOSUPPORT: Status = STATUS_INVALID_CONNECTION; break; - case OSK_ECONNREFUSED: Status = STATUS_REMOTE_NOT_LISTENING; break; - case OSK_ECONNRESET: Status = STATUS_REMOTE_DISCONNECT; break; - case OSK_ECONNABORTED: Status = STATUS_LOCAL_DISCONNECT; break; + case OSK_EADDRNOTAVAIL: + Status = STATUS_INVALID_ADDRESS; + DbgPrint("OskitTCP: EADDRNOTAVAIL\n"); + break; + case OSK_EADDRINUSE: + Status = STATUS_ADDRESS_ALREADY_EXISTS; + DbgPrint("OskitTCP: EADDRINUSE\n"); + break; + case OSK_EAFNOSUPPORT: + Status = STATUS_INVALID_CONNECTION; + DbgPrint("OskitTCP: EAFNOSUPPORT\n"); + break; + case OSK_ECONNREFUSED: + Status = STATUS_REMOTE_NOT_LISTENING; + DbgPrint("OskitTCP: ECONNREFUSED\n"); + break; + case OSK_ECONNRESET: + Status = STATUS_REMOTE_DISCONNECT; + DbgPrint("OskitTCP: ECONNRESET\n"); + break; + case OSK_ECONNABORTED: + Status = STATUS_LOCAL_DISCONNECT; + DbgPrint("OskitTCP: ECONNABORTED\n"); + break; case OSK_EWOULDBLOCK: case OSK_EINPROGRESS: Status = STATUS_PENDING; break; - case OSK_EINVAL: Status = STATUS_INVALID_PARAMETER; break; + case OSK_EINVAL: + Status = STATUS_INVALID_PARAMETER; + DbgPrint("OskitTCP: EINVAL\n"); + break; case OSK_ENOMEM: - case OSK_ENOBUFS: Status = STATUS_INSUFFICIENT_RESOURCES; break; - case OSK_ESHUTDOWN: Status = STATUS_FILE_CLOSED; break; - case OSK_EMSGSIZE: Status = STATUS_BUFFER_TOO_SMALL; break; - case OSK_ETIMEDOUT: Status = STATUS_TIMEOUT; break; - case OSK_ENETUNREACH: Status = STATUS_NETWORK_UNREACHABLE; break; - case OSK_EFAULT: Status = STATUS_ACCESS_VIOLATION; break; + case OSK_ENOBUFS: + Status = STATUS_INSUFFICIENT_RESOURCES; + DbgPrint("OskitTCP: ENOMEM/ENOBUFS\n"); + break; + case OSK_ESHUTDOWN: + Status = STATUS_FILE_CLOSED; + DbgPrint("OskitTCP: ESHUTDOWN\n"); + break; + case OSK_EMSGSIZE: + Status = STATUS_BUFFER_TOO_SMALL; + DbgPrint("OskitTCP: EMSGSIZE\n"); + break; + case OSK_ETIMEDOUT: + Status = STATUS_TIMEOUT; + DbgPrint("OskitTCP: ETIMEDOUT\n"); + break; + case OSK_ENETUNREACH: + Status = STATUS_NETWORK_UNREACHABLE; + DbgPrint("OskitTCP: ENETUNREACH\n"); + break; + case OSK_EFAULT: + Status = STATUS_ACCESS_VIOLATION; + DbgPrint("OskitTCP: EFAULT\n"); + break; default: DbgPrint("OskitTCP returned unhandled error code: %d\n", OskitError); Status = STATUS_INVALID_CONNECTION; @@ -714,6 +803,7 @@ NTSTATUS TCPDisconnect ( PCONNECTION_ENDPOINT Connection, UINT Flags, + PLARGE_INTEGER Timeout, PTDI_CONNECTION_INFORMATION ConnInfo, PTDI_CONNECTION_INFORMATION ReturnInfo, PTCP_COMPLETION_ROUTINE Complete, @@ -722,6 +812,7 @@ PTDI_BUCKET Bucket; KIRQL OldIrql; PLIST_ENTRY Entry; + LARGE_INTEGER ActualTimeout; TI_DbgPrint(DEBUG_TCP,("started\n")); @@ -740,6 +831,28 @@ return Status; } + /* Check if the timeout was 0 */ + if (Timeout && Timeout->QuadPart == 0) + { + OskitTCPShutdown(Connection->SocketContext, FWRITE); + + while (!IsListEmpty(&Connection->SendRequest)) + { + Entry = RemoveHeadList(&Connection->SendRequest); + + Bucket = CONTAINING_RECORD(Entry, TDI_BUCKET, Entry); + + Bucket->Information = 0; + Bucket->Status = STATUS_FILE_CLOSED; + + CompleteBucket(Connection, Bucket); + } + + UnlockObject(Connection, OldIrql); + + return STATUS_TIMEOUT; + } + /* Otherwise we wait for the send queue to be empty */ } @@ -803,6 +916,19 @@ Bucket->Request.RequestContext = Context; InsertTailList(&Connection->ShutdownRequest, &Bucket->Entry); + + /* Use the timeout specified or 1 second if none was specified */ + if (Timeout) + { + ActualTimeout = *Timeout; + } + else + { + ActualTimeout.QuadPart = -1000000; + } + + ReferenceObject(Connection); + KeSetTimer(&Connection->DisconnectTimer, ActualTimeout, &Connection->DisconnectDpc); UnlockObject(Connection, OldIrql);

1 0

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 July 2011