There's a difference between a handle and an object... Sorry about this
[reactos.git] / reactos / drivers / lib / ip / transport / tcp / tcp.c
index c5071f1..8846ef8 100644 (file)
@@ -4,8 +4,10 @@
  * FILE:        transport/tcp/tcp.c
  * PURPOSE:     Transmission Control Protocol
  * PROGRAMMERS: Casper S. Hornstrup (chorns@users.sourceforge.net)
+ *              Art Yerkes (arty@users.sf.net)
  * REVISIONS:
- *   CSH 01/08-2000 Created
+ *   CSH 01/08-2000  Created
+ *   arty 12/21/2004 Added accept
  */
 
 #include "precomp.h"
 LONG TCP_IPIdentification = 0;
 static BOOLEAN TCPInitialized = FALSE;
 static NPAGED_LOOKASIDE_LIST TCPSegmentList;
+LIST_ENTRY SignalledConnections;
 LIST_ENTRY SleepingThreadsList;
 FAST_MUTEX SleepingThreadsLock;
 RECURSIVE_MUTEX TCPLock;
+PORT_SET TCPPorts;
 
-NTSTATUS TCPSocket( PCONNECTION_ENDPOINT Connection, 
+static VOID HandleSignalledConnection( PCONNECTION_ENDPOINT Connection,
+                                      ULONG NewState ) {
+    NTSTATUS Status = STATUS_SUCCESS;
+    PTCP_COMPLETION_ROUTINE Complete;
+    PTDI_BUCKET Bucket;
+    PLIST_ENTRY Entry;
+    PIRP Irp;
+    PMDL Mdl;
+
+    TI_DbgPrint(MID_TRACE,("Handling signalled state on %x (%x)\n",
+                           Connection, Connection->SocketContext));
+
+    /* Things that can happen when we try the initial connection */
+    if( NewState & SEL_CONNECT ) {
+       while( !IsListEmpty( &Connection->ConnectRequest ) ) {
+            Connection->State |= NewState;
+            Entry = RemoveHeadList( &Connection->ConnectRequest );
+            TI_DbgPrint(DEBUG_TCP, ("Connect Event\n"));
+
+            Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
+            Complete = Bucket->Request.RequestNotifyObject;
+            TI_DbgPrint(DEBUG_TCP,
+                        ("Completing Request %x\n", Bucket->Request));
+
+            if( (NewState & (SEL_CONNECT | SEL_FIN)) ==
+                (SEL_CONNECT | SEL_FIN) )
+                Status = STATUS_CONNECTION_REFUSED;
+            else
+                Status = STATUS_SUCCESS;
+
+            Complete( Bucket->Request.RequestContext, Status, 0 );
+
+            /* Frees the bucket allocated in TCPConnect */
+            PoolFreeBuffer( Bucket );
+        }
+    }
+
+    if( NewState & 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"));
+
+       while( !IsListEmpty( &Connection->ListenRequest ) ) {
+           PIO_STACK_LOCATION IrpSp;
+
+           Entry = RemoveHeadList( &Connection->ListenRequest );
+           Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
+           Complete = Bucket->Request.RequestNotifyObject;
+
+           Irp = Bucket->Request.RequestContext;
+           IrpSp = IoGetCurrentIrpStackLocation( Irp );
+
+           TI_DbgPrint(DEBUG_TCP,("Getting the socket\n"));
+           Status = TCPServiceListeningSocket
+               ( Connection->AddressFile->Listener,
+                 Bucket->AssociatedEndpoint,
+                 (PTDI_REQUEST_KERNEL)&IrpSp->Parameters );
+
+           TI_DbgPrint(DEBUG_TCP,("Socket: Status: %x\n"));
+
+           if( Status == STATUS_PENDING ) {
+               InsertHeadList( &Connection->ListenRequest, &Bucket->Entry );
+               break;
+           } else
+               Complete( Bucket->Request.RequestContext, Status, 0 );
+       }
+    }
+
+    /* Things that happen after we're connected */
+    if( NewState & SEL_READ ) {
+       TI_DbgPrint(DEBUG_TCP,("Readable: irp list %s\n",
+                              IsListEmpty(&Connection->ReceiveRequest) ?
+                              "empty" : "nonempty"));
+
+       while( !IsListEmpty( &Connection->ReceiveRequest ) ) {
+           OSK_UINT RecvLen = 0, Received = 0;
+           OSK_PCHAR RecvBuffer = 0;
+
+           Entry = RemoveHeadList( &Connection->ReceiveRequest );
+           Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
+           Complete = Bucket->Request.RequestNotifyObject;
+
+           Irp = Bucket->Request.RequestContext;
+           Mdl = Irp->MdlAddress;
+
+           TI_DbgPrint(DEBUG_TCP,
+                       ("Getting the user buffer from %x\n", Mdl));
+
+           NdisQueryBuffer( Mdl, &RecvBuffer, &RecvLen );
+
+           TI_DbgPrint(DEBUG_TCP,
+                       ("Reading %d bytes to %x\n", RecvLen, RecvBuffer));
+
+           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 );
+           } else if( Status == STATUS_PENDING ) {
+               InsertHeadList
+                   ( &Connection->ReceiveRequest, &Bucket->Entry );
+               break;
+           } else {
+               TI_DbgPrint(DEBUG_TCP,
+                           ("Completing Receive request: %x %x\n",
+                            Bucket->Request, Status));
+               Complete( Bucket->Request.RequestContext, Status, 0 );
+           }
+       }
+    }
+
+    if( NewState & SEL_FIN ) {
+        PLIST_ENTRY ListsToErase[4];
+        NTSTATUS    IrpStatus[4];
+        UINT i;
+
+       TI_DbgPrint(DEBUG_TCP, ("EOF From socket\n"));
+
+        ListsToErase[0] = &Connection->ReceiveRequest;
+        IrpStatus   [0] = STATUS_SUCCESS;
+        ListsToErase[1] = &Connection->ListenRequest;
+        IrpStatus   [1] = STATUS_UNSUCCESSFUL;
+        ListsToErase[2] = &Connection->ConnectRequest;
+        IrpStatus   [2] = STATUS_UNSUCCESSFUL;
+        ListsToErase[3] = 0;
+
+        for( i = 0; ListsToErase[i]; i++ ) {
+            while( !IsListEmpty( ListsToErase[i] ) ) {
+                Entry = RemoveHeadList( ListsToErase[i] );
+                Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
+                Complete = Bucket->Request.RequestNotifyObject;
+                Complete( Bucket->Request.RequestContext, STATUS_SUCCESS, 0 );
+            }
+        }
+    }
+
+    Connection->Signalled = FALSE;
+}
+
+VOID DrainSignals() {
+    PCONNECTION_ENDPOINT Connection;
+    PLIST_ENTRY ListEntry;
+
+    while( !IsListEmpty( &SignalledConnections ) ) {
+       ListEntry = RemoveHeadList( &SignalledConnections );
+       Connection = CONTAINING_RECORD( ListEntry, CONNECTION_ENDPOINT,
+                                       SignalList );
+       HandleSignalledConnection( Connection, Connection->SignalState );
+    }
+}
+
+PCONNECTION_ENDPOINT TCPAllocateConnectionEndpoint( PVOID ClientContext ) {
+    PCONNECTION_ENDPOINT Connection =
+       ExAllocatePool(NonPagedPool, sizeof(CONNECTION_ENDPOINT));
+    if (!Connection)
+       return Connection;
+
+    TI_DbgPrint(DEBUG_CPOINT, ("Connection point file object allocated at (0x%X).\n", Connection));
+
+    RtlZeroMemory(Connection, sizeof(CONNECTION_ENDPOINT));
+
+    /* Initialize spin lock that protects the connection endpoint file object */
+    TcpipInitializeSpinLock(&Connection->Lock);
+    InitializeListHead(&Connection->ConnectRequest);
+    InitializeListHead(&Connection->ListenRequest);
+    InitializeListHead(&Connection->ReceiveRequest);
+
+    /* Save client context pointer */
+    Connection->ClientContext = ClientContext;
+
+    return Connection;
+}
+
+VOID TCPFreeConnectionEndpoint( PCONNECTION_ENDPOINT Connection ) {
+    TI_DbgPrint(MAX_TRACE,("FIXME: Cancel all pending requests\n"));
+    /* XXX Cancel all pending requests */
+    ExFreePool( Connection );
+}
+
+NTSTATUS TCPSocket( PCONNECTION_ENDPOINT Connection,
                    UINT Family, UINT Type, UINT Proto ) {
     NTSTATUS Status;
 
-    RecursiveMutexEnter( &TCPLock, TRUE );
+    TI_DbgPrint(DEBUG_TCP,("Called: Connection %x, Family %d, Type %d, "
+                          "Proto %d\n",
+                          Connection, Family, Type, Proto));
+
+    TcpipRecursiveMutexEnter( &TCPLock, TRUE );
     Status = TCPTranslateError( OskitTCPSocket( Connection,
                                                &Connection->SocketContext,
                                                Family,
                                                Type,
                                                Proto ) );
-    RecursiveMutexLeave( &TCPLock );
+
+    ASSERT_KM_POINTER(Connection->SocketContext);
+
+    TI_DbgPrint(DEBUG_TCP,("Connection->SocketContext %x\n",
+                          Connection->SocketContext));
+
+    TcpipRecursiveMutexLeave( &TCPLock );
 
     return Status;
 }
 
-VOID TCPReceive(PNET_TABLE_ENTRY NTE, PIP_PACKET IPPacket)
+VOID TCPReceive(PIP_INTERFACE Interface, PIP_PACKET IPPacket)
 /*
  * FUNCTION: Receives and queues TCP data
  * ARGUMENTS:
- *     NTE      = Pointer to net table entry which the packet was received on
  *     IPPacket = Pointer to an IP packet that was received
  * NOTES:
  *     This is the low level interface for receiving TCP data
  */
 {
-    TI_DbgPrint(MID_TRACE,("Sending packet %d (%d) to oskit\n", 
+    TI_DbgPrint(DEBUG_TCP,("Sending packet %d (%d) to oskit\n",
                           IPPacket->TotalSize,
                           IPPacket->HeaderSize));
 
-    RecursiveMutexEnter( &TCPLock, TRUE );
+    TcpipRecursiveMutexEnter( &TCPLock, TRUE );
 
-    OskitTCPReceiveDatagram( IPPacket->Header, 
-                            IPPacket->TotalSize, 
+    OskitTCPReceiveDatagram( IPPacket->Header,
+                            IPPacket->TotalSize,
                             IPPacket->HeaderSize );
 
-    RecursiveMutexLeave( &TCPLock );
+    DrainSignals();
+
+    TcpipRecursiveMutexLeave( &TCPLock );
 }
 
 /* event.c */
@@ -91,6 +307,68 @@ OSKITTCP_EVENT_HANDLERS EventHandlers = {
     TCPWakeup         /* Wakeup */
 };
 
+static KEVENT TimerLoopEvent;
+static HANDLE TimerThreadHandle;
+
+/*
+ * We are running 2 timers here, one with a 200ms interval (fast) and the other
+ * with a 500ms interval (slow). So we need to time out at 200, 400, 500, 600,
+ * 800, 1000 and process the "fast" events at 200, 400, 600, 800, 1000 and the
+ * "slow" events at 500 and 1000.
+ */
+static VOID DDKAPI
+TimerThread(PVOID Context)
+{
+    LARGE_INTEGER Timeout;
+    NTSTATUS Status;
+    unsigned Current, NextFast, NextSlow, Next;
+
+    Current = 0;
+    Next = 0;
+    NextFast = 0;
+    NextSlow = 0;
+    while ( 1 ) {
+        if (Next == NextFast) {
+            NextFast += 2;
+        }
+        if (Next == NextSlow) {
+            NextSlow += 5;
+        }
+        Next = min(NextFast, NextSlow);
+        Timeout.QuadPart = (LONGLONG) (Next - Current) * -1000000; /* 100 ms */
+        Status = KeWaitForSingleObject(&TimerLoopEvent, Executive, KernelMode,
+                                       FALSE, &Timeout);
+        if (STATUS_SUCCESS == Status) {
+            PsTerminateSystemThread(STATUS_SUCCESS);
+        }
+        ASSERT(STATUS_TIMEOUT == Status);
+
+        TcpipRecursiveMutexEnter( &TCPLock, TRUE );
+        TimerOskitTCP( Next == NextFast, Next == NextSlow );
+        if (Next == NextSlow) {
+            DrainSignals();
+        }
+        TcpipRecursiveMutexLeave( &TCPLock );
+
+        Current = Next;
+        if (10 <= Current) {
+            Current = 0;
+            Next = 0;
+            NextFast = 0;
+            NextSlow = 0;
+        }
+    }
+}
+
+static VOID
+StartTimer(VOID)
+{
+    KeInitializeEvent(&TimerLoopEvent, NotificationEvent, FALSE);
+    PsCreateSystemThread(&TimerThreadHandle, THREAD_ALL_ACCESS, 0, 0, 0,
+                         TimerThread, NULL);
+}
+
+
 NTSTATUS TCPStartup(VOID)
 /*
  * FUNCTION: Initializes the TCP subsystem
@@ -98,16 +376,19 @@ NTSTATUS TCPStartup(VOID)
  *     Status of operation
  */
 {
-    RecursiveMutexInit( &TCPLock );
+    TcpipRecursiveMutexInit( &TCPLock );
     ExInitializeFastMutex( &SleepingThreadsLock );
-    InitializeListHead( &SleepingThreadsList );    
+    InitializeListHead( &SleepingThreadsList );
+    InitializeListHead( &SignalledConnections );
+
+    PortsStartup( &TCPPorts, 1, 0xfffe );
 
     RegisterOskitTCPEventHandlers( &EventHandlers );
     InitOskitTCP();
-    
+
     /* Register this protocol with IP layer */
     IPRegisterProtocol(IPPROTO_TCP, TCPReceive);
-    
+
     ExInitializeNPagedLookasideList(
        &TCPSegmentList,                /* Lookaside list */
        NULL,                           /* Allocate routine */
@@ -116,9 +397,11 @@ NTSTATUS TCPStartup(VOID)
        sizeof(TCP_SEGMENT),            /* Size of each entry */
        TAG('T','C','P','S'),           /* Tag */
        0);                             /* Depth */
-    
+
+    StartTimer();
+
     TCPInitialized = TRUE;
-    
+
     return STATUS_SUCCESS;
 }
 
@@ -130,18 +413,26 @@ NTSTATUS TCPShutdown(VOID)
  *     Status of operation
  */
 {
+    LARGE_INTEGER WaitForThread;
+
     if (!TCPInitialized)
        return STATUS_SUCCESS;
-    
+
+    WaitForThread.QuadPart = -2500000; /* 250 ms */
+    KeSetEvent(&TimerLoopEvent, IO_NO_INCREMENT, FALSE);
+    ZwWaitForSingleObject(TimerThreadHandle, FALSE, &WaitForThread);
+
     /* Deregister this protocol with IP layer */
     IPRegisterProtocol(IPPROTO_TCP, NULL);
-    
+
     ExDeleteNPagedLookasideList(&TCPSegmentList);
-    
+
     TCPInitialized = FALSE;
 
     DeinitOskitTCP();
 
+    PortsShutdown( &TCPPorts );
+
     return STATUS_SUCCESS;
 }
 
@@ -159,52 +450,19 @@ NTSTATUS TCPTranslateError( int OskitError ) {
     default: Status = STATUS_INVALID_CONNECTION; break;
     }
 
-    TI_DbgPrint(MID_TRACE,("Error %d -> %x\n", OskitError, Status));
-    return Status;
-}
-
-#if 0
-NTSTATUS TCPBind
-( PTDI_REQUEST Request,
-  PTDI_CONNECTION_INFORMATION ConnInfo ) {
-    NTSTATUS Status;
-    PCONNECTION_ENDPOINT Connection = Request->Handle.ConnectionContext;
-    SOCKADDR_IN AddressToConnect;
-    PIP_ADDRESS LocalAddress;
-    USHORT LocalPort;
-
-    TI_DbgPrint(MID_TRACE,("Called\n"));
-
-    Status = AddrBuildAddress
-       ((PTA_ADDRESS)ConnInfo->LocalAddress,
-        &LocalAddress,
-        &LocalPort);
-
-    AddressToBind.sin_family = AF_INET;
-    memcpy( &AddressToBind.sin_addr, 
-           &LocalAddress->Address.IPv4Address,
-           sizeof(AddressToBind.sin_addr) );
-    AddressToBind.sin_port = LocalPort;
-
-    Status = OskitTCPBind( Connection->SocketContext,
-                          Connection,
-                          &AddressToBind, 
-                          sizeof(AddressToBind));
-
-    TI_DbgPrint(MID_TRACE,("Leaving %x\n", Status));
-
+    TI_DbgPrint(DEBUG_TCP,("Error %d -> %x\n", OskitError, Status));
     return Status;
 }
-#endif
 
 NTSTATUS TCPConnect
-( PTDI_REQUEST Request,
+( PCONNECTION_ENDPOINT Connection,
   PTDI_CONNECTION_INFORMATION ConnInfo,
-  PTDI_CONNECTION_INFORMATION ReturnInfo ) {
+  PTDI_CONNECTION_INFORMATION ReturnInfo,
+  PTCP_COMPLETION_ROUTINE Complete,
+  PVOID Context ) {
     NTSTATUS Status;
     SOCKADDR_IN AddressToConnect = { 0 }, AddressToBind = { 0 };
-    PCONNECTION_ENDPOINT Connection = Request->Handle.ConnectionContext;
-    PIP_ADDRESS RemoteAddress;
+    IP_ADDRESS RemoteAddress;
     USHORT RemotePort;
     PTDI_BUCKET Bucket;
 
@@ -213,26 +471,28 @@ NTSTATUS TCPConnect
     Bucket = ExAllocatePool( NonPagedPool, sizeof(*Bucket) );
     if( !Bucket ) return STATUS_NO_MEMORY;
 
-    RecursiveMutexEnter( &TCPLock, TRUE );
+    TcpipRecursiveMutexEnter( &TCPLock, TRUE );
 
     /* Freed in TCPSocketState */
-    Bucket->Request = *Request;
+    Bucket->Request.RequestNotifyObject = (PVOID)Complete;
+    Bucket->Request.RequestContext = Context;
+
     InsertHeadList( &Connection->ConnectRequest, &Bucket->Entry );
 
     Status = AddrBuildAddress
-       ((PTA_ADDRESS)ConnInfo->RemoteAddress,
+       ((PTRANSPORT_ADDRESS)ConnInfo->RemoteAddress,
         &RemoteAddress,
         &RemotePort);
 
     DbgPrint("Connecting to address %x:%x\n",
-            RemoteAddress->Address.IPv4Address,
+            RemoteAddress.Address.IPv4Address,
             RemotePort);
 
     if (!NT_SUCCESS(Status)) {
-       TI_DbgPrint(MID_TRACE, ("Could not AddrBuildAddress in TCPConnect\n"));
+       TI_DbgPrint(DEBUG_TCP, ("Could not AddrBuildAddress in TCPConnect\n"));
        return Status;
     }
-    
+
     AddressToConnect.sin_family = AF_INET;
     AddressToBind = AddressToConnect;
 
@@ -241,86 +501,107 @@ NTSTATUS TCPConnect
                  &AddressToBind,
                  sizeof(AddressToBind) );
 
-    memcpy( &AddressToConnect.sin_addr, 
-           &RemoteAddress->Address.IPv4Address,
+    memcpy( &AddressToConnect.sin_addr,
+           &RemoteAddress.Address.IPv4Address,
            sizeof(AddressToConnect.sin_addr) );
     AddressToConnect.sin_port = RemotePort;
 
-    Status = OskitTCPConnect(Connection->SocketContext,
-                            Connection,
-                            &AddressToConnect, 
-                            sizeof(AddressToConnect));
+    Status = TCPTranslateError
+       ( OskitTCPConnect( Connection->SocketContext,
+                          Connection,
+                          &AddressToConnect,
+                          sizeof(AddressToConnect) ) );
 
-    RecursiveMutexLeave( &TCPLock );
-    
-    if( Status == OSK_EINPROGRESS || Status == STATUS_SUCCESS ) 
+    TcpipRecursiveMutexLeave( &TCPLock );
+
+    if( Status == OSK_EINPROGRESS )
        return STATUS_PENDING;
     else
        return Status;
 }
 
-NTSTATUS TCPClose
-( PCONNECTION_ENDPOINT Connection ) {
+NTSTATUS TCPDisconnect
+( PCONNECTION_ENDPOINT Connection,
+  UINT Flags,
+  PTDI_CONNECTION_INFORMATION ConnInfo,
+  PTDI_CONNECTION_INFORMATION ReturnInfo,
+  PTCP_COMPLETION_ROUTINE Complete,
+  PVOID Context ) {
     NTSTATUS Status;
-    
-    TI_DbgPrint(MID_TRACE,("TCPClose started\n"));
 
-    RecursiveMutexEnter( &TCPLock, TRUE );
+    TI_DbgPrint(DEBUG_TCP,("started\n"));
 
-    Status = TCPTranslateError( OskitTCPClose( Connection->SocketContext ) );
+    TcpipRecursiveMutexEnter( &TCPLock, TRUE );
+
+    switch( Flags & (TDI_DISCONNECT_ABORT | TDI_DISCONNECT_RELEASE) ) {
+    case 0:
+    case TDI_DISCONNECT_ABORT:
+       Flags = 0;
+       break;
 
-    RecursiveMutexLeave( &TCPLock );
-    
-    TI_DbgPrint(MID_TRACE,("TCPClose finished %x\n", Status));
+    case TDI_DISCONNECT_ABORT | TDI_DISCONNECT_RELEASE:
+       Flags = 2;
+       break;
+
+    case TDI_DISCONNECT_RELEASE:
+       Flags = 1;
+       break;
+    }
+
+    Status = TCPTranslateError
+       ( OskitTCPShutdown( Connection->SocketContext, Flags ) );
+
+    TcpipRecursiveMutexLeave( &TCPLock );
+
+    TI_DbgPrint(DEBUG_TCP,("finished %x\n", Status));
 
     return Status;
 }
 
-NTSTATUS TCPListen
-( PTDI_REQUEST Request,
-  UINT Backlog ) {
-    PCONNECTION_ENDPOINT Connection;
+NTSTATUS TCPClose
+( PCONNECTION_ENDPOINT Connection ) {
     NTSTATUS Status;
 
-    Connection = Request->Handle.ConnectionContext;
+    TI_DbgPrint(DEBUG_TCP,("TCPClose started\n"));
 
-    RecursiveMutexEnter( &TCPLock, TRUE );
+    TcpipRecursiveMutexEnter( &TCPLock, TRUE );
 
-    Status =  TCPTranslateError( OskitTCPListen( Connection->SocketContext,
-                                                Backlog ) );
+    Status = TCPTranslateError( OskitTCPClose( Connection->SocketContext ) );
 
-    RecursiveMutexLeave( &TCPLock );
+    /* Make our code remove all pending IRPs */
+    Connection->State |= SEL_FIN;
+    DrainSignals();
 
-    return Status;
-}
+    TcpipRecursiveMutexLeave( &TCPLock );
+
+    TI_DbgPrint(DEBUG_TCP,("TCPClose finished %x\n", Status));
 
-NTSTATUS TCPAccept
-( PTDI_REQUEST Request,
-  VOID **NewSocketContext ) {
-    return STATUS_UNSUCCESSFUL;
+    return Status;
 }
 
 NTSTATUS TCPReceiveData
-( PTDI_REQUEST Request,
+( PCONNECTION_ENDPOINT Connection,
   PNDIS_BUFFER Buffer,
   ULONG ReceiveLength,
+  PULONG BytesReceived,
   ULONG ReceiveFlags,
-  PULONG BytesReceived ) {
-    PCONNECTION_ENDPOINT Connection;
-    PCHAR DataBuffer;
+  PTCP_COMPLETION_ROUTINE Complete,
+  PVOID Context ) {
+    OSK_PCHAR DataBuffer;
     UINT DataLen, Received = 0;
     NTSTATUS Status;
     PTDI_BUCKET Bucket;
 
-    TI_DbgPrint(MID_TRACE,("Called for %d bytes\n", ReceiveLength));
+    TI_DbgPrint(DEBUG_TCP,("Called for %d bytes (on socket %x)\n",
+                           ReceiveLength, Connection->SocketContext));
 
-    Connection = Request->Handle.ConnectionContext;
+    ASSERT_KM_POINTER(Connection->SocketContext);
 
-    RecursiveMutexEnter( &TCPLock, TRUE );
+    TcpipRecursiveMutexEnter( &TCPLock, TRUE );
 
     NdisQueryBuffer( Buffer, &DataBuffer, &DataLen );
 
-    TI_DbgPrint(MID_TRACE,("TCP>|< Got an MDL %x (%x:%d)\n", Buffer, DataBuffer, DataLen));
+    TI_DbgPrint(DEBUG_TCP,("TCP>|< Got an MDL %x (%x:%d)\n", Buffer, DataBuffer, DataLen));
 
     Status = TCPTranslateError
        ( OskitTCPRecv
@@ -330,73 +611,134 @@ NTSTATUS TCPReceiveData
            &Received,
            ReceiveFlags ) );
 
-    TI_DbgPrint(MID_TRACE,("OskitTCPReceive: %x, %d\n", Status, Received));
+    TI_DbgPrint(DEBUG_TCP,("OskitTCPReceive: %x, %d\n", Status, Received));
 
     /* Keep this request around ... there was no data yet */
-    if( Status == STATUS_PENDING || 
-       (Status == STATUS_SUCCESS && Received == 0) ) {
+    if( Status == STATUS_PENDING ) {
        /* Freed in TCPSocketState */
        Bucket = ExAllocatePool( NonPagedPool, sizeof(*Bucket) );
        if( !Bucket ) {
-           TI_DbgPrint(MID_TRACE,("Failed to allocate bucket\n"));
+           TI_DbgPrint(DEBUG_TCP,("Failed to allocate bucket\n"));
+           TcpipRecursiveMutexLeave( &TCPLock );
            return STATUS_NO_MEMORY;
        }
-       
-       Bucket->Request = *Request;
+
+       Bucket->Request.RequestNotifyObject = Complete;
+       Bucket->Request.RequestContext = Context;
        *BytesReceived = 0;
+
        InsertHeadList( &Connection->ReceiveRequest, &Bucket->Entry );
        Status = STATUS_PENDING;
-       TI_DbgPrint(MID_TRACE,("Queued read irp\n"));
+       TI_DbgPrint(DEBUG_TCP,("Queued read irp\n"));
     } else {
-       TI_DbgPrint(MID_TRACE,("Got status %x, bytes %d\n", Status, Received));
+       TI_DbgPrint(DEBUG_TCP,("Got status %x, bytes %d\n", Status, Received));
        *BytesReceived = Received;
     }
 
-    RecursiveMutexLeave( &TCPLock );
+    TcpipRecursiveMutexLeave( &TCPLock );
 
-    TI_DbgPrint(MID_TRACE,("Status %x\n", Status));
+    TI_DbgPrint(DEBUG_TCP,("Status %x\n", Status));
 
     return Status;
 }
 
 NTSTATUS TCPSendData
-( PTDI_REQUEST Request,
-  PNDIS_BUFFER Buffer,
-  ULONG DataSize,
-  ULONG Flags,
-  PULONG DataUsed ) {
+( PCONNECTION_ENDPOINT Connection,
+  PCHAR BufferData,
+  ULONG PacketSize,
+  PULONG DataUsed,
+  ULONG Flags) {
     NTSTATUS Status;
-    PCONNECTION_ENDPOINT Connection;
-    PCHAR BufferData;
-    ULONG PacketSize;
 
-    Connection = Request->Handle.ConnectionContext;
+    ASSERT_KM_POINTER(Connection->SocketContext);
 
-    RecursiveMutexEnter( &TCPLock, TRUE );
+    TcpipRecursiveMutexEnter( &TCPLock, TRUE );
 
-    NdisQueryBuffer( Buffer, &BufferData, &PacketSize );
-    
-    TI_DbgPrint(MID_TRACE,("Connection = %x\n", Connection));
-    TI_DbgPrint(MID_TRACE,("Connection->SocketContext = %x\n",
+    TI_DbgPrint(DEBUG_TCP,("Connection = %x\n", Connection));
+    TI_DbgPrint(DEBUG_TCP,("Connection->SocketContext = %x\n",
                           Connection->SocketContext));
 
-    OskitDumpBuffer( BufferData, PacketSize );
+    Status = OskitTCPSend( Connection->SocketContext,
+                          (OSK_PCHAR)BufferData, PacketSize,
+                          (PUINT)DataUsed, 0 );
 
-    Status = OskitTCPSend( Connection->SocketContext, 
-                          BufferData, PacketSize, (PUINT)DataUsed, 0 );
-
-    RecursiveMutexLeave( &TCPLock );
+    TcpipRecursiveMutexLeave( &TCPLock );
 
     return Status;
 }
 
-VOID TCPTimeout(VOID) { 
-    static int Times = 0;
-    if( (Times++ % 5) == 0 ) {
-       RecursiveMutexEnter( &TCPLock, TRUE );
-       TimerOskitTCP();
-       RecursiveMutexLeave( &TCPLock );
+VOID TCPTimeout(VOID) {
+    /* Now handled by TimerThread */
+}
+
+UINT TCPAllocatePort( UINT HintPort ) {
+    if( HintPort ) {
+       if( AllocatePort( &TCPPorts, HintPort ) ) return HintPort;
+       else {
+            TI_DbgPrint
+                (MID_TRACE,("We got a hint port but couldn't allocate it\n"));
+            return (UINT)-1;
+        }
+    } else return AllocatePortFromRange( &TCPPorts, 1024, 5000 );
+}
+
+VOID TCPFreePort( UINT Port ) {
+    DeallocatePort( &TCPPorts, Port );
+}
+
+NTSTATUS TCPGetPeerAddress
+( PCONNECTION_ENDPOINT Connection,
+  PTRANSPORT_ADDRESS Address ) {
+    OSK_UINT LocalAddress, RemoteAddress;
+    OSK_UI16 LocalPort, RemotePort;
+    PTA_IP_ADDRESS AddressIP = (PTA_IP_ADDRESS)Address;
+
+    TcpipRecursiveMutexEnter( &TCPLock, TRUE );
+
+    OskitTCPGetAddress
+        ( Connection->SocketContext,
+          &LocalAddress, &LocalPort,
+          &RemoteAddress, &RemotePort );
+
+    AddressIP->TAAddressCount = 1;
+    AddressIP->Address[0].AddressLength = TDI_ADDRESS_LENGTH_IP;
+    AddressIP->Address[0].AddressType = TDI_ADDRESS_TYPE_IP;
+    AddressIP->Address[0].Address[0].sin_port = RemotePort;
+    AddressIP->Address[0].Address[0].in_addr = RemoteAddress;
+
+    TcpipRecursiveMutexLeave( &TCPLock );
+
+    return STATUS_SUCCESS;
+}
+
+VOID TCPRemoveIRP( PCONNECTION_ENDPOINT Endpoint, PIRP Irp ) {
+    PLIST_ENTRY Entry;
+    PLIST_ENTRY ListHead[4];
+    KIRQL OldIrql;
+    PTDI_BUCKET Bucket;
+    UINT i = 0;
+
+    ListHead[0] = &Endpoint->ReceiveRequest;
+    ListHead[1] = &Endpoint->ConnectRequest;
+    ListHead[2] = &Endpoint->ListenRequest;
+    ListHead[3] = 0;
+
+    TcpipAcquireSpinLock( &Endpoint->Lock, &OldIrql );
+
+    for( i = 0; ListHead[i]; i++ ) {
+       for( Entry = ListHead[i]->Flink;
+            Entry != ListHead[i];
+            Entry = Entry->Flink ) {
+           Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
+           
+           if( Bucket->Request.RequestContext == Irp ) {
+               RemoveEntryList( &Bucket->Entry );
+               break;
+           }
+       }
     }
+
+    TcpipReleaseSpinLock( &Endpoint->Lock, OldIrql );
 }
 
 /* EOF */