[ros-diffs] [arty] 19966: Revert my patch from yesterday. Need to
take more time to work on it.
arty at svn.reactos.com
arty at svn.reactos.com
Thu Dec 8 18:09:58 CET 2005
Revert my patch from yesterday. Need to take more time to work on it.
Modified: trunk/reactos/drivers/lib/ip/network/receive.c
Modified: trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c
Modified: trunk/reactos/drivers/net/tcpip/include/tcp.h
Modified: trunk/reactos/drivers/net/tcpip/include/tcpip.h
Modified: trunk/reactos/drivers/net/tcpip/include/titypes.h
Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c
Modified: trunk/reactos/drivers/net/tcpip/tcpip/fileobjs.c
Modified: trunk/reactos/drivers/net/tcpip/tcpip/main.c
_____
Modified: trunk/reactos/drivers/lib/ip/network/receive.c
--- trunk/reactos/drivers/lib/ip/network/receive.c 2005-12-08
17:09:25 UTC (rev 19965)
+++ trunk/reactos/drivers/lib/ip/network/receive.c 2005-12-08
17:09:47 UTC (rev 19966)
@@ -521,8 +521,6 @@
* IPPacket = Pointer to IP packet
*/
{
- IP_ADDRESS Address;
-
TI_DbgPrint(DEBUG_IP, ("Received IPv4 datagram.\n"));
IPPacket->HeaderSize = (((PIPv4_HEADER)IPPacket->Header)->VerIHL &
0x0F) << 2;
@@ -564,16 +562,7 @@
/* FIXME: Should we allow packets to be received on the wrong
interface? */
/* XXX Find out if this packet is destined for us */
-
- if( AddrLocateADEv4( IPPacket->DstAddr.Address.IPv4Address,
&Address ) ) {
- ProcessFragment( IF, IPPacket );
- } else {
- PNEIGHBOR_CACHE_ENTRY NCE;
-
- if((NCE = RouteGetRouteToDestination( &IPPacket->DstAddr ))) {
- IPSendDatagram( IPPacket, NCE, NULL, NULL );
- }
- }
+ ProcessFragment(IF, IPPacket);
#if 0
} else {
/* This packet is not destined for us. If we are a router,
_____
Modified: trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c
--- trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c 2005-12-08
17:09:25 UTC (rev 19965)
+++ trunk/reactos/drivers/lib/ip/transport/tcp/tcp.c 2005-12-08
17:09:47 UTC (rev 19966)
@@ -647,8 +647,4 @@
return STATUS_SUCCESS;
}
-void TCPMarkForDisconnect( PCONNECTION_ENDPOINT Context, BOOLEAN Marked
) {
- Context->Disconnecting = Marked;
-}
-
/* EOF */
_____
Modified: trunk/reactos/drivers/net/tcpip/include/tcp.h
--- trunk/reactos/drivers/net/tcpip/include/tcp.h 2005-12-08
17:09:25 UTC (rev 19965)
+++ trunk/reactos/drivers/net/tcpip/include/tcp.h 2005-12-08
17:09:47 UTC (rev 19966)
@@ -38,9 +38,6 @@
#define TCPOPTLEN_MAX_SEG_SIZE 0x4
-#define TCP_CANCEL_DISCONNECT 0
-#define TCP_CANCEL_CLOSE 1
-
/* Data offset; 32-bit words (leftmost 4 bits); convert to bytes */
#define TCP_DATA_OFFSET(DataOffset)(((DataOffset) & 0xF0) >> (4-2))
@@ -60,13 +57,6 @@
KEVENT Event;
} SLEEPING_THREAD, *PSLEEPING_THREAD;
-typedef struct _CANCEL_REQUEST {
- LIST_ENTRY Entry;
- PVOID Context;
- PIRP Irp;
- UINT Flags, Type;
-} CANCEL_REQUEST, *PCANCEL_REQUEST;
-
/* Retransmission timeout constants */
/* Lower bound for retransmission timeout in TCP timer ticks */
@@ -186,7 +176,4 @@
NTSTATUS TCPShutdown(
VOID);
-void TCPMarkForDisconnect(
- PCONNECTION_ENDPOINT Connection, BOOLEAN Marked );
-
#endif /* __TCP_H */
_____
Modified: trunk/reactos/drivers/net/tcpip/include/tcpip.h
--- trunk/reactos/drivers/net/tcpip/include/tcpip.h 2005-12-08
17:09:25 UTC (rev 19965)
+++ trunk/reactos/drivers/net/tcpip/include/tcpip.h 2005-12-08
17:09:47 UTC (rev 19966)
@@ -188,9 +188,6 @@
extern KSPIN_LOCK InterfaceListLock;
extern LIST_ENTRY AddressFileListHead;
extern KSPIN_LOCK AddressFileListLock;
-extern LIST_ENTRY CancelQueue;
-extern KSPIN_LOCK CancelQueueLock;
-extern WORK_QUEUE_ITEM CancelQueueWork;
extern NDIS_HANDLE GlobalPacketPool;
extern NDIS_HANDLE GlobalBufferPool;
extern KSPIN_LOCK EntityListLock;
_____
Modified: trunk/reactos/drivers/net/tcpip/include/titypes.h
--- trunk/reactos/drivers/net/tcpip/include/titypes.h 2005-12-08
17:09:25 UTC (rev 19965)
+++ trunk/reactos/drivers/net/tcpip/include/titypes.h 2005-12-08
17:09:47 UTC (rev 19966)
@@ -308,8 +308,6 @@
* notification service to the client */
UINT SignalState; /* Active signals from oskit */
BOOLEAN Signalled; /* Are we a member of the signal list */
- BOOLEAN Disconnecting; /* Cancelling an irp .. we need to leave
it
- * alone for now */
} CONNECTION_ENDPOINT, *PCONNECTION_ENDPOINT;
_____
Modified: trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c
--- trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2005-12-08
17:09:25 UTC (rev 19965)
+++ trunk/reactos/drivers/net/tcpip/tcpip/dispatch.c 2005-12-08
17:09:47 UTC (rev 19966)
@@ -12,8 +12,6 @@
#include "precomp.h"
#include <pseh/pseh.h>
-extern VOID DeleteConnectionEndpoint( PCONNECTION_ENDPOINT Endpoint );
-
NTSTATUS DispPrepareIrpForCancel(
PTRANSPORT_CONTEXT Context,
PIRP Irp,
@@ -137,56 +135,7 @@
TI_DbgPrint(DEBUG_IRP, ("Done Completing IRP\n"));
}
-VOID DDKAPI CancelQueuePassiveHandler( PVOID CancelRequestVoid )
-{
- KIRQL OldIrql;
- PCANCEL_REQUEST CancelReq;
- PLIST_ENTRY CqEntry;
- KeAcquireSpinLock( &CancelQueueLock, &OldIrql );
-
- TI_DbgPrint(DEBUG_IRP,("CANCEL QUEUE: Starting\n"));
-
- for( CqEntry = CancelQueue.Flink;
- CqEntry != &CancelQueue;
- ) {
- CancelReq = CONTAINING_RECORD(CqEntry, CANCEL_REQUEST, Entry);
- ExInterlockedRemoveHeadList( &CancelQueue, &CancelQueueLock );
- CqEntry = CancelQueue.Flink;
-
- KeReleaseSpinLock( &CancelQueueLock, OldIrql );
-
- TI_DbgPrint(DEBUG_IRP,("CANCEL QUEUE: Executing %x\n",
CancelReq));
-
- switch( CancelReq->Type ) {
- case TCP_CANCEL_DISCONNECT:
- TCPDisconnect
- ( CancelReq->Context,
- CancelReq->Flags,
- NULL,
- NULL,
- DispDataRequestComplete,
- CancelReq->Irp );
- break;
-
- case TCP_CANCEL_CLOSE:
- TCPClose( CancelReq->Context );
- DeleteConnectionEndpoint( CancelReq->Context );
- break;
- }
-
- TCPMarkForDisconnect( CancelReq->Context, FALSE );
-
- ExFreePool( CancelReq );
-
- KeAcquireSpinLock( &CancelQueueLock, &OldIrql );
- }
-
- TI_DbgPrint(DEBUG_IRP,("CANCEL QUEUE: Ending\n"));
-
- KeReleaseSpinLock( &CancelQueueLock, OldIrql );
-}
-
VOID DDKAPI DispCancelRequest(
PDEVICE_OBJECT Device,
PIRP Irp)
@@ -201,7 +150,6 @@
PTRANSPORT_CONTEXT TranContext;
PFILE_OBJECT FileObject;
UCHAR MinorFunction;
- PCANCEL_REQUEST CancelRequest;
/*NTSTATUS Status = STATUS_SUCCESS;*/
TI_DbgPrint(DEBUG_IRP, ("Called.\n"));
@@ -221,21 +169,23 @@
/* Try canceling the request */
switch(MinorFunction) {
case TDI_SEND:
+ TCPDisconnect
+ ( TranContext->Handle.ConnectionContext,
+ TDI_DISCONNECT_RELEASE,
+ NULL,
+ NULL,
+ DispDataRequestComplete,
+ Irp );
+ break;
+
case TDI_RECEIVE:
- CancelRequest = ExAllocatePoolWithTag
- ( sizeof(CANCEL_REQUEST), NonPagedPool,
FOURCC('T','c','k','O') );
- TCPMarkForDisconnect( TranContext->Handle.ConnectionContext,
TRUE );
- if( CancelRequest ) {
- TI_DbgPrint(DEBUG_IRP,("CANCEL QUEUE:-> %x\n",
CancelRequest));
- CancelRequest->Flags = TDI_DISCONNECT_RELEASE |
- (MinorFunction == TDI_RECEIVE) ? TDI_DISCONNECT_ABORT :
0;
- CancelRequest->Context =
TranContext->Handle.ConnectionContext;
- CancelRequest->Irp = Irp;
- CancelRequest->Type = TCP_CANCEL_DISCONNECT;
- ExInterlockedInsertTailList
- ( &CancelQueue, &CancelRequest->Entry, &CancelQueueLock
);
- ExQueueWorkItem( &CancelQueueWork, CriticalWorkQueue );
- }
+ TCPDisconnect
+ ( TranContext->Handle.ConnectionContext,
+ TDI_DISCONNECT_ABORT | TDI_DISCONNECT_RELEASE,
+ NULL,
+ NULL,
+ DispDataRequestComplete,
+ Irp );
break;
case TDI_SEND_DATAGRAM:
_____
Modified: trunk/reactos/drivers/net/tcpip/tcpip/fileobjs.c
--- trunk/reactos/drivers/net/tcpip/tcpip/fileobjs.c 2005-12-08
17:09:25 UTC (rev 19965)
+++ trunk/reactos/drivers/net/tcpip/tcpip/fileobjs.c 2005-12-08
17:09:47 UTC (rev 19966)
@@ -10,6 +10,7 @@
#include "precomp.h"
+
/* List of all address file objects managed by this driver */
LIST_ENTRY AddressFileListHead;
KSPIN_LOCK AddressFileListLock;
@@ -351,7 +352,6 @@
KIRQL OldIrql;
PADDRESS_FILE AddrFile;
NTSTATUS Status = STATUS_SUCCESS;
- PCANCEL_REQUEST CancelReq;
TI_DbgPrint(MID_TRACE, ("Called.\n"));
@@ -369,16 +369,8 @@
switch (AddrFile->Protocol) {
case IPPROTO_TCP:
TCPFreePort( AddrFile->Port );
- if( AddrFile->Listener ) {
- CancelReq = ExAllocatePoolWithTag
- ( sizeof(CANCEL_REQUEST), NonPagedPool,
FOURCC('T','c','l','s') );
- if( CancelReq ) {
- CancelReq->Type = TCP_CANCEL_CLOSE;
- CancelReq->Context = AddrFile->Listener;
- AddrFile->Listener = NULL;
- ExQueueWorkItem( &CancelQueueWork, CriticalWorkQueue );
- }
- }
+ if( AddrFile->Listener )
+ TCPClose( AddrFile->Listener );
break;
case IPPROTO_UDP:
@@ -474,19 +466,15 @@
{
PCONNECTION_ENDPOINT Connection;
NTSTATUS Status = STATUS_SUCCESS;
- PCANCEL_REQUEST CancelReq;
TI_DbgPrint(MID_TRACE, ("Called.\n"));
Connection = Request->Handle.ConnectionContext;
- CancelReq = ExAllocatePoolWithTag
- ( sizeof(CANCEL_REQUEST), NonPagedPool, FOURCC('T','c','l','s')
);
- if( CancelReq ) {
- CancelReq->Type = TCP_CANCEL_CLOSE;
- CancelReq->Context = Connection;
- ExQueueWorkItem( &CancelQueueWork, CriticalWorkQueue );
- }
+ TcpipRecursiveMutexEnter( &TCPLock, TRUE );
+ TCPClose(Connection);
+ DeleteConnectionEndpoint(Connection);
+ TcpipRecursiveMutexLeave( &TCPLock );
TI_DbgPrint(MAX_TRACE, ("Leaving.\n"));
_____
Modified: trunk/reactos/drivers/net/tcpip/tcpip/main.c
--- trunk/reactos/drivers/net/tcpip/tcpip/main.c 2005-12-08
17:09:25 UTC (rev 19965)
+++ trunk/reactos/drivers/net/tcpip/tcpip/main.c 2005-12-08
17:09:47 UTC (rev 19966)
@@ -35,12 +35,6 @@
KSPIN_LOCK IpWorkLock;
WORK_QUEUE_ITEM IpWorkItem;
-/* Cancel Queue */
-LIST_ENTRY CancelQueue;
-KSPIN_LOCK CancelQueueLock;
-WORK_QUEUE_ITEM CancelQueueWork;
-extern VOID DDKAPI CancelQueuePassiveHandler( PVOID Context );
-
VOID TiWriteErrorLog(
PDRIVER_OBJECT DriverContext,
NTSTATUS ErrorCode,
@@ -815,11 +809,6 @@
InitializeListHead(&InterfaceListHead);
KeInitializeSpinLock(&InterfaceListLock);
- /* Initialize cancellation queue */
- InitializeListHead(&CancelQueue);
- KeInitializeSpinLock(&CancelQueueLock);
- ExInitializeWorkItem( &CancelQueueWork, CancelQueuePassiveHandler,
NULL );
-
/* Initialize network level protocol subsystem */
IPStartup(RegistryPath);
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://www.reactos.org/pipermail/ros-diffs/attachments/20051208/64f3e7be/attachment.html
More information about the Ros-diffs
mailing list