Merge aicom-network-branch (without NDIS changes for now)
[reactos.git] / reactos / lib / drivers / ip / transport / tcp / tcp.c
index 6768536..ae02e4a 100644 (file)
 LONG TCP_IPIdentification = 0;
 static BOOLEAN TCPInitialized = FALSE;
 static NPAGED_LOOKASIDE_LIST TCPSegmentList;
-LIST_ENTRY SignalledConnectionsList;
-KSPIN_LOCK SignalledConnectionsLock;
-LIST_ENTRY SleepingThreadsList;
-FAST_MUTEX SleepingThreadsLock;
-RECURSIVE_MUTEX TCPLock;
 PORT_SET TCPPorts;
+CLIENT_DATA ClientInfo;
 
-static VOID HandleSignalledConnection( PCONNECTION_ENDPOINT Connection ) {
-    NTSTATUS Status = STATUS_SUCCESS;
-    PTCP_COMPLETION_ROUTINE Complete;
-    PTDI_BUCKET Bucket;
-    PLIST_ENTRY Entry;
-    PIRP Irp;
-    PMDL Mdl;
+VOID HandleSignalledConnection(PCONNECTION_ENDPOINT Connection)
+{
+        PTDI_BUCKET Bucket;
+        PLIST_ENTRY Entry;
+        NTSTATUS Status;
+        PIRP Irp;
+        PMDL Mdl;
+        ULONG SocketError = 0;
+        KIRQL OldIrql;
+        PTCP_COMPLETION_ROUTINE Complete;
 
-    ASSERT_LOCKED(&TCPLock);
+        if (ClientInfo.Unlocked)
+            LockObjectAtDpcLevel(Connection);
 
-    TI_DbgPrint(MID_TRACE,("Handling signalled state on %x (%x)\n",
-                           Connection, Connection->SocketContext));
+        TI_DbgPrint(MID_TRACE,("Handling signalled state on %x (%x)\n",
+                               Connection, Connection->SocketContext));
 
-    if( Connection->SignalState & SEL_FIN ) {
-        TI_DbgPrint(DEBUG_TCP, ("EOF From socket\n"));
+        if( Connection->SignalState & SEL_FIN ) {
+            TI_DbgPrint(DEBUG_TCP, ("EOF From socket\n"));
 
-        while ((Entry = ExInterlockedRemoveHeadList( &Connection->ReceiveRequest,
-                                                     &Connection->Lock )) != NULL)
-        {
-           Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
-           Complete = Bucket->Request.RequestNotifyObject;
+            /* If OskitTCP initiated the disconnect, try to read the socket error that occurred */
+            if (Connection->SocketContext)
+                SocketError = TCPTranslateError(OskitTCPGetSocketError(Connection->SocketContext));
 
-           /* We have to notify oskittcp of the abortion */
-           TCPDisconnect
-            ( Connection,
-              TDI_DISCONNECT_RELEASE | TDI_DISCONNECT_ABORT,
-              NULL,
-              NULL,
-              Bucket->Request.RequestNotifyObject,
-              (PIRP)Bucket->Request.RequestContext );
+            /* Default to STATUS_CANCELLED if we initiated the disconnect or no socket error was reported */
+            if (!Connection->SocketContext || !SocketError)
+                SocketError = STATUS_CANCELLED;
 
-           Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 );
+            while (!IsListEmpty(&Connection->ReceiveRequest))
+            {
+               Entry = RemoveHeadList( &Connection->ReceiveRequest );
 
-           exFreePool(Bucket);
-        }
+               Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
 
-        while ((Entry = ExInterlockedRemoveHeadList( &Connection->SendRequest,
-                                                     &Connection->Lock )) != NULL)
-        {
-           Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
-           Complete = Bucket->Request.RequestNotifyObject;
+               Bucket->Status = SocketError;
+               Bucket->Information = 0;
 
-           /* We have to notify oskittcp of the abortion */
-           TCPDisconnect
-            ( Connection,
-              TDI_DISCONNECT_RELEASE,
-              NULL,
-              NULL,
-              Bucket->Request.RequestNotifyObject,
-              (PIRP)Bucket->Request.RequestContext );
+               InsertTailList(&Connection->CompletionQueue, &Bucket->Entry);
+            }
 
-           Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 );
+            while (!IsListEmpty(&Connection->SendRequest))
+            {
+               Entry = RemoveHeadList( &Connection->SendRequest );
 
-           exFreePool(Bucket);
-        }
+               Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
 
-        while ((Entry = ExInterlockedRemoveHeadList( &Connection->ListenRequest,
-                                                     &Connection->Lock )) != NULL)
-        {
-           Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
-           Complete = Bucket->Request.RequestNotifyObject;
+               Bucket->Status = SocketError;
+               Bucket->Information = 0;
 
-           /* We have to notify oskittcp of the abortion */
-           TCPAbortListenForSocket(Connection->AddressFile->Listener,
-                               Connection);
+               InsertTailList(&Connection->CompletionQueue, &Bucket->Entry);
+            }
 
-           Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 );
-        }
+            while (!IsListEmpty(&Connection->ListenRequest))
+            {
+               Entry = RemoveHeadList( &Connection->ListenRequest );
 
-        while ((Entry = ExInterlockedRemoveHeadList( &Connection->ConnectRequest,
-                                                     &Connection->Lock )) != NULL)
-        {
-           Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
-           Complete = Bucket->Request.RequestNotifyObject;
+               Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
 
-           Complete( Bucket->Request.RequestContext, STATUS_CANCELLED, 0 );
-        }
+               Bucket->Status = SocketError;
+               Bucket->Information = 0;
+               DereferenceObject(Bucket->AssociatedEndpoint);
 
-        Connection->SignalState = 0;
-    }
+               InsertTailList(&Connection->CompletionQueue, &Bucket->Entry);
+            }
 
-    /* Things that can happen when we try the initial connection */
-    if( Connection->SignalState & SEL_CONNECT ) {
-        while( (Entry = ExInterlockedRemoveHeadList( &Connection->ConnectRequest,
-                                                     &Connection->Lock )) != NULL ) {
-            
-            TI_DbgPrint(DEBUG_TCP, ("Connect Event\n"));
+            while (!IsListEmpty(&Connection->ConnectRequest))
+            {
+               Entry = RemoveHeadList( &Connection->ConnectRequest );
 
-            Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
-            Complete = Bucket->Request.RequestNotifyObject;
-            TI_DbgPrint(DEBUG_TCP,
-                        ("Completing Request %x\n", Bucket->Request.RequestContext));
+               Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
+
+               Bucket->Status = SocketError;
+               Bucket->Information = 0;
 
-            Complete( Bucket->Request.RequestContext, STATUS_SUCCESS, 0 );
+               InsertTailList(&Connection->CompletionQueue, &Bucket->Entry);
+            }
 
-            /* Frees the bucket allocated in TCPConnect */
-            exFreePool( Bucket );
+            Connection->SignalState = SEL_FIN;
         }
-    }
 
-    if( Connection->SignalState & SEL_ACCEPT ) {
-        /* Handle readable on a listening socket --
-         * TODO: Implement filtering
-         */
+        /* Things that can happen when we try the initial connection */
+        if( Connection->SignalState & SEL_CONNECT ) {
+            while (!IsListEmpty(&Connection->ConnectRequest)) {
+               Entry = RemoveHeadList( &Connection->ConnectRequest );
 
-        TI_DbgPrint(DEBUG_TCP,("Accepting new connection on %x (Queue: %s)\n",
-                               Connection,
-                               IsListEmpty(&Connection->ListenRequest) ?
-                               "empty" : "nonempty"));
+               Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
 
-        while( (Entry = ExInterlockedRemoveHeadList( &Connection->ListenRequest,
-                                                     &Connection->Lock )) != NULL ) {
-            PIO_STACK_LOCATION IrpSp;
+               Bucket->Status = STATUS_SUCCESS;
+               Bucket->Information = 0;
 
-            Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
-            Complete = Bucket->Request.RequestNotifyObject;
+               InsertTailList(&Connection->CompletionQueue, &Bucket->Entry);
+           }
+       }
 
-            Irp = Bucket->Request.RequestContext;
-            IrpSp = IoGetCurrentIrpStackLocation( Irp );
+       if( Connection->SignalState & SEL_ACCEPT ) {
+           /* Handle readable on a listening socket --
+            * TODO: Implement filtering
+            */
+           TI_DbgPrint(DEBUG_TCP,("Accepting new connection on %x (Queue: %s)\n",
+                                  Connection,
+                                  IsListEmpty(&Connection->ListenRequest) ?
+                                  "empty" : "nonempty"));
 
-            TI_DbgPrint(DEBUG_TCP,("Getting the socket\n"));
-            Status = TCPServiceListeningSocket
-                ( Connection->AddressFile->Listener,
-                  Bucket->AssociatedEndpoint,
-                  (PTDI_REQUEST_KERNEL)&IrpSp->Parameters );
+           while (!IsListEmpty(&Connection->ListenRequest)) {
+               PIO_STACK_LOCATION IrpSp;
 
-            TI_DbgPrint(DEBUG_TCP,("Socket: Status: %x\n"));
+               Entry = RemoveHeadList( &Connection->ListenRequest );
 
-            if( Status == STATUS_PENDING ) {
-                ExInterlockedInsertHeadList( &Connection->ListenRequest, &Bucket->Entry, &Connection->Lock );
-                break;
-            } else {
-                Complete( Bucket->Request.RequestContext, Status, 0 );
-                exFreePool( Bucket );
-            }
-        }
-    }
+               Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
 
-    /* Things that happen after we're connected */
-    if( Connection->SignalState & SEL_READ ) {
-        TI_DbgPrint(DEBUG_TCP,("Readable: irp list %s\n",
-                               IsListEmpty(&Connection->ReceiveRequest) ?
-                               "empty" : "nonempty"));
+               Irp = Bucket->Request.RequestContext;
+               IrpSp = IoGetCurrentIrpStackLocation( Irp );
 
-        while( (Entry = ExInterlockedRemoveHeadList( &Connection->ReceiveRequest,
-                                                     &Connection->Lock )) != NULL ) {
-            OSK_UINT RecvLen = 0, Received = 0;
-            PVOID RecvBuffer = 0;
+               TI_DbgPrint(DEBUG_TCP,("Getting the socket\n"));
 
-            Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
-            Complete = Bucket->Request.RequestNotifyObject;
+               Status = TCPServiceListeningSocket
+                   ( Connection->AddressFile->Listener,
+                     Bucket->AssociatedEndpoint,
+                     (PTDI_REQUEST_KERNEL)&IrpSp->Parameters );
 
-            Irp = Bucket->Request.RequestContext;
-            Mdl = Irp->MdlAddress;
+               TI_DbgPrint(DEBUG_TCP,("Socket: Status: %x\n"));
 
-            TI_DbgPrint(DEBUG_TCP,
-                        ("Getting the user buffer from %x\n", Mdl));
+               if( Status == STATUS_PENDING ) {
+                   InsertHeadList( &Connection->ListenRequest, &Bucket->Entry );
+                   break;
+               } else {
+                   Bucket->Status = Status;
+                   Bucket->Information = 0;
+                   DereferenceObject(Bucket->AssociatedEndpoint);
 
-            NdisQueryBuffer( Mdl, &RecvBuffer, &RecvLen );
+                   InsertTailList(&Connection->CompletionQueue, &Bucket->Entry);
+               }
+          }
+      }
 
-            TI_DbgPrint(DEBUG_TCP,
-                        ("Reading %d bytes to %x\n", RecvLen, RecvBuffer));
+      /* Things that happen after we're connected */
+      if( Connection->SignalState & SEL_READ ) {
+          TI_DbgPrint(DEBUG_TCP,("Readable: irp list %s\n",
+                                 IsListEmpty(&Connection->ReceiveRequest) ?
+                                 "empty" : "nonempty"));
 
-            TI_DbgPrint(DEBUG_TCP, ("Connection: %x\n", Connection));
-            TI_DbgPrint
-                (DEBUG_TCP,
-                 ("Connection->SocketContext: %x\n",
-                  Connection->SocketContext));
-            TI_DbgPrint(DEBUG_TCP, ("RecvBuffer: %x\n", RecvBuffer));
-
-            Status = TCPTranslateError
-                ( OskitTCPRecv( Connection->SocketContext,
-                                RecvBuffer,
-                                RecvLen,
-                                &Received,
-                                0 ) );
-
-            TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Received));
-
-            if( Status == STATUS_SUCCESS ) {
-                TI_DbgPrint(DEBUG_TCP,("Received %d bytes with status %x\n",
-                                       Received, Status));
-
-                Complete( Bucket->Request.RequestContext,
-                          STATUS_SUCCESS, Received );
-                exFreePool( Bucket );
-            } else if( Status == STATUS_PENDING ) {
-                ExInterlockedInsertHeadList
-                    ( &Connection->ReceiveRequest, &Bucket->Entry, &Connection->Lock );
-                break;
-            } else {
-                TI_DbgPrint(DEBUG_TCP,
-                            ("Completing Receive request: %x %x\n",
-                             Bucket->Request, Status));
-                Complete( Bucket->Request.RequestContext, Status, 0 );
-                exFreePool( Bucket );
-            }
-        }
-    }
-    if( Connection->SignalState & SEL_WRITE ) {
-        TI_DbgPrint(DEBUG_TCP,("Writeable: irp list %s\n",
-                               IsListEmpty(&Connection->SendRequest) ?
-                               "empty" : "nonempty"));
+           while (!IsListEmpty(&Connection->ReceiveRequest)) {
+               OSK_UINT RecvLen = 0, Received = 0;
+               PVOID RecvBuffer = 0;
 
-        while( (Entry = ExInterlockedRemoveHeadList( &Connection->SendRequest,
-                                                     &Connection->Lock )) != NULL ) {
-            OSK_UINT SendLen = 0, Sent = 0;
-            PVOID SendBuffer = 0;
+               Entry = RemoveHeadList( &Connection->ReceiveRequest );
 
-            Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
-            Complete = Bucket->Request.RequestNotifyObject;
+               Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
 
-            Irp = Bucket->Request.RequestContext;
-            Mdl = Irp->MdlAddress;
+               Irp = Bucket->Request.RequestContext;
+               Mdl = Irp->MdlAddress;
 
-            TI_DbgPrint(DEBUG_TCP,
-                        ("Getting the user buffer from %x\n", Mdl));
+               TI_DbgPrint(DEBUG_TCP,
+                           ("Getting the user buffer from %x\n", Mdl));
 
-            NdisQueryBuffer( Mdl, &SendBuffer, &SendLen );
+               NdisQueryBuffer( Mdl, &RecvBuffer, &RecvLen );
 
-            TI_DbgPrint(DEBUG_TCP,
-                        ("Writing %d bytes to %x\n", SendLen, SendBuffer));
+               TI_DbgPrint(DEBUG_TCP,
+                           ("Reading %d bytes to %x\n", RecvLen, RecvBuffer));
 
-            TI_DbgPrint(DEBUG_TCP, ("Connection: %x\n", Connection));
-            TI_DbgPrint
+               TI_DbgPrint(DEBUG_TCP, ("Connection: %x\n", Connection));
+               TI_DbgPrint
+                   (DEBUG_TCP,
+                    ("Connection->SocketContext: %x\n",
+                     Connection->SocketContext));
+               TI_DbgPrint(DEBUG_TCP, ("RecvBuffer: %x\n", RecvBuffer));
+
+               Status = TCPTranslateError
+                    ( OskitTCPRecv( Connection->SocketContext,
+                                    RecvBuffer,
+                                    RecvLen,
+                                    &Received,
+                                    0 ) );
+
+               TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Received));
+
+               if( Status == STATUS_PENDING ) {
+                   InsertHeadList( &Connection->ReceiveRequest, &Bucket->Entry );
+                   break;
+               } else {
+                   TI_DbgPrint(DEBUG_TCP,
+                               ("Completing Receive request: %x %x\n",
+                                Bucket->Request, Status));
+
+                   Bucket->Status = Status;
+                   Bucket->Information = (Status == STATUS_SUCCESS) ? Received : 0;
+
+                   InsertTailList(&Connection->CompletionQueue, &Bucket->Entry);
+               }
+           }
+       }
+       if( Connection->SignalState & SEL_WRITE ) {
+           TI_DbgPrint(DEBUG_TCP,("Writeable: irp list %s\n",
+                                  IsListEmpty(&Connection->SendRequest) ?
+                                  "empty" : "nonempty"));
+
+           while (!IsListEmpty(&Connection->SendRequest)) {
+               OSK_UINT SendLen = 0, Sent = 0;
+               PVOID SendBuffer = 0;
+
+               Entry = RemoveHeadList( &Connection->SendRequest );
+
+               Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
+
+               Irp = Bucket->Request.RequestContext;
+               Mdl = Irp->MdlAddress;
+
+               TI_DbgPrint(DEBUG_TCP,
+                           ("Getting the user buffer from %x\n", Mdl));
+
+               NdisQueryBuffer( Mdl, &SendBuffer, &SendLen );
+
+               TI_DbgPrint(DEBUG_TCP,
+                           ("Writing %d bytes to %x\n", SendLen, SendBuffer));
+
+               TI_DbgPrint(DEBUG_TCP, ("Connection: %x\n", Connection));
+               TI_DbgPrint
                 (DEBUG_TCP,
                  ("Connection->SocketContext: %x\n",
                   Connection->SocketContext));
 
-            Status = TCPTranslateError
-                ( OskitTCPSend( Connection->SocketContext,
-                                SendBuffer,
-                                SendLen,
-                                &Sent,
-                                0 ) );
-
-            TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Sent));
-
-            if( Status == STATUS_SUCCESS ) {
-                TI_DbgPrint(DEBUG_TCP,("Sent %d bytes with status %x\n",
-                                       Sent, Status));
-
-                Complete( Bucket->Request.RequestContext,
-                          STATUS_SUCCESS, Sent );
-                exFreePool( Bucket );
-            } else if( Status == STATUS_PENDING ) {
-                ExInterlockedInsertHeadList
-                    ( &Connection->SendRequest, &Bucket->Entry, &Connection->Lock );
-                break;
-            } else {
-                TI_DbgPrint(DEBUG_TCP,
-                            ("Completing Send request: %x %x\n",
-                             Bucket->Request, Status));
-                Complete( Bucket->Request.RequestContext, Status, 0 );
-                exFreePool( Bucket );
-            }
-        }
-    }
+               Status = TCPTranslateError
+                   ( OskitTCPSend( Connection->SocketContext,
+                                   SendBuffer,
+                                   SendLen,
+                                   &Sent,
+                                   0 ) );
+
+               TI_DbgPrint(DEBUG_TCP,("TCP Bytes: %d\n", Sent));
+
+               if( Status == STATUS_PENDING ) {
+                   InsertHeadList( &Connection->SendRequest, &Bucket->Entry );
+                   break;
+               } else {
+                   TI_DbgPrint(DEBUG_TCP,
+                               ("Completing Send request: %x %x\n",
+                               Bucket->Request, Status));
+
+                   Bucket->Status = Status;
+                   Bucket->Information = (Status == STATUS_SUCCESS) ? Sent : 0;
+
+                   InsertTailList(&Connection->CompletionQueue, &Bucket->Entry);
+               }
+           }
+       }
+
+       ReferenceObject(Connection);
+       if (ClientInfo.Unlocked)
+       {
+           UnlockObjectFromDpcLevel(Connection);
+           KeReleaseSpinLock(&ClientInfo.Lock, ClientInfo.OldIrql);
+       }
+       else
+       {
+           UnlockObject(Connection, Connection->OldIrql);
+       }
+
+       while ((Entry = ExInterlockedRemoveHeadList(&Connection->CompletionQueue,
+                                                   &Connection->Lock)))
+       {
+           Bucket = CONTAINING_RECORD(Entry, TDI_BUCKET, Entry);
+           Complete = Bucket->Request.RequestNotifyObject;
 
-    Connection->SignalState = 0;
-    Connection->Signalled = FALSE;
+           Complete(Bucket->Request.RequestContext, Bucket->Status, Bucket->Information);
+
+           ExFreePoolWithTag(Bucket, TDI_BUCKET_TAG);
+       }
+
+       if (!ClientInfo.Unlocked)
+       {
+           LockObject(Connection, &OldIrql);
+       }
+       else
+       {
+           KeAcquireSpinLock(&ClientInfo.Lock, &ClientInfo.OldIrql);
+       }
+       DereferenceObject(Connection);
+
+       /* If the socket is dead, remove the reference we added for oskit */
+       if (Connection->SignalState & SEL_FIN)
+           DereferenceObject(Connection);
 }
 
-VOID DrainSignals() {
-    PCONNECTION_ENDPOINT Connection;
-    PLIST_ENTRY ListEntry;
+VOID ConnectionFree(PVOID Object) {
+    PCONNECTION_ENDPOINT Connection = Object;
+    KIRQL OldIrql;
+
+    TI_DbgPrint(DEBUG_TCP, ("Freeing TCP Endpoint\n"));
 
-    while( (ListEntry = ExInterlockedRemoveHeadList(&SignalledConnectionsList,
-                                                    &SignalledConnectionsLock)) != NULL) {
-        Connection = CONTAINING_RECORD( ListEntry, CONNECTION_ENDPOINT,
-                                        SignalList );
-        HandleSignalledConnection( Connection );
-    }
+    TcpipAcquireSpinLock(&ConnectionEndpointListLock, &OldIrql);
+    RemoveEntryList(&Connection->ListEntry);
+    TcpipReleaseSpinLock(&ConnectionEndpointListLock, OldIrql);
+
+    ExFreePoolWithTag( Connection, CONN_ENDPT_TAG );
 }
 
 PCONNECTION_ENDPOINT TCPAllocateConnectionEndpoint( PVOID ClientContext ) {
     PCONNECTION_ENDPOINT Connection =
-        exAllocatePool(NonPagedPool, sizeof(CONNECTION_ENDPOINT));
+        ExAllocatePoolWithTag(NonPagedPool, sizeof(CONNECTION_ENDPOINT),
+                              CONN_ENDPT_TAG);
     if (!Connection)
         return Connection;
 
@@ -308,28 +326,34 @@ PCONNECTION_ENDPOINT TCPAllocateConnectionEndpoint( PVOID ClientContext ) {
     RtlZeroMemory(Connection, sizeof(CONNECTION_ENDPOINT));
 
     /* Initialize spin lock that protects the connection endpoint file object */
-    TcpipInitializeSpinLock(&Connection->Lock);
+    KeInitializeSpinLock(&Connection->Lock);
     InitializeListHead(&Connection->ConnectRequest);
     InitializeListHead(&Connection->ListenRequest);
     InitializeListHead(&Connection->ReceiveRequest);
     InitializeListHead(&Connection->SendRequest);
+    InitializeListHead(&Connection->CompletionQueue);
 
     /* Save client context pointer */
     Connection->ClientContext = ClientContext;
 
-    return Connection;
-}
+    /* Add an extra reference for oskit */
+    Connection->RefCount = 2;
+    Connection->Free = ConnectionFree;
 
-VOID TCPFreeConnectionEndpoint( PCONNECTION_ENDPOINT Connection ) {
-    TI_DbgPrint(DEBUG_TCP, ("Freeing TCP Endpoint\n"));
-    exFreePool( Connection );
+    /* Add connection endpoint to global list */
+    ExInterlockedInsertTailList(&ConnectionEndpointListHead,
+                                &Connection->ListEntry,
+                                &ConnectionEndpointListLock);
+
+    return Connection;
 }
 
 NTSTATUS TCPSocket( PCONNECTION_ENDPOINT Connection,
                     UINT Family, UINT Type, UINT Proto ) {
     NTSTATUS Status;
+    KIRQL OldIrql;
 
-    ASSERT_LOCKED(&TCPLock);
+    LockObject(Connection, &OldIrql);
 
     TI_DbgPrint(DEBUG_TCP,("Called: Connection %x, Family %d, Type %d, "
                            "Proto %d\n",
@@ -346,6 +370,8 @@ NTSTATUS TCPSocket( PCONNECTION_ENDPOINT Connection,
     TI_DbgPrint(DEBUG_TCP,("Connection->SocketContext %x\n",
                            Connection->SocketContext));
 
+    UnlockObject(Connection, OldIrql);
+
     return Status;
 }
 
@@ -358,19 +384,22 @@ VOID TCPReceive(PIP_INTERFACE Interface, PIP_PACKET IPPacket)
  *     This is the low level interface for receiving TCP data
  */
 {
+    KIRQL OldIrql;
+
     TI_DbgPrint(DEBUG_TCP,("Sending packet %d (%d) to oskit\n",
                            IPPacket->TotalSize,
                            IPPacket->HeaderSize));
 
-    TcpipRecursiveMutexEnter( &TCPLock, TRUE );
+    KeAcquireSpinLock(&ClientInfo.Lock, &OldIrql);
+    ClientInfo.Unlocked = TRUE;
+    ClientInfo.OldIrql = OldIrql;
 
     OskitTCPReceiveDatagram( IPPacket->Header,
                              IPPacket->TotalSize,
                              IPPacket->HeaderSize );
 
-    DrainSignals();
-
-    TcpipRecursiveMutexLeave( &TCPLock );
+    ClientInfo.Unlocked = FALSE;
+    KeReleaseSpinLock(&ClientInfo.Lock, OldIrql);
 }
 
 /* event.c */
@@ -395,11 +424,6 @@ void TCPFree( void *ClientData,
               void *data, OSK_PCHAR file, OSK_UINT line );
 void TCPMemShutdown( void );
 
-int TCPSleep( void *ClientData, void *token, int priority, char *msg,
-              int tmio );
-
-void TCPWakeup( void *ClientData, void *token );
-
 OSKITTCP_EVENT_HANDLERS EventHandlers = {
     NULL,             /* Client Data */
     TCPSocketState,   /* SocketState */
@@ -407,8 +431,8 @@ OSKITTCP_EVENT_HANDLERS EventHandlers = {
     TCPFindInterface, /* FindInterface */
     TCPMalloc,        /* Malloc */
     TCPFree,          /* Free */
-    TCPSleep,         /* Sleep */
-    TCPWakeup         /* Wakeup */
+    NULL,             /* Sleep */
+    NULL,             /* Wakeup */
 };
 
 static KEVENT TimerLoopEvent;
@@ -434,7 +458,7 @@ TimerThread(PVOID Context)
     while ( 1 ) {
         if (Next == NextFast) {
             NextFast += 2;
-        }
+       }
         if (Next == NextSlow) {
             NextSlow += 5;
         }
@@ -446,12 +470,7 @@ TimerThread(PVOID Context)
             PsTerminateSystemThread(Status);
         }
 
-        TcpipRecursiveMutexEnter( &TCPLock, TRUE );
         TimerOskitTCP( Next == NextFast, Next == NextSlow );
-        if (Next == NextSlow) {
-            DrainSignals();
-        }
-        TcpipRecursiveMutexLeave( &TCPLock );
 
         Current = Next;
         if (10 <= Current) {
@@ -471,7 +490,6 @@ StartTimer(VOID)
                          TimerThread, NULL);
 }
 
-
 NTSTATUS TCPStartup(VOID)
 /*
  * FUNCTION: Initializes the TCP subsystem
@@ -481,11 +499,6 @@ NTSTATUS TCPStartup(VOID)
 {
     NTSTATUS Status;
 
-    TcpipRecursiveMutexInit( &TCPLock );
-    ExInitializeFastMutex( &SleepingThreadsLock );
-    KeInitializeSpinLock( &SignalledConnectionsLock );
-    InitializeListHead( &SleepingThreadsList );
-    InitializeListHead( &SignalledConnectionsList );
     Status = TCPMemStartup();
     if ( ! NT_SUCCESS(Status) ) {
         return Status;
@@ -497,10 +510,11 @@ NTSTATUS TCPStartup(VOID)
         return Status;
     }
 
-    TcpipRecursiveMutexEnter(&TCPLock, TRUE);
+    KeInitializeSpinLock(&ClientInfo.Lock);
+    ClientInfo.Unlocked = FALSE;
+
     RegisterOskitTCPEventHandlers( &EventHandlers );
     InitOskitTCP();
-    TcpipRecursiveMutexLeave(&TCPLock);
 
     /* Register this protocol with IP layer */
     IPRegisterProtocol(IPPROTO_TCP, TCPReceive);
@@ -561,8 +575,9 @@ NTSTATUS TCPTranslateError( int OskitError ) {
     case 0: Status = STATUS_SUCCESS; break;
     case OSK_EADDRNOTAVAIL: Status = STATUS_INVALID_ADDRESS; break;
     case OSK_EAFNOSUPPORT: Status = STATUS_INVALID_CONNECTION; break;
-    case OSK_ECONNREFUSED:
-    case OSK_ECONNRESET: Status = STATUS_REMOTE_NOT_LISTENING; break;
+    case OSK_ECONNREFUSED: Status = STATUS_REMOTE_NOT_LISTENING; break;
+    case OSK_ECONNRESET:
+    case OSK_ECONNABORTED: Status = STATUS_REMOTE_DISCONNECT; break;
     case OSK_EWOULDBLOCK:
     case OSK_EINPROGRESS: Status = STATUS_PENDING; break;
     case OSK_EINVAL: Status = STATUS_INVALID_PARAMETER; break;
@@ -595,11 +610,10 @@ NTSTATUS TCPConnect
     USHORT RemotePort;
     PTDI_BUCKET Bucket;
     PNEIGHBOR_CACHE_ENTRY NCE;
+    KIRQL OldIrql;
 
     TI_DbgPrint(DEBUG_TCP,("TCPConnect: Called\n"));
 
-    ASSERT_LOCKED(&TCPLock);
-
     Status = AddrBuildAddress
         ((PTRANSPORT_ADDRESS)ConnInfo->RemoteAddress,
          &RemoteAddress,
@@ -610,16 +624,6 @@ NTSTATUS TCPConnect
         return Status;
     }
 
-    if (!(NCE = RouteGetRouteToDestination(&RemoteAddress)))
-    {
-        return STATUS_NETWORK_UNREACHABLE;
-    }
-
-    if (Connection->State & SEL_FIN)
-    {
-        return STATUS_REMOTE_DISCONNECT;
-    }
-
     /* Freed in TCPSocketState */
     TI_DbgPrint(DEBUG_TCP,
                 ("Connecting to address %x:%x\n",
@@ -628,7 +632,29 @@ NTSTATUS TCPConnect
 
     AddressToConnect.sin_family = AF_INET;
     AddressToBind = AddressToConnect;
-    AddressToBind.sin_addr.s_addr = NCE->Interface->Unicast.Address.IPv4Address;
+
+    LockObject(Connection, &OldIrql);
+
+    if (!Connection->AddressFile)
+    {
+        UnlockObject(Connection, OldIrql);
+        return STATUS_INVALID_PARAMETER;
+    }
+
+    if (AddrIsUnspecified(&Connection->AddressFile->Address))
+    {
+        if (!(NCE = RouteGetRouteToDestination(&RemoteAddress)))
+        {
+            UnlockObject(Connection, OldIrql);
+            return STATUS_NETWORK_UNREACHABLE;
+        }
+
+        AddressToBind.sin_addr.s_addr = NCE->Interface->Unicast.Address.IPv4Address;
+    }
+    else
+    {
+        AddressToBind.sin_addr.s_addr = Connection->AddressFile->Address.Address.IPv4Address;
+    }
 
     Status = TCPTranslateError
         ( OskitTCPBind( Connection->SocketContext,
@@ -643,24 +669,27 @@ NTSTATUS TCPConnect
 
         Status = TCPTranslateError
             ( OskitTCPConnect( Connection->SocketContext,
-                               Connection,
                                &AddressToConnect,
                                sizeof(AddressToConnect) ) );
 
         if (Status == STATUS_PENDING)
         {
-            Bucket = exAllocatePool( NonPagedPool, sizeof(*Bucket) );
-            if( !Bucket ) return STATUS_NO_MEMORY;
+            Bucket = ExAllocatePoolWithTag( NonPagedPool, sizeof(*Bucket), TDI_BUCKET_TAG );
+            if( !Bucket )
+            {
+               UnlockObject(Connection, OldIrql);
+               return STATUS_NO_MEMORY;
+            }
             
             Bucket->Request.RequestNotifyObject = (PVOID)Complete;
             Bucket->Request.RequestContext = Context;
-            
-            IoMarkIrpPending((PIRP)Context);
                        
-            ExInterlockedInsertTailList( &Connection->ConnectRequest, &Bucket->Entry, &Connection->Lock );
+            InsertTailList( &Connection->ConnectRequest, &Bucket->Entry );
         }
     }
 
+    UnlockObject(Connection, OldIrql);
+
     return Status;
 }
 
@@ -671,29 +700,20 @@ NTSTATUS TCPDisconnect
   PTDI_CONNECTION_INFORMATION ReturnInfo,
   PTCP_COMPLETION_ROUTINE Complete,
   PVOID Context ) {
-    NTSTATUS Status;
-
-    ASSERT_LOCKED(&TCPLock);
+    NTSTATUS Status = STATUS_INVALID_PARAMETER;
+    KIRQL OldIrql;
 
     TI_DbgPrint(DEBUG_TCP,("started\n"));
 
-    switch( Flags & (TDI_DISCONNECT_ABORT | TDI_DISCONNECT_RELEASE) ) {
-    case 0:
-    case TDI_DISCONNECT_ABORT:
-        Flags = 0;
-        break;
+    LockObject(Connection, &OldIrql);
 
-    case TDI_DISCONNECT_ABORT | TDI_DISCONNECT_RELEASE:
-        Flags = 2;
-        break;
+    if (Flags & TDI_DISCONNECT_RELEASE)
+        Status = TCPTranslateError(OskitTCPDisconnect(Connection->SocketContext));
 
-    case TDI_DISCONNECT_RELEASE:
-        Flags = 1;
-        break;
-    }
+    if ((Flags & TDI_DISCONNECT_ABORT) || !Flags)
+        Status = TCPTranslateError(OskitTCPShutdown(Connection->SocketContext, FWRITE | FREAD));
 
-    Status = TCPTranslateError
-        ( OskitTCPShutdown( Connection->SocketContext, Flags ) );
+    UnlockObject(Connection, OldIrql);
 
     TI_DbgPrint(DEBUG_TCP,("finished %x\n", Status));
 
@@ -701,22 +721,38 @@ NTSTATUS TCPDisconnect
 }
 
 NTSTATUS TCPClose
-( PCONNECTION_ENDPOINT Connection ) {
+( PCONNECTION_ENDPOINT Connection )
+{
+    KIRQL OldIrql;
     NTSTATUS Status;
+    PVOID Socket;
 
-    TI_DbgPrint(DEBUG_TCP,("TCPClose started\n"));
+    /* We don't rely on SocketContext == NULL for socket
+     * closure anymore but we still need it to determine
+     * if we caused the closure
+     */
+    LockObject(Connection, &OldIrql);
+    Socket = Connection->SocketContext;
+    Connection->SocketContext = NULL;
 
-    ASSERT_LOCKED(&TCPLock);
+    /* We need to close here otherwise oskit will never indicate
+     * SEL_FIN and we will never fully close the connection
+     */
+    Status = TCPTranslateError( OskitTCPClose( Socket ) );
+
+    if (!NT_SUCCESS(Status))
+    {
+        Connection->SocketContext = Socket;
+        UnlockObject(Connection, OldIrql);
+        return Status;
+    }
 
-    /* Make our code remove all pending IRPs */
-    Connection->State |= SEL_FIN;
-    DrainSignals();
+    if (Connection->AddressFile)
+        DereferenceObject(Connection->AddressFile);
 
-    Status = TCPTranslateError( OskitTCPClose( Connection->SocketContext ) );
-    if (Status == STATUS_SUCCESS)
-        Connection->SocketContext = NULL;
+    UnlockObject(Connection, OldIrql);
 
-    TI_DbgPrint(DEBUG_TCP,("TCPClose finished %x\n", Status));
+    DereferenceObject(Connection);
 
     return Status;
 }
@@ -733,25 +769,17 @@ NTSTATUS TCPReceiveData
     UINT DataLen, Received = 0;
     NTSTATUS Status;
     PTDI_BUCKET Bucket;
+    KIRQL OldIrql;
 
     TI_DbgPrint(DEBUG_TCP,("Called for %d bytes (on socket %x)\n",
                            ReceiveLength, Connection->SocketContext));
 
-    ASSERT_LOCKED(&TCPLock);
-
-    ASSERT_KM_POINTER(Connection->SocketContext);
-
-    /* Closing */
-    if (Connection->State & SEL_FIN)
-    {
-        *BytesReceived = 0;
-        return STATUS_REMOTE_DISCONNECT;
-    }
-
     NdisQueryBuffer( Buffer, &DataBuffer, &DataLen );
 
     TI_DbgPrint(DEBUG_TCP,("TCP>|< Got an MDL %x (%x:%d)\n", Buffer, DataBuffer, DataLen));
 
+    LockObject(Connection, &OldIrql);
+
     Status = TCPTranslateError
         ( OskitTCPRecv
           ( Connection->SocketContext,
@@ -765,9 +793,10 @@ NTSTATUS TCPReceiveData
     /* Keep this request around ... there was no data yet */
     if( Status == STATUS_PENDING ) {
         /* Freed in TCPSocketState */
-        Bucket = exAllocatePool( NonPagedPool, sizeof(*Bucket) );
+        Bucket = ExAllocatePoolWithTag( NonPagedPool, sizeof(*Bucket), TDI_BUCKET_TAG );
         if( !Bucket ) {
             TI_DbgPrint(DEBUG_TCP,("Failed to allocate bucket\n"));
+            UnlockObject(Connection, OldIrql);
             return STATUS_NO_MEMORY;
         }
 
@@ -775,15 +804,15 @@ NTSTATUS TCPReceiveData
         Bucket->Request.RequestContext = Context;
         *BytesReceived = 0;
 
-        IoMarkIrpPending((PIRP)Context);
-
-        ExInterlockedInsertTailList( &Connection->ReceiveRequest, &Bucket->Entry, &Connection->Lock );
+        InsertTailList( &Connection->ReceiveRequest, &Bucket->Entry );
         TI_DbgPrint(DEBUG_TCP,("Queued read irp\n"));
     } else {
         TI_DbgPrint(DEBUG_TCP,("Got status %x, bytes %d\n", Status, Received));
         *BytesReceived = Received;
     }
 
+    UnlockObject(Connection, OldIrql);
+
     TI_DbgPrint(DEBUG_TCP,("Status %x\n", Status));
 
     return Status;
@@ -800,25 +829,17 @@ NTSTATUS TCPSendData
     UINT Sent = 0;
     NTSTATUS Status;
     PTDI_BUCKET Bucket;
+    KIRQL OldIrql;
 
-    ASSERT_LOCKED(&TCPLock);
+    LockObject(Connection, &OldIrql);
 
     TI_DbgPrint(DEBUG_TCP,("Called for %d bytes (on socket %x)\n",
                            SendLength, Connection->SocketContext));
 
-    ASSERT_KM_POINTER(Connection->SocketContext);
-
     TI_DbgPrint(DEBUG_TCP,("Connection = %x\n", Connection));
     TI_DbgPrint(DEBUG_TCP,("Connection->SocketContext = %x\n",
                            Connection->SocketContext));
 
-    /* Closing */
-    if (Connection->State & SEL_FIN)
-    {
-        *BytesSent = 0;
-        return STATUS_REMOTE_DISCONNECT;
-    }
-
     Status = TCPTranslateError
         ( OskitTCPSend( Connection->SocketContext,
                         (OSK_PCHAR)BufferData, SendLength,
@@ -829,8 +850,9 @@ NTSTATUS TCPSendData
     /* Keep this request around ... there was no data yet */
     if( Status == STATUS_PENDING ) {
         /* Freed in TCPSocketState */
-        Bucket = exAllocatePool( NonPagedPool, sizeof(*Bucket) );
+        Bucket = ExAllocatePoolWithTag( NonPagedPool, sizeof(*Bucket), TDI_BUCKET_TAG );
         if( !Bucket ) {
+            UnlockObject(Connection, OldIrql);
             TI_DbgPrint(DEBUG_TCP,("Failed to allocate bucket\n"));
             return STATUS_NO_MEMORY;
         }
@@ -838,25 +860,21 @@ NTSTATUS TCPSendData
         Bucket->Request.RequestNotifyObject = Complete;
         Bucket->Request.RequestContext = Context;
         *BytesSent = 0;
-
-        IoMarkIrpPending((PIRP)Context);
         
-        ExInterlockedInsertTailList( &Connection->SendRequest, &Bucket->Entry, &Connection->Lock );
+        InsertTailList( &Connection->SendRequest, &Bucket->Entry );
         TI_DbgPrint(DEBUG_TCP,("Queued write irp\n"));
     } else {
         TI_DbgPrint(DEBUG_TCP,("Got status %x, bytes %d\n", Status, Sent));
         *BytesSent = Sent;
     }
-    
+
+    UnlockObject(Connection, OldIrql);
+
     TI_DbgPrint(DEBUG_TCP,("Status %x\n", Status));
 
     return Status;
 }
 
-VOID TCPTimeout(VOID) {
-    /* Now handled by TimerThread */
-}
-
 UINT TCPAllocatePort( UINT HintPort ) {
     if( HintPort ) {
         if( AllocatePort( &TCPPorts, HintPort ) ) return HintPort;
@@ -880,12 +898,16 @@ NTSTATUS TCPGetSockAddress
     OSK_UI16 LocalPort, RemotePort;
     PTA_IP_ADDRESS AddressIP = (PTA_IP_ADDRESS)Address;
     NTSTATUS Status;
+    KIRQL OldIrql;
 
-    ASSERT_LOCKED(&TCPLock);
+    LockObject(Connection, &OldIrql);
 
     Status = TCPTranslateError(OskitTCPGetAddress(Connection->SocketContext,
                                                   &LocalAddress, &LocalPort,
                                                   &RemoteAddress, &RemotePort));
+
+    UnlockObject(Connection, OldIrql);
+
     if (!NT_SUCCESS(Status))
         return Status;
 
@@ -898,19 +920,20 @@ NTSTATUS TCPGetSockAddress
     return Status;
 }
 
-VOID TCPRemoveIRP( PCONNECTION_ENDPOINT Endpoint, PIRP Irp ) {
+BOOLEAN TCPRemoveIRP( PCONNECTION_ENDPOINT Endpoint, PIRP Irp ) {
     PLIST_ENTRY Entry;
     PLIST_ENTRY ListHead[4];
     KIRQL OldIrql;
     PTDI_BUCKET Bucket;
     UINT i = 0;
+    BOOLEAN Found = FALSE;
 
     ListHead[0] = &Endpoint->SendRequest;
     ListHead[1] = &Endpoint->ReceiveRequest;
     ListHead[2] = &Endpoint->ConnectRequest;
     ListHead[3] = &Endpoint->ListenRequest;
 
-    TcpipAcquireSpinLock( &Endpoint->Lock, &OldIrql );
+    LockObject(Endpoint, &OldIrql);
 
     for( i = 0; i < 4; i++ )
     {
@@ -922,13 +945,16 @@ VOID TCPRemoveIRP( PCONNECTION_ENDPOINT Endpoint, PIRP Irp ) {
             if( Bucket->Request.RequestContext == Irp )
             {
                 RemoveEntryList( &Bucket->Entry );
-                exFreePool( Bucket );
+                ExFreePoolWithTag( Bucket, TDI_BUCKET_TAG );
+                Found = TRUE;
                 break;
             }
         }
     }
 
-    TcpipReleaseSpinLock( &Endpoint->Lock, OldIrql );
+    UnlockObject(Endpoint, OldIrql);
+
+    return Found;
 }
 
 /* EOF */