Random fixes, disabled debug in vterm, random crash disappeared, also doing fixes...
[tpg/acess2.git] / Modules / IPStack / tcp.c
index 9225ffa..90f3dc9 100644 (file)
@@ -2,19 +2,26 @@
  * Acess2 IP Stack
  * - TCP Handling
  */
+#define DEBUG  1
 #include "ipstack.h"
 #include "ipv4.h"
 #include "tcp.h"
 
-#define TCP_MIN_DYNPORT        0x1000
+#define TCP_MIN_DYNPORT        0xC000
 #define TCP_MAX_HALFOPEN       1024    // Should be enough
 
+#define TCP_MAX_PACKET_SIZE    1024
+#define TCP_WINDOW_SIZE        0x2000
+#define TCP_RECIEVE_BUFFER_SIZE        0x4000
+
 // === PROTOTYPES ===
 void   TCP_Initialise();
 void   TCP_StartConnection(tTCPConnection *Conn);
-void   TCP_SendPacket( tTCPConnection *Conn, size_t Length, tTCPHeader *Data );
+void   TCP_SendPacket(tTCPConnection *Conn, size_t Length, tTCPHeader *Data);
 void   TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffer);
-void   TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Header);
+void   TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Header, int Length);
+void   TCP_INT_AppendRecieved(tTCPConnection *Connection, tTCPStoredPacket *Ptk);
+void   TCP_INT_UpdateRecievedFromFuture(tTCPConnection *Connection);
 Uint16 TCP_GetUnusedPort();
  int   TCP_AllocatePort(Uint16 Port);
  int   TCP_DeallocatePort(Uint16 Port);
@@ -46,8 +53,9 @@ Uint32        gaTCP_PortBitmap[0x800];
 
 // === CODE ===
 /**
- * \fn void TCP_Initialise()
  * \brief Initialise the TCP Layer
+ * 
+ * Registers the client and server files and the GetPacket callback
  */
 void TCP_Initialise()
 {
@@ -56,32 +64,11 @@ void TCP_Initialise()
        IPv4_RegisterCallback(IP4PROT_TCP, TCP_GetPacket);
 }
 
-/**
- * \brief Open a connection to another host using TCP
- */
-void TCP_StartConnection(tTCPConnection *Conn)
-{
-       tTCPHeader      hdr;
-
-       hdr.SourcePort = Conn->LocalPort;
-       hdr.DestPort = Conn->RemotePort;
-       Conn->NextSequenceSend = rand();
-       hdr.SequenceNumber = Conn->NextSequenceSend;
-       hdr.DataOffset = (sizeof(tTCPHeader)+3)/4;
-       hdr.Flags = TCP_FLAG_SYN;
-       hdr.WindowSize = 0;     // TODO
-       hdr.Checksum = 0;       // TODO
-       hdr.UrgentPointer = 0;
-       // SEND PACKET
-       TCP_SendPacket( Conn, sizeof(tTCPHeader), &hdr );
-       return ;
-}
-
 /**
  * \brief Sends a packet from the specified connection, calculating the checksums
  * \param Conn Connection
  * \param Length       Length of data
- * \param Data Packet data
+ * \param Data Packet data (cast as a TCP Header)
  */
 void TCP_SendPacket( tTCPConnection *Conn, size_t Length, tTCPHeader *Data )
 {
@@ -90,7 +77,7 @@ void TCP_SendPacket( tTCPConnection *Conn, size_t Length, tTCPHeader *Data )
        switch( Conn->Interface->Type )
        {
        case 4: // Append IPv4 Pseudo Header
-               buflen = 4 + 4 + 4 + ((Length+1)&1);
+               buflen = 4 + 4 + 4 + ((Length+1)&~1);
                buf = malloc( buflen );
                buf[0] = Conn->Interface->IP4.Address.L;
                buf[1] = Conn->RemoteIP.v4.L;
@@ -99,14 +86,17 @@ void TCP_SendPacket( tTCPConnection *Conn, size_t Length, tTCPHeader *Data )
                memcpy( &buf[3], Data, Length );
                Data->Checksum = IPv4_Checksum( buf, buflen );
                free(buf);
-               IPv4_SendPacket(Conn->Interface, Conn->RemoteIP.v4, IP4PROT_TCP, 0, buflen, buf);
+               IPv4_SendPacket(Conn->Interface, Conn->RemoteIP.v4, IP4PROT_TCP, 0, Length, Data);
                break;
        }
 }
 
 /**
- * \fn void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffer)
  * \brief Handles a packet from the IP Layer
+ * \param Interface    Interface the packet arrived from
+ * \param Address      Pointer to the addres structure
+ * \param Length       Size of packet in bytes
+ * \param Buffer       Packet data
  */
 void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffer)
 {
@@ -114,25 +104,35 @@ void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffe
        tTCPListener    *srv;
        tTCPConnection  *conn;
 
-       Log("[TCP  ] sizeof(tTCPHeader) = %i", sizeof(tTCPHeader));
-       Log("[TCP  ] DestPort = %i", ntohs(hdr->DestPort));
-       Log("[TCP  ] DestPort = %i", ntohs(hdr->DestPort));
-       Log("[TCP  ] SequenceNumber = %i", ntohl(hdr->SequenceNumber));
-       Log("[TCP  ] AcknowlegementNumber = %i", ntohl(hdr->AcknowlegementNumber));
-       Log("[TCP  ] DataOffset = %i", hdr->DataOffset >> 4);
-       Log("[TCP  ] Flags = {");
-       Log("[TCP  ]   CWR = %B", !!(hdr->Flags & TCP_FLAG_CWR));
-       Log("[TCP  ]   ECE = %B", !!(hdr->Flags & TCP_FLAG_ECE));
-       Log("[TCP  ]   URG = %B", !!(hdr->Flags & TCP_FLAG_URG));
-       Log("[TCP  ]   ACK = %B", !!(hdr->Flags & TCP_FLAG_ACK));
-       Log("[TCP  ]   PSH = %B", !!(hdr->Flags & TCP_FLAG_PSH));
-       Log("[TCP  ]   RST = %B", !!(hdr->Flags & TCP_FLAG_RST));
-       Log("[TCP  ]   SYN = %B", !!(hdr->Flags & TCP_FLAG_SYN));
-       Log("[TCP  ]   FIN = %B", !!(hdr->Flags & TCP_FLAG_FIN));
-       Log("[TCP  ] }");
-       Log("[TCP  ] WindowSize = %i", htons(hdr->WindowSize));
-       Log("[TCP  ] Checksum = 0x%x", htons(hdr->Checksum));
-       Log("[TCP  ] UrgentPointer = 0x%x", htons(hdr->UrgentPointer));
+       Log_Log("TCP", "SourcePort = %i, DestPort = %i",
+               ntohs(hdr->SourcePort), ntohs(hdr->DestPort));
+/*
+       Log_Log("TCP", "SequenceNumber = 0x%x", ntohl(hdr->SequenceNumber));
+       Log_Log("TCP", "AcknowlegementNumber = 0x%x", ntohl(hdr->AcknowlegementNumber));
+       Log_Log("TCP", "DataOffset = %i", hdr->DataOffset >> 4);
+       Log_Log("TCP", "Flags = {");
+       Log_Log("TCP", "  CWR = %B, ECE = %B",
+               !!(hdr->Flags & TCP_FLAG_CWR), !!(hdr->Flags & TCP_FLAG_ECE));
+       Log_Log("TCP", "  URG = %B, ACK = %B",
+               !!(hdr->Flags & TCP_FLAG_URG), !!(hdr->Flags & TCP_FLAG_ACK));
+       Log_Log("TCP", "  PSH = %B, RST = %B",
+               !!(hdr->Flags & TCP_FLAG_PSH), !!(hdr->Flags & TCP_FLAG_RST));
+       Log_Log("TCP", "  SYN = %B, FIN = %B",
+               !!(hdr->Flags & TCP_FLAG_SYN), !!(hdr->Flags & TCP_FLAG_FIN));
+       Log_Log("TCP", "}");
+       Log_Log("TCP", "WindowSize = %i", htons(hdr->WindowSize));
+       Log_Log("TCP", "Checksum = 0x%x", htons(hdr->Checksum));
+       Log_Log("TCP", "UrgentPointer = 0x%x", htons(hdr->UrgentPointer));
+*/
+
+       if( Length > (hdr->DataOffset >> 4)*4 )
+       {
+               Debug_HexDump(
+                       "[TCP  ] Packet Data = ",
+                       (Uint8*)hdr + (hdr->DataOffset >> 4)*4,
+                       Length - (hdr->DataOffset >> 4)*4
+                       );
+       }
 
        // Check Servers
        {
@@ -143,16 +143,21 @@ void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffe
                        // Check the interface
                        if(srv->Interface && srv->Interface != Interface)       continue;
                        // Check the destination port
-                       if(srv->Port != hdr->DestPort)  continue;
-
+                       if(srv->Port != htons(hdr->DestPort))   continue;
+                       
+                       Log_Log("TCP", "Matches server %p", srv);
                        // Is this in an established connection?
                        for( conn = srv->Connections; conn; conn = conn->Next )
                        {
+                               Log_Log("TCP", "conn->Interface(%p) == Interface(%p)",
+                                       conn->Interface, Interface);
                                // Check that it is coming in on the same interface
                                if(conn->Interface != Interface)        continue;
 
                                // Check Source Port
-                               if(conn->RemotePort != hdr->SourcePort) continue;
+                               Log_Log("TCP", "conn->RemotePort(%i) == hdr->SourcePort(%i)",
+                                       conn->RemotePort, ntohs(hdr->SourcePort));
+                               if(conn->RemotePort != ntohs(hdr->SourcePort))  continue;
 
                                // Check Source IP
                                if(conn->Interface->Type == 6 && !IP6_EQU(conn->RemoteIP.v6, *(tIPv6*)Address))
@@ -160,16 +165,74 @@ void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffe
                                if(conn->Interface->Type == 4 && !IP4_EQU(conn->RemoteIP.v4, *(tIPv4*)Address))
                                        continue;
 
+                               Log_Log("TCP", "Matches connection %p", conn);
                                // We have a response!
-                               TCP_INT_HandleConnectionPacket(conn, hdr);
+                               TCP_INT_HandleConnectionPacket(conn, hdr, Length);
 
                                return;
                        }
 
+                       Log_Log("TCP", "Opening Connection");
                        // Open a new connection (well, check that it's a SYN)
-                       //TODO
-
-                       break;
+                       if(hdr->Flags != TCP_FLAG_SYN) {
+                               Log_Log("TCP", "Packet is not a SYN");
+                               return ;
+                       }
+                       
+                       // TODO: Check for halfopen max
+                       
+                       conn = calloc(1, sizeof(tTCPConnection));
+                       conn->State = TCP_ST_HALFOPEN;
+                       conn->LocalPort = srv->Port;
+                       conn->RemotePort = ntohs(hdr->SourcePort);
+                       conn->Interface = Interface;
+                       
+                       switch(Interface->Type)
+                       {
+                       case 4: conn->RemoteIP.v4 = *(tIPv4*)Address;   break;
+                       case 6: conn->RemoteIP.v6 = *(tIPv6*)Address;   break;
+                       }
+                       
+                       conn->RecievedBuffer = RingBuffer_Create( TCP_RECIEVE_BUFFER_SIZE );
+                       
+                       conn->NextSequenceRcv = ntohl( hdr->SequenceNumber ) + 1;
+                       conn->NextSequenceSend = rand();
+                       
+                       // Create node
+                       conn->Node.NumACLs = 1;
+                       conn->Node.ACLs = &gVFS_ACL_EveryoneRW;
+                       conn->Node.ImplPtr = conn;
+                       conn->Node.ImplInt = srv->NextID ++;
+                       conn->Node.Read = TCP_Client_Read;
+                       conn->Node.Write = TCP_Client_Write;
+                       //conn->Node.Close = TCP_SrvConn_Close;
+                       
+                       // Hmm... Theoretically, this lock will never have to wait,
+                       // as the interface is locked to the watching thread, and this
+                       // runs in the watching thread. But, it's a good idea to have
+                       // it, just in case
+                       // Oh, wait, there is a case where a wildcard can be used
+                       // (srv->Interface == NULL) so having the lock is a good idea
+                       LOCK(&srv->lConnections);
+                       if( !srv->Connections )
+                               srv->Connections = conn;
+                       else
+                               srv->ConnectionsTail->Next = conn;
+                       srv->ConnectionsTail = conn;
+                       if(!srv->NewConnections)
+                               srv->NewConnections = conn;
+                       RELEASE(&srv->lConnections);
+
+                       // Send the SYN ACK
+                       hdr->Flags |= TCP_FLAG_ACK;
+                       hdr->AcknowlegementNumber = htonl(conn->NextSequenceRcv);
+                       hdr->SequenceNumber = htonl(conn->NextSequenceSend);
+                       hdr->DestPort = hdr->SourcePort;
+                       hdr->SourcePort = htons(srv->Port);
+                       hdr->DataOffset = (sizeof(tTCPHeader)/4) << 4;
+                       TCP_SendPacket( conn, sizeof(tTCPHeader), hdr );
+                       conn->NextSequenceSend ++;
+                       return ;
                }
        }
 
@@ -182,7 +245,7 @@ void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffe
                        if(conn->Interface != Interface)        continue;
 
                        // Check Source Port
-                       if(conn->RemotePort != hdr->SourcePort) continue;
+                       if(conn->RemotePort != ntohs(hdr->SourcePort))  continue;
 
                        // Check Source IP
                        if(conn->Interface->Type == 6 && !IP6_EQU(conn->RemoteIP.v6, *(tIPv6*)Address))
@@ -190,17 +253,203 @@ void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffe
                        if(conn->Interface->Type == 4 && !IP4_EQU(conn->RemoteIP.v4, *(tIPv4*)Address))
                                continue;
 
-                       TCP_INT_HandleConnectionPacket(conn, hdr);
+                       TCP_INT_HandleConnectionPacket(conn, hdr, Length);
+                       return ;
                }
        }
+       
+       Log_Log("TCP", "No Match");
 }
 
 /**
  * \brief Handles a packet sent to a specific connection
+ * \param Connection   TCP Connection pointer
+ * \param Header       TCP Packet pointer
+ * \param Length       Length of the packet
  */
-void TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Header)
+void TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Header, int Length)
+{      
+       tTCPStoredPacket        *pkt;
+        int    dataLen;
+       
+       if(Header->Flags & TCP_FLAG_SYN) {
+               Connection->NextSequenceRcv = ntohl(Header->SequenceNumber) + 1;
+       }
+       
+       if( Connection->State == TCP_ST_SYN_SENT )
+       {
+               if( (Header->Flags & (TCP_FLAG_SYN|TCP_FLAG_ACK)) == (TCP_FLAG_SYN|TCP_FLAG_ACK) ) {
+                       
+                       Header->DestPort = Header->SourcePort;
+                       Header->SourcePort = htons(Connection->LocalPort);
+                       Header->AcknowlegementNumber = htonl(Connection->NextSequenceRcv);
+                       Header->SequenceNumber = htonl(Connection->NextSequenceSend);
+                       Header->WindowSize = htons(TCP_WINDOW_SIZE);
+                       Header->Flags = TCP_FLAG_ACK;
+                       Header->DataOffset = (sizeof(tTCPHeader)/4) << 4;
+                       Log_Log("TCP", "ACKing SYN-ACK");
+                       TCP_SendPacket( Connection, sizeof(tTCPHeader), Header );
+                       Connection->State = TCP_ST_OPEN;
+               }
+       }
+       
+       // Get length of data
+       dataLen = Length - (Header->DataOffset>>4)*4;
+       Log_Log("TCP", "HandleConnectionPacket - dataLen = %i", dataLen);
+       
+       if(Header->Flags & TCP_FLAG_ACK) {
+               // TODO: Process an ACKed Packet
+               Log_Log("TCP", "Conn %p, Packet 0x%x ACKed", Connection, Header->AcknowlegementNumber);
+       }
+       
+       // TODO: Check what to do here
+       if(Header->Flags & TCP_FLAG_FIN) {
+               if( Connection->State == TCP_ST_FIN_SENT ) {
+                       Connection->State = TCP_ST_FINISHED;
+                       return ;
+               }
+               else {
+                       Connection->State = TCP_ST_FINISHED;
+                       Header->DestPort = Header->SourcePort;
+                       Header->SourcePort = htons(Connection->LocalPort);
+                       Header->AcknowlegementNumber = htonl(Connection->NextSequenceRcv);
+                       Header->SequenceNumber = htonl(Connection->NextSequenceSend);
+                       Header->Flags = TCP_FLAG_ACK;
+                       TCP_SendPacket( Connection, sizeof(tTCPHeader), Header );
+                       return ;
+               }
+       }
+       
+       if(dataLen == 0) {
+               Log_Log("TCP", "Empty Packet");
+               return ;
+       }
+       
+       // NOTES:
+       // Flags
+       //    PSH - Has Data?
+       // /NOTES
+       
+       // Allocate and fill cached packet
+       pkt = malloc( dataLen + sizeof(tTCPStoredPacket) );
+       pkt->Next = NULL;
+       pkt->Sequence = ntohl(Header->SequenceNumber);
+       pkt->Length = dataLen;
+       memcpy(pkt->Data, (Uint8*)Header + (Header->DataOffset>>4)*4, dataLen);
+       
+       // Is this packet the next expected packet?
+       // TODO: Fix this to check if the packet is in the window.
+       if( pkt->Sequence != Connection->NextSequenceRcv )
+       {
+               tTCPStoredPacket        *tmp, *prev = NULL;
+               
+               Log_Log("TCP", "Out of sequence packet (0x%08x != 0x%08x)",
+                       pkt->Sequence, Connection->NextSequenceRcv);
+               
+               // No? Well, let's cache it and look at it later
+               LOCK( &Connection->lFuturePackets );
+               for(tmp = Connection->FuturePackets;
+                       tmp;
+                       prev = tmp, tmp = tmp->Next)
+               {
+                       if(tmp->Sequence > pkt->Sequence)       break;
+               }
+               if(prev)
+                       prev->Next = pkt;
+               else
+                       Connection->FuturePackets = pkt;
+               pkt->Next = tmp;
+               RELEASE( &Connection->lFuturePackets );
+       }
+       else
+       {
+               // Ooh, Goodie! Add it to the recieved list
+               TCP_INT_AppendRecieved(Connection, pkt);
+               free(pkt);
+               Log_Log("TCP", "0x%08x += %i", Connection->NextSequenceRcv, dataLen);
+               Connection->NextSequenceRcv += dataLen;
+               
+               // TODO: This should be moved out of the watcher thread,
+               // so that a single lost packet on one connection doesn't cause
+               // all connections on the interface to lag.
+               TCP_INT_UpdateRecievedFromFuture(Connection);
+       
+               // ACK Packet
+               Header->DestPort = Header->SourcePort;
+               Header->SourcePort = htons(Connection->LocalPort);
+               Header->AcknowlegementNumber = htonl(Connection->NextSequenceRcv);
+               Header->SequenceNumber = htonl(Connection->NextSequenceSend);
+               Header->WindowSize = htons(TCP_WINDOW_SIZE);
+               Header->Flags &= TCP_FLAG_SYN;  // Eliminate all flags save for SYN
+               Header->Flags |= TCP_FLAG_ACK;  // Add ACK
+               Log_Log("TCP", "Sending ACK for 0x%08x", Connection->NextSequenceRcv);
+               TCP_SendPacket( Connection, sizeof(tTCPHeader), Header );
+               //Connection->NextSequenceSend ++;
+       }
+}
+
+/**
+ * \brief Appends a packet to the recieved list
+ * \param Connection   Connection structure
+ * \param Pkt  Packet structure on heap
+ */
+void TCP_INT_AppendRecieved(tTCPConnection *Connection, tTCPStoredPacket *Pkt)
 {
+       LOCK( &Connection->lRecievedPackets );
+       if(Connection->RecievedBuffer->Length + Pkt->Length > Connection->RecievedBuffer->Space )
+       {
+               Log_Error("TCP", "Buffer filled, packet dropped (%s)",
+               //      TCP_INT_DumpConnection(Connection)
+                       ""
+                       );
+               return ;
+       }
+       
+       RingBuffer_Write( Connection->RecievedBuffer, Pkt->Data, Pkt->Length );
+       
+       RELEASE( &Connection->lRecievedPackets );
+}
 
+/**
+ * \brief Updates the connections recieved list from the future list
+ * \param Connection   Connection structure
+ * 
+ * Updates the recieved packets list with packets from the future (out 
+ * of order) packets list that are now able to be added in direct
+ * sequence.
+ */
+void TCP_INT_UpdateRecievedFromFuture(tTCPConnection *Connection)
+{
+       tTCPStoredPacket        *pkt, *prev;
+       for(;;)
+       {
+               prev = NULL;
+               // Look for the next expected packet in the cache.
+               LOCK( &Connection->lFuturePackets );
+               for(pkt = Connection->FuturePackets;
+                       pkt && pkt->Sequence < Connection->NextSequenceRcv;
+                       prev = pkt, pkt = pkt->Next);
+               
+               // If we can't find the expected next packet, stop looking
+               if(!pkt || pkt->Sequence > Connection->NextSequenceRcv) {
+                       RELEASE( &Connection->lFuturePackets );
+                       return;
+               }
+               
+               // Delete packet from future list
+               if(prev)
+                       prev->Next = pkt->Next;
+               else
+                       Connection->FuturePackets = pkt->Next;
+               
+               // Release list
+               RELEASE( &Connection->lFuturePackets );
+               
+               // Looks like we found one
+               TCP_INT_AppendRecieved(Connection, pkt);
+               Connection->NextSequenceRcv += pkt->Length;
+               free(pkt);
+       }
 }
 
 /**
@@ -263,13 +512,24 @@ int TCP_DeallocatePort(Uint16 Port)
 // --- Server
 tVFS_Node *TCP_Server_Init(tInterface *Interface)
 {
-       tTCPListener    *srv = malloc( sizeof(tTCPListener) );
+       tTCPListener    *srv;
+       
+       srv = malloc( sizeof(tTCPListener) );
+
+       if( srv == NULL ) {
+               Log_Warning("TCP", "malloc failed for listener (%i) bytes", sizeof(tTCPListener));
+               return NULL;
+       }
 
        srv->Interface = Interface;
        srv->Port = 0;
        srv->NextID = 0;
        srv->Connections = NULL;
+       srv->ConnectionsTail = NULL;
+       srv->NewConnections = NULL;
        srv->Next = NULL;
+       srv->Node.Flags = VFS_FFLAG_DIRECTORY;
+       srv->Node.Size = -1;
        srv->Node.ImplPtr = srv;
        srv->Node.NumACLs = 1;
        srv->Node.ACLs = &gVFS_ACL_EveryoneRW;
@@ -297,14 +557,36 @@ char *TCP_Server_ReadDir(tVFS_Node *Node, int Pos)
        tTCPListener    *srv = Node->ImplPtr;
        tTCPConnection  *conn;
        char    *ret;
+       
+       ENTER("pNode iPos", Node, Pos);
 
-       while( srv->NewConnections == NULL )    Threads_Yield();
+       Log_Log("TCP", "Thread %i waiting for a connection", Threads_GetTID());
+       for(;;)
+       {
+               LOCK( &srv->lConnections );
+               if( srv->NewConnections != NULL )       break;
+               RELEASE( &srv->lConnections );
+               Threads_Yield();
+               continue;
+       }
+       
 
+       // Increment the new list (the current connection is still on the 
+       // normal list)
        conn = srv->NewConnections;
        srv->NewConnections = conn->Next;
+       
+       LOG("conn = %p", conn);
+       LOG("srv->Connections = %p", srv->Connections);
+       LOG("srv->NewConnections = %p", srv->NewConnections);
+       LOG("srv->ConnectionsTail = %p", srv->ConnectionsTail);
+       
+       RELEASE( &srv->lConnections );
 
        ret = malloc(9);
-       itoa(ret, Node->ImplInt, 16, '0', 8);
+       itoa(ret, conn->Node.ImplInt, 16, 8, '0');
+       Log_Log("TCP", "Thread %i got '%s'", Threads_GetTID(), ret);
+       LEAVE('s', ret);
        return ret;
 }
 
@@ -315,9 +597,51 @@ char *TCP_Server_ReadDir(tVFS_Node *Node, int Pos)
  */
 tVFS_Node *TCP_Server_FindDir(tVFS_Node *Node, char *Name)
 {
-       return NULL;
+       tTCPConnection  *conn;
+       tTCPListener    *srv = Node->ImplPtr;
+       char    tmp[9];
+        int    id = atoi(Name);
+       
+       ENTER("pNode sName", Node, Name);
+       
+       // Sanity Check
+       itoa(tmp, id, 16, 8, '0');
+       if(strcmp(tmp, Name) != 0) {
+               LOG("'%s' != '%s' (%08x)", Name, tmp, id);
+               LEAVE('n');
+               return NULL;
+       }
+       
+       Log_Debug("TCP", "srv->Connections = %p", srv->Connections);
+       Log_Debug("TCP", "srv->NewConnections = %p", srv->NewConnections);
+       Log_Debug("TCP", "srv->ConnectionsTail = %p", srv->ConnectionsTail);
+       
+       // Search
+       LOCK( &srv->lConnections );
+       for(conn = srv->Connections;
+               conn;
+               conn = conn->Next)
+       {
+               LOG("conn->Node.ImplInt = %i", conn->Node.ImplInt);
+               if(conn->Node.ImplInt == id)    break;
+       }
+       RELEASE( &srv->lConnections );
+       
+       // If not found, ret NULL
+       if(!conn) {
+               LOG("Connection %i not found", id);
+               LEAVE('n');
+               return NULL;
+       }
+       
+       // Return node
+       LEAVE('p', &conn->Node);
+       return &conn->Node;
 }
 
+/**
+ * \brief Handle IOCtl calls
+ */
 int TCP_Server_IOCtl(tVFS_Node *Node, int ID, void *Data)
 {
        tTCPListener    *srv = Node->ImplPtr;
@@ -348,6 +672,9 @@ int TCP_Server_IOCtl(tVFS_Node *Node, int ID, void *Data)
                        srv->Port = TCP_GetUnusedPort();
                else    // Else, mark this as used
                        TCP_AllocatePort(srv->Port);
+               
+               Log_Log("TCP", "Server %p listening on port %i", srv, srv->Port);
+               
                return srv->Port;
        }
        return 0;
@@ -359,14 +686,17 @@ void TCP_Server_Close(tVFS_Node *Node)
 }
 
 // --- Client
+/**
+ * \brief Create a client node
+ */
 tVFS_Node *TCP_Client_Init(tInterface *Interface)
 {
        tTCPConnection  *conn = malloc( sizeof(tTCPConnection) );
 
        conn->State = TCP_ST_CLOSED;
        conn->Interface = Interface;
-       conn->LocalPort = 0;
-       conn->RemotePort = 0;
+       conn->LocalPort = -1;
+       conn->RemotePort = -1;
        memset( &conn->RemoteIP, 0, sizeof(conn->RemoteIP) );
 
        conn->Node.ImplPtr = conn;
@@ -377,6 +707,8 @@ tVFS_Node *TCP_Client_Init(tInterface *Interface)
        conn->Node.IOCtl = TCP_Client_IOCtl;
        conn->Node.Close = TCP_Client_Close;
 
+       conn->RecievedBuffer = RingBuffer_Create( TCP_RECIEVE_BUFFER_SIZE );
+
        LOCK(&glTCP_OutbountCons);
        conn->Next = gTCP_OutbountCons;
        gTCP_OutbountCons = conn;
@@ -385,14 +717,131 @@ tVFS_Node *TCP_Client_Init(tInterface *Interface)
        return &conn->Node;
 }
 
+/**
+ * \brief Wait for a packet and return it
+ * \note If \a Length is smaller than the size of the packet, the rest
+ *       of the packet's data will be discarded.
+ */
 Uint64 TCP_Client_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 {
-       return 0;
+       tTCPConnection  *conn = Node->ImplPtr;
+       char    *destbuf = Buffer;
+       size_t  len;
+       
+       ENTER("pNode XOffset XLength pBuffer", Node, Offset, Length, Buffer);
+       LOG("conn = %p", conn);
+       LOG("conn->State = %i", conn->State);
+       
+       // Check if connection is open
+       while( conn->State == TCP_ST_HALFOPEN || conn->State == TCP_ST_SYN_SENT )
+               Threads_Yield();
+       if( conn->State != TCP_ST_OPEN ) {
+               LEAVE('i', 0);
+               return 0;
+       }
+       
+       // Poll packets
+       for(;;)
+       {
+               // Lock list and check if there is a packet
+               LOCK( &conn->lRecievedPackets );
+               if( conn->RecievedBuffer->Length == 0 ) {
+                       // If not, release the lock, yield and try again
+                       RELEASE( &conn->lRecievedPackets );
+                       Threads_Yield();
+                       continue;
+               }
+               
+               // Attempt to read all `Length` bytes
+               len = RingBuffer_Read( destbuf, conn->RecievedBuffer, Length );
+               
+               // Release the lock (we don't need it any more)
+               RELEASE( &conn->lRecievedPackets );
+       
+               LEAVE('i', len);
+               return len;
+       }
+}
+
+/**
+ * \brief Send a data packet on a connection
+ */
+void TCP_INT_SendDataPacket(tTCPConnection *Connection, size_t Length, void *Data)
+{
+       char    buf[sizeof(tTCPHeader)+Length];
+       tTCPHeader      *packet = (void*)buf;
+       
+       packet->SourcePort = htons(Connection->LocalPort);
+       packet->DestPort = htons(Connection->RemotePort);
+       packet->DataOffset = (sizeof(tTCPHeader)/4)*16;
+       packet->WindowSize = TCP_WINDOW_SIZE;
+       
+       packet->AcknowlegementNumber = htonl(Connection->NextSequenceRcv);
+       packet->SequenceNumber = htonl(Connection->NextSequenceSend);
+       packet->Flags = TCP_FLAG_PSH|TCP_FLAG_ACK;      // Hey, ACK if you can!
+       
+       memcpy(packet->Options, Data, Length);
+       
+       TCP_SendPacket( Connection, sizeof(tTCPHeader)+Length, packet );
+       
+       Connection->NextSequenceSend += Length;
 }
 
+/**
+ * \brief Send some bytes on a connection
+ */
 Uint64 TCP_Client_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
 {
-       return 0;
+       tTCPConnection  *conn = Node->ImplPtr;
+       size_t  rem = Length;
+       
+       ENTER("pNode XOffset XLength pBuffer", Node, Offset, Length, Buffer);
+       
+       // Check if connection is open
+       while( conn->State == TCP_ST_HALFOPEN || conn->State == TCP_ST_SYN_SENT )
+               Threads_Yield();
+       if( conn->State != TCP_ST_OPEN ) {
+               LEAVE('i', 0);
+               return 0;
+       }
+       
+       while( rem > TCP_MAX_PACKET_SIZE )
+       {
+               TCP_INT_SendDataPacket(conn, TCP_MAX_PACKET_SIZE, Buffer);
+               Buffer += TCP_MAX_PACKET_SIZE;
+       }
+       
+       TCP_INT_SendDataPacket(conn, rem, Buffer);
+       
+       LEAVE('i', Length);
+       return Length;
+}
+
+/**
+ * \brief Open a connection to another host using TCP
+ * \param Conn Connection structure
+ */
+void TCP_StartConnection(tTCPConnection *Conn)
+{
+       tTCPHeader      hdr;
+
+       Conn->State = TCP_ST_SYN_SENT;
+
+       hdr.SourcePort = htons(Conn->LocalPort);
+       hdr.DestPort = htons(Conn->RemotePort);
+       Conn->NextSequenceSend = rand();
+       hdr.SequenceNumber = htonl(Conn->NextSequenceSend);
+       hdr.DataOffset = (sizeof(tTCPHeader)/4) << 4;
+       hdr.Flags = TCP_FLAG_SYN;
+       hdr.WindowSize = htons(TCP_WINDOW_SIZE);        // Max
+       hdr.Checksum = 0;       // TODO
+       hdr.UrgentPointer = 0;
+       
+       TCP_SendPacket( Conn, sizeof(tTCPHeader), &hdr );
+       
+       Conn->NextSequenceSend ++;
+       Conn->State = TCP_ST_SYN_SENT;
+       return ;
 }
 
 /**
@@ -441,7 +890,7 @@ int TCP_Client_IOCtl(tVFS_Node *Node, int ID, void *Data)
                return 0;
 
        case 7: // Connect
-               if(conn->LocalPort == -1)
+               if(conn->LocalPort == 0xFFFF)
                        conn->LocalPort = TCP_GetUnusedPort();
                if(conn->RemotePort == -1)
                        return 0;
@@ -455,5 +904,23 @@ int TCP_Client_IOCtl(tVFS_Node *Node, int ID, void *Data)
 
 void TCP_Client_Close(tVFS_Node *Node)
 {
-       free(Node->ImplPtr);
+       tTCPConnection  *conn = Node->ImplPtr;
+       tTCPHeader      packet;
+       
+       packet.SourcePort = htons(conn->LocalPort);
+       packet.DestPort = htons(conn->RemotePort);
+       packet.DataOffset = (sizeof(tTCPHeader)/4)*16;
+       packet.WindowSize = TCP_WINDOW_SIZE;
+       
+       packet.AcknowlegementNumber = 0;
+       packet.SequenceNumber = htonl(conn->NextSequenceSend);
+       packet.Flags = TCP_FLAG_FIN;
+       
+       conn->State = TCP_ST_FIN_SENT;
+       
+       TCP_SendPacket( conn, sizeof(tTCPHeader), &packet );
+       
+       while( conn->State == TCP_ST_FIN_SENT ) Threads_Yield();
+       
+       free(conn);
 }

UCC git Repository :: git.ucc.asn.au