Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2024-06-30 01:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Merge aicom-network-fixes up to r36785

Browse source 
svn path=/trunk/; revision=36787
This commit is contained in:
Cameron Gutman 2008-10-17 10:42:44 +00:00
parent 9c8b2fd447
commit 187ed1777f
2 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
reactos/drivers/network/tcpip/tcpip/main.c
View file

@ -783,6 +783,7 @@ DriverEntry(
/* Initialize transport level protocol subsystems */
Status = RawIPStartup();
if( !NT_SUCCESS(Status) ) {
IPShutdown();
ChewShutdown();
IoDeleteDevice(IPDeviceObject);
IoDeleteDevice(RawIPDeviceObject);
@ -791,12 +792,13 @@ DriverEntry(
ExFreePool(EntityList);
NdisFreePacketPool(GlobalPacketPool);
NdisFreeBufferPool(GlobalBufferPool);
IPShutdown();
return Status;
}
Status = UDPStartup();
if( !NT_SUCCESS(Status) ) {
RawIPShutdown();
IPShutdown();
ChewShutdown();
IoDeleteDevice(IPDeviceObject);
IoDeleteDevice(RawIPDeviceObject);
@ -805,13 +807,14 @@ DriverEntry(
ExFreePool(EntityList);
NdisFreePacketPool(GlobalPacketPool);
NdisFreeBufferPool(GlobalBufferPool);
IPShutdown();
RawIPShutdown();
return Status;
}
Status = TCPStartup();
if( !NT_SUCCESS(Status) ) {
UDPShutdown();
RawIPShutdown();
IPShutdown();
ChewShutdown();
IoDeleteDevice(IPDeviceObject);
IoDeleteDevice(RawIPDeviceObject);
@ -820,9 +823,6 @@ DriverEntry(
ExFreePool(EntityList);
NdisFreePacketPool(GlobalPacketPool);
NdisFreeBufferPool(GlobalBufferPool);
IPShutdown();
RawIPShutdown();
UDPShutdown();
return Status;
}
@ -842,6 +842,11 @@ DriverEntry(
NULL,
0,
NULL);
LANShutdown();
TCPShutdown();
UDPShutdown();
RawIPShutdown();
IPShutdown();
ChewShutdown();
IoDeleteDevice(IPDeviceObject);
IoDeleteDevice(RawIPDeviceObject);
@ -850,11 +855,6 @@ DriverEntry(
ExFreePool(EntityList);
NdisFreePacketPool(GlobalPacketPool);
NdisFreeBufferPool(GlobalBufferPool);
IPShutdown();
RawIPShutdown();
UDPShutdown();
TCPShutdown();
LANShutdown();
return Status;
}
@ -862,6 +862,11 @@ DriverEntry(
Status = LoopRegisterAdapter(NULL, NULL);
if (!NT_SUCCESS(Status)) {
TI_DbgPrint(MIN_TRACE, ("Failed to create loopback adapter. Status (0x%X).\n", Status));
LANShutdown();
TCPShutdown();
UDPShutdown();
RawIPShutdown();
IPShutdown();
ChewShutdown();
IoDeleteDevice(IPDeviceObject);
IoDeleteDevice(RawIPDeviceObject);
@ -870,11 +875,6 @@ DriverEntry(
ExFreePool(EntityList);
NdisFreePacketPool(GlobalPacketPool);
NdisFreeBufferPool(GlobalBufferPool);
IPShutdown();
RawIPShutdown();
UDPShutdown();
TCPShutdown();
LANShutdown();
LANUnregisterProtocol();
return Status;
}

5
reactos/lib/drivers/ip/transport/tcp/tcp.c
View file

@ -406,10 +406,9 @@ TimerThread(PVOID Context)
Timeout.QuadPart = (LONGLONG) (Next - Current) * -1000000; /* 100 ms */
Status = KeWaitForSingleObject(&TimerLoopEvent, Executive, KernelMode,
FALSE, &Timeout);
if (STATUS_SUCCESS == Status) {
PsTerminateSystemThread(STATUS_SUCCESS);
if (Status != STATUS_TIMEOUT) {
PsTerminateSystemThread(Status);
}
ASSERT(STATUS_TIMEOUT == Status);
TcpipRecursiveMutexEnter( &TCPLock, TRUE );
TimerOskitTCP( Next == NextFast, Next == NextSlow );