There's a difference between a handle and an object... Sorry about this
[reactos.git] / reactos / drivers / lib / ip / transport / tcp / tcp.c
index bbdbe36..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"
@@ -17,6 +19,7 @@ LIST_ENTRY SignalledConnections;
 LIST_ENTRY SleepingThreadsList;
 FAST_MUTEX SleepingThreadsLock;
 RECURSIVE_MUTEX TCPLock;
+PORT_SET TCPPorts;
 
 static VOID HandleSignalledConnection( PCONNECTION_ENDPOINT Connection,
                                       ULONG NewState ) {
@@ -24,43 +27,87 @@ static VOID HandleSignalledConnection( PCONNECTION_ENDPOINT Connection,
     PTCP_COMPLETION_ROUTINE Complete;
     PTDI_BUCKET Bucket;
     PLIST_ENTRY Entry;
+    PIRP Irp;
+    PMDL Mdl;
 
-    if( ((NewState & SEL_CONNECT) || (NewState & SEL_FIN)) &&
+    TI_DbgPrint(MID_TRACE,("Handling signalled state on %x (%x)\n",
+                           Connection, Connection->SocketContext));
 
-       !(Connection->State & (SEL_CONNECT | SEL_FIN)) ) {
+    /* Things that can happen when we try the initial connection */
+    if( NewState & SEL_CONNECT ) {
        while( !IsListEmpty( &Connection->ConnectRequest ) ) {
-           Connection->State |= NewState & (SEL_CONNECT | SEL_FIN);
-           Entry = RemoveHeadList( &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;
-           TI_DbgPrint(DEBUG_TCP,
-                       ("Completing Connect Request %x\n", Bucket->Request));
-           if( NewState & SEL_FIN ) Status = STATUS_CONNECTION_REFUSED;
-           Complete( Bucket->Request.RequestContext, Status, 0 );
-           /* Frees the bucket allocated in TCPConnect */
-           PoolFreeBuffer( Bucket );
+
+           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 );
        }
     }
-    if( (NewState & SEL_READ) || (NewState & SEL_FIN) ) {
-       TI_DbgPrint(DEBUG_TCP,("Readable (or closed): irp list %s\n",
+
+    /* 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 ) ) {
-           PIRP Irp;
            OSK_UINT RecvLen = 0, Received = 0;
            OSK_PCHAR RecvBuffer = 0;
-           PMDL Mdl;
-           NTSTATUS Status;
 
            Entry = RemoveHeadList( &Connection->ReceiveRequest );
            Bucket = CONTAINING_RECORD( Entry, TDI_BUCKET, Entry );
            Complete = Bucket->Request.RequestNotifyObject;
 
-           TI_DbgPrint(DEBUG_TCP,
-                       ("Readable, Completing read request %x\n", 
-                        Bucket->Request));
-
            Irp = Bucket->Request.RequestContext;
            Mdl = Irp->MdlAddress;
 
@@ -72,42 +119,31 @@ static VOID HandleSignalledConnection( PCONNECTION_ENDPOINT Connection,
            TI_DbgPrint(DEBUG_TCP,
                        ("Reading %d bytes to %x\n", RecvLen, RecvBuffer));
 
-           if( (NewState & SEL_FIN) && !RecvLen ) {
-               TI_DbgPrint(DEBUG_TCP, ("EOF From socket\n"));
-               Status = STATUS_END_OF_FILE;
-               Received = 0;
-           } else {
-               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, ("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 && Received != 0 ) {
+           if( Status == STATUS_SUCCESS ) {
                TI_DbgPrint(DEBUG_TCP,("Received %d bytes with status %x\n",
                                       Received, Status));
-               
-               TI_DbgPrint(DEBUG_TCP,
-                           ("Completing Receive Request: %x\n", 
-                            Bucket->Request));
 
                Complete( Bucket->Request.RequestContext,
                          STATUS_SUCCESS, Received );
-           } else if( Status == STATUS_PENDING || 
-                      (Status == STATUS_SUCCESS && Received == 0) ) {
-               InsertHeadList( &Connection->ReceiveRequest,
-                               &Bucket->Entry );
+           } else if( Status == STATUS_PENDING ) {
+               InsertHeadList
+                   ( &Connection->ReceiveRequest, &Bucket->Entry );
                break;
            } else {
                TI_DbgPrint(DEBUG_TCP,
@@ -116,7 +152,32 @@ static VOID HandleSignalledConnection( PCONNECTION_ENDPOINT Connection,
                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;
 }
@@ -134,24 +195,24 @@ VOID DrainSignals() {
 }
 
 PCONNECTION_ENDPOINT TCPAllocateConnectionEndpoint( PVOID ClientContext ) {
-    PCONNECTION_ENDPOINT Connection = 
+    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;
 }
 
@@ -161,7 +222,7 @@ VOID TCPFreeConnectionEndpoint( PCONNECTION_ENDPOINT Connection ) {
     ExFreePool( Connection );
 }
 
-NTSTATUS TCPSocket( PCONNECTION_ENDPOINT Connection, 
+NTSTATUS TCPSocket( PCONNECTION_ENDPOINT Connection,
                    UINT Family, UINT Type, UINT Proto ) {
     NTSTATUS Status;
 
@@ -195,14 +256,14 @@ VOID TCPReceive(PIP_INTERFACE Interface, PIP_PACKET IPPacket)
  *     This is the low level interface for receiving TCP data
  */
 {
-    TI_DbgPrint(DEBUG_TCP,("Sending packet %d (%d) to oskit\n", 
+    TI_DbgPrint(DEBUG_TCP,("Sending packet %d (%d) to oskit\n",
                           IPPacket->TotalSize,
                           IPPacket->HeaderSize));
 
     TcpipRecursiveMutexEnter( &TCPLock, TRUE );
 
-    OskitTCPReceiveDatagram( IPPacket->Header, 
-                            IPPacket->TotalSize, 
+    OskitTCPReceiveDatagram( IPPacket->Header,
+                            IPPacket->TotalSize,
                             IPPacket->HeaderSize );
 
     DrainSignals();
@@ -246,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
@@ -255,15 +378,17 @@ NTSTATUS TCPStartup(VOID)
 {
     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 */
@@ -272,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;
 }
 
@@ -286,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;
 }
 
@@ -319,39 +454,6 @@ NTSTATUS TCPTranslateError( int OskitError ) {
     return Status;
 }
 
-#if 0
-NTSTATUS TCPBind
-( PCONNECTION_ENDPOINT Connection,
-  PTDI_CONNECTION_INFORMATION ConnInfo ) {
-    NTSTATUS Status;
-    SOCKADDR_IN AddressToConnect;
-    PIP_ADDRESS LocalAddress;
-    USHORT LocalPort;
-
-    TI_DbgPrint(DEBUG_TCP,("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(DEBUG_TCP,("Leaving %x\n", Status));
-
-    return Status;
-}
-#endif
-
 NTSTATUS TCPConnect
 ( PCONNECTION_ENDPOINT Connection,
   PTDI_CONNECTION_INFORMATION ConnInfo,
@@ -390,7 +492,7 @@ NTSTATUS TCPConnect
        TI_DbgPrint(DEBUG_TCP, ("Could not AddrBuildAddress in TCPConnect\n"));
        return Status;
     }
-    
+
     AddressToConnect.sin_family = AF_INET;
     AddressToBind = AddressToConnect;
 
@@ -399,80 +501,82 @@ NTSTATUS TCPConnect
                  &AddressToBind,
                  sizeof(AddressToBind) );
 
-    memcpy( &AddressToConnect.sin_addr, 
+    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) ) );
 
     TcpipRecursiveMutexLeave( &TCPLock );
-    
-    if( Status == OSK_EINPROGRESS || Status == STATUS_SUCCESS ) 
+
+    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(DEBUG_TCP,("TCPClose started\n"));
+
+    TI_DbgPrint(DEBUG_TCP,("started\n"));
 
     TcpipRecursiveMutexEnter( &TCPLock, TRUE );
 
-    Status = TCPTranslateError( OskitTCPClose( Connection->SocketContext ) );
+    switch( Flags & (TDI_DISCONNECT_ABORT | TDI_DISCONNECT_RELEASE) ) {
+    case 0:
+    case TDI_DISCONNECT_ABORT:
+       Flags = 0;
+       break;
 
-    if( Connection->Signalled ) 
-       RemoveEntryList( &Connection->SignalList );
+    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,("TCPClose finished %x\n", Status));
+
+    TI_DbgPrint(DEBUG_TCP,("finished %x\n", Status));
 
     return Status;
 }
 
-NTSTATUS TCPListen
-( PCONNECTION_ENDPOINT Connection,
-  UINT Backlog, 
-  PTCP_COMPLETION_ROUTINE Complete,
-  PVOID Context) {
-   NTSTATUS Status;
+NTSTATUS TCPClose
+( PCONNECTION_ENDPOINT Connection ) {
+    NTSTATUS Status;
 
-   TI_DbgPrint(DEBUG_TCP,("TCPListen started\n"));
+    TI_DbgPrint(DEBUG_TCP,("TCPClose started\n"));
 
-   TI_DbgPrint(DEBUG_TCP,("Connection->SocketContext %x\n",
-     Connection->SocketContext));
+    TcpipRecursiveMutexEnter( &TCPLock, TRUE );
 
-   ASSERT(Connection);
-   ASSERT_KM_POINTER(Connection->SocketContext);
+    Status = TCPTranslateError( OskitTCPClose( Connection->SocketContext ) );
 
-   TcpipRecursiveMutexEnter( &TCPLock, TRUE );
-   
-   Status =  TCPTranslateError( OskitTCPListen( Connection->SocketContext,
-                                               Backlog ) );
-   
-   TcpipRecursiveMutexLeave( &TCPLock );
+    /* Make our code remove all pending IRPs */
+    Connection->State |= SEL_FIN;
+    DrainSignals();
 
-   TI_DbgPrint(DEBUG_TCP,("TCPListen finished %x\n", Status));
-   
-   return Status;
-}
+    TcpipRecursiveMutexLeave( &TCPLock );
 
-NTSTATUS TCPAccept
-( PTDI_REQUEST Request,
-  VOID **NewSocketContext ) {
-   NTSTATUS Status;
+    TI_DbgPrint(DEBUG_TCP,("TCPClose finished %x\n", Status));
 
-   TI_DbgPrint(DEBUG_TCP,("TCPAccept started\n"));
-   Status = STATUS_UNSUCCESSFUL;
-   TI_DbgPrint(DEBUG_TCP,("TCPAccept finished %x\n", Status));
-   return Status;
+    return Status;
 }
 
 NTSTATUS TCPReceiveData
@@ -483,12 +587,13 @@ NTSTATUS TCPReceiveData
   ULONG ReceiveFlags,
   PTCP_COMPLETION_ROUTINE Complete,
   PVOID Context ) {
-    PCHAR DataBuffer;
+    OSK_PCHAR DataBuffer;
     UINT DataLen, Received = 0;
     NTSTATUS Status;
     PTDI_BUCKET Bucket;
 
-    TI_DbgPrint(DEBUG_TCP,("Called for %d bytes\n", ReceiveLength));
+    TI_DbgPrint(DEBUG_TCP,("Called for %d bytes (on socket %x)\n",
+                           ReceiveLength, Connection->SocketContext));
 
     ASSERT_KM_POINTER(Connection->SocketContext);
 
@@ -509,8 +614,7 @@ NTSTATUS TCPReceiveData
     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 ) {
@@ -518,7 +622,7 @@ NTSTATUS TCPReceiveData
            TcpipRecursiveMutexLeave( &TCPLock );
            return STATUS_NO_MEMORY;
        }
-       
+
        Bucket->Request.RequestNotifyObject = Complete;
        Bucket->Request.RequestContext = Context;
        *BytesReceived = 0;
@@ -554,22 +658,87 @@ NTSTATUS TCPSendData
     TI_DbgPrint(DEBUG_TCP,("Connection->SocketContext = %x\n",
                           Connection->SocketContext));
 
-    Status = OskitTCPSend( Connection->SocketContext, 
-                          BufferData, PacketSize, (PUINT)DataUsed, 0 );
+    Status = OskitTCPSend( Connection->SocketContext,
+                          (OSK_PCHAR)BufferData, PacketSize,
+                          (PUINT)DataUsed, 0 );
 
     TcpipRecursiveMutexLeave( &TCPLock );
 
     return Status;
 }
 
-VOID TCPTimeout(VOID) { 
-    static int Times = 0;
+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 );
-    if( (Times++ % 5) == 0 ) {
-       TimerOskitTCP();
-    }
-    DrainSignals();
+
+    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 */