* Acess2 IP Stack
* - TCP Handling
*/
+#define DEBUG 1
#include "ipstack.h"
#include "ipv4.h"
#include "tcp.h"
#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);
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",
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 )
{
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;
hdr->SourcePort = htons(srv->Port);
hdr->DataOffset = (sizeof(tTCPHeader)/4) << 4;
TCP_SendPacket( conn, sizeof(tTCPHeader), hdr );
-
+ conn->NextSequenceSend ++;
return ;
}
}
Connection->State = TCP_ST_OPEN;
if(Header->Flags & TCP_FLAG_SYN) {
- Connection->NextSequenceRcv = Header->SequenceNumber + 1;
+ Connection->NextSequenceRcv = ntohl(Header->SequenceNumber) + 1;
}
// Get length of data
Log_Log("TCP", "Conn %p, Packet 0x%x ACKed", Connection, Header->AcknowlegementNumber);
}
- if(dataLen == 0) return ;
+ if(dataLen == 0) {
+ Log_Log("TCP", "Empty Packet");
+ return ;
+ }
// NOTES:
// Flags
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;
{
// Ooh, Goodie! Add it to the recieved list
TCP_INT_AppendRecieved(Connection, pkt);
- if(dataLen)
- Connection->NextSequenceRcv += dataLen;
- else
- Connection->NextSequenceRcv += 1;
+ free(pkt);
+ Log_Log("TCP", "0x%08x += %i", Connection->NextSequenceRcv, dataLen);
+ Connection->NextSequenceRcv += dataLen + 1;
// 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);
- // TODO: Check ACK code validity
- Header->AcknowlegementNumber = ntohl(Connection->NextSequenceRcv);
- Header->SequenceNumber = ntohl(Connection->NextSequenceSend);
- Header->Flags &= TCP_FLAG_SYN;
- Header->Flags = TCP_FLAG_ACK;
+ // ACK Packet
+ 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 );
}
}
void TCP_INT_AppendRecieved(tTCPConnection *Connection, tTCPStoredPacket *Pkt)
{
LOCK( &Connection->lRecievedPackets );
- if(Connection->RecievedPackets)
+ if(Connection->RecievedBuffer->Length + Pkt->Length > Connection->RecievedBuffer->Space )
{
- Connection->RecievedPacketsTail->Next = Pkt;
- Connection->RecievedPacketsTail = Pkt;
- }
- else
- {
- Connection->RecievedPackets = Pkt;
- Connection->RecievedPacketsTail = Pkt;
+ Log_Error("TCP", "Buffer filled, packet dropped (%s)",
+ // TCP_INT_DumpConnection(Connection)
+ ""
+ );
+ return ;
}
+
+ RingBuffer_Write( Connection->RecievedBuffer, Pkt->Data, Pkt->Length );
+
RELEASE( &Connection->lRecievedPackets );
}
// Looks like we found one
TCP_INT_AppendRecieved(Connection, pkt);
Connection->NextSequenceRcv += pkt->Length;
+ free(pkt);
}
}
srv = malloc( sizeof(tTCPListener) );
- Log_Debug("TCP", "srv = %p", srv);
-
if( srv == NULL ) {
Log_Warning("TCP", "malloc failed for listener (%i) bytes", sizeof(tTCPListener));
return NULL;
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;
tTCPListener *srv = Node->ImplPtr;
tTCPConnection *conn;
char *ret;
+
+ ENTER("pNode iPos", Node, Pos);
Log_Log("TCP", "Thread %i waiting for a connection", Threads_GetTID());
for(;;)
// Increment the new list (the current connection is still on the
- // normal list
+ // 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, 8, '0');
- Log("TCP_Server_ReadDir: RETURN '%s'", ret);
+ itoa(ret, conn->Node.ImplInt, 16, 8, '0');
+ Log_Log("TCP", "Thread %i got '%s'", Threads_GetTID(), ret);
+ LEAVE('s', ret);
return ret;
}
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) return NULL;
+ 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->Node.ImplInt != id;
- conn = conn->Next);
+ 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) return NULL;
+ if(!conn) {
+ LOG("Connection %i not found", id);
+ LEAVE('n');
+ return NULL;
+ }
// Return node
+ LEAVE('p', &conn->Node);
return &conn->Node;
}
Uint64 TCP_Client_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buffer)
{
tTCPConnection *conn = Node->ImplPtr;
- tTCPStoredPacket *pkt;
+ char *destbuf = Buffer;
+ size_t len;
- Log("TCP_Client_Read: (Length=%i)", Length);
+ ENTER("pNode XOffset XLength pBuffer", Node, Offset, Length, Buffer);
// Check if connection is open
- if( conn->State != TCP_ST_OPEN ) return 0;
+ 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->RecievedPackets == NULL ) {
+ if( conn->RecievedBuffer->Length == 0 ) {
// If not, release the lock, yield and try again
RELEASE( &conn->lRecievedPackets );
Threads_Yield();
continue;
}
- // Get packet pointer
- pkt = conn->RecievedPackets;
- conn->RecievedPackets = pkt->Next;
+ // 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 );
-
- Log("TCP_Client_Read: pkt->Length = %i", pkt->Length);
-
- // Copy Data
- if(Length > pkt->Length) Length = pkt->Length;
- memcpy(Buffer, pkt->Data, Length);
-
- // Free packet and return
- free(pkt);
- return Length;
+
+ 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->AcknowlegementNumber = 0;
+ packet->SequenceNumber = htonl(Connection->NextSequenceSend);
+ //packet->Flags = TCP_FLAG_PSH; // 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
+ 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;
}
/**
git.ucc.asn.au / tpg / acess2.git / commitdiff
UCC git Repository :: git.ucc.asn.au