// --- Server
tVFS_Node *TCP_Server_Init(tInterface *Interface);
char *TCP_Server_ReadDir(tVFS_Node *Node, int Pos);
-tVFS_Node *TCP_Server_FindDir(tVFS_Node *Node, char *Name);
+tVFS_Node *TCP_Server_FindDir(tVFS_Node *Node, const char *Name);
int TCP_Server_IOCtl(tVFS_Node *Node, int ID, void *Data);
void TCP_Server_Close(tVFS_Node *Node);
// --- Client
// === GLOBALS ===
int giTCP_NumHalfopen = 0;
-tSpinlock glTCP_Listeners;
+tShortSpinlock glTCP_Listeners;
tTCPListener *gTCP_Listeners;
-tSpinlock glTCP_OutbountCons;
+tShortSpinlock glTCP_OutbountCons;
tTCPConnection *gTCP_OutbountCons;
Uint32 gaTCP_PortBitmap[0x800];
int giTCP_NextOutPort = TCP_MIN_DYNPORT;
IPv4_RegisterCallback(IP4PROT_TCP, TCP_GetPacket);
}
-/**
- * \brief Open a connection to another host using TCP
- * \param Conn Connection structure
- */
-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)/4) << 4;
- hdr.Flags = TCP_FLAG_SYN;
- hdr.WindowSize = 0xFFFF; // Max
- hdr.Checksum = 0; // TODO
- hdr.UrgentPointer = 0;
-
- TCP_SendPacket( Conn, sizeof(tTCPHeader), &hdr );
- return ;
-}
-
/**
* \brief Sends a packet from the specified connection, calculating the checksums
* \param Conn Connection
case 4: // Append IPv4 Pseudo Header
buflen = 4 + 4 + 4 + ((Length+1)&~1);
buf = malloc( buflen );
- buf[0] = Conn->Interface->IP4.Address.L;
+ buf[0] = ((tIPv4*)Conn->Interface->Address)->L;
buf[1] = Conn->RemoteIP.v4.L;
buf[2] = (htons(Length)<<16) | (6<<8) | 0;
Data->Checksum = 0;
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",
Log_Log("TCP", "Checksum = 0x%x", htons(hdr->Checksum));
Log_Log("TCP", "UrgentPointer = 0x%x", htons(hdr->UrgentPointer));
*/
+ Log_Log("TCP", "Flags = %s%s%s%s%s%s",
+ (hdr->Flags & TCP_FLAG_CWR) ? "CWR " : "",
+ (hdr->Flags & TCP_FLAG_ECE) ? "ECE " : "",
+ (hdr->Flags & TCP_FLAG_URG) ? "URG " : "",
+ (hdr->Flags & TCP_FLAG_ACK) ? "ACK " : "",
+ (hdr->Flags & TCP_FLAG_PSH) ? "PSH " : "",
+ (hdr->Flags & TCP_FLAG_RST) ? "RST " : "",
+ (hdr->Flags & TCP_FLAG_SYN) ? "SYN " : "",
+ (hdr->Flags & TCP_FLAG_FIN) ? "FIN " : ""
+ );
if( Length > (hdr->DataOffset >> 4)*4 )
{
// 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);
+ SHORTLOCK(&srv->lConnections);
if( !srv->Connections )
srv->Connections = conn;
else
srv->ConnectionsTail = conn;
if(!srv->NewConnections)
srv->NewConnections = conn;
- RELEASE(&srv->lConnections);
+ SHORTLOCK(&srv->lConnections);
// Send the SYN ACK
hdr->Flags |= TCP_FLAG_ACK;
tTCPStoredPacket *pkt;
int dataLen;
- Connection->State = TCP_ST_OPEN;
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);
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 ;
pkt->Sequence, Connection->NextSequenceRcv);
// No? Well, let's cache it and look at it later
- LOCK( &Connection->lFuturePackets );
+ SHORTLOCK( &Connection->lFuturePackets );
for(tmp = Connection->FuturePackets;
tmp;
prev = tmp, tmp = tmp->Next)
else
Connection->FuturePackets = pkt;
pkt->Next = tmp;
- RELEASE( &Connection->lFuturePackets );
+ SHORTREL( &Connection->lFuturePackets );
}
else
{
TCP_INT_AppendRecieved(Connection, pkt);
free(pkt);
Log_Log("TCP", "0x%08x += %i", Connection->NextSequenceRcv, dataLen);
- Connection->NextSequenceRcv += dataLen + 1;
+ 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
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_ACK; // Add ACK
Log_Log("TCP", "Sending ACK for 0x%08x", Connection->NextSequenceRcv);
TCP_SendPacket( Connection, sizeof(tTCPHeader), Header );
+ //Connection->NextSequenceSend ++;
}
}
*/
void TCP_INT_AppendRecieved(tTCPConnection *Connection, tTCPStoredPacket *Pkt)
{
- LOCK( &Connection->lRecievedPackets );
+ Mutex_Acquire( &Connection->lRecievedPackets );
if(Connection->RecievedBuffer->Length + Pkt->Length > Connection->RecievedBuffer->Space )
{
Log_Error("TCP", "Buffer filled, packet dropped (%s)",
RingBuffer_Write( Connection->RecievedBuffer, Pkt->Data, Pkt->Length );
- RELEASE( &Connection->lRecievedPackets );
+ Mutex_Release( &Connection->lRecievedPackets );
}
/**
{
prev = NULL;
// Look for the next expected packet in the cache.
- LOCK( &Connection->lFuturePackets );
+ SHORTLOCK( &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 );
+ SHORTREL( &Connection->lFuturePackets );
return;
}
Connection->FuturePackets = pkt->Next;
// Release list
- RELEASE( &Connection->lFuturePackets );
+ SHORTREL( &Connection->lFuturePackets );
// Looks like we found one
TCP_INT_AppendRecieved(Connection, pkt);
srv->Node.IOCtl = TCP_Server_IOCtl;
srv->Node.Close = TCP_Server_Close;
- LOCK(&glTCP_Listeners);
+ SHORTLOCK(&glTCP_Listeners);
srv->Next = gTCP_Listeners;
gTCP_Listeners = srv;
- RELEASE(&glTCP_Listeners);
+ SHORTREL(&glTCP_Listeners);
return &srv->Node;
}
Log_Log("TCP", "Thread %i waiting for a connection", Threads_GetTID());
for(;;)
{
- LOCK( &srv->lConnections );
+ SHORTLOCK( &srv->lConnections );
if( srv->NewConnections != NULL ) break;
- RELEASE( &srv->lConnections );
- Threads_Yield();
+ SHORTREL( &srv->lConnections );
+ Threads_Yield(); // TODO: Sleep until poked
continue;
}
conn = srv->NewConnections;
srv->NewConnections = conn->Next;
+ SHORTREL( &srv->lConnections );
+
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, conn->Node.ImplInt, 16, 8, '0');
* \param Node Server node
* \param Name Hexadecimal ID of the node
*/
-tVFS_Node *TCP_Server_FindDir(tVFS_Node *Node, char *Name)
+tVFS_Node *TCP_Server_FindDir(tVFS_Node *Node, const char *Name)
{
tTCPConnection *conn;
tTCPListener *srv = Node->ImplPtr;
Log_Debug("TCP", "srv->ConnectionsTail = %p", srv->ConnectionsTail);
// Search
- LOCK( &srv->lConnections );
+ SHORTLOCK( &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 );
+ SHORTREL( &srv->lConnections );
// If not found, ret NULL
if(!conn) {
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;
conn->Node.IOCtl = TCP_Client_IOCtl;
conn->Node.Close = TCP_Client_Close;
- LOCK(&glTCP_OutbountCons);
+ conn->RecievedBuffer = RingBuffer_Create( TCP_RECIEVE_BUFFER_SIZE );
+
+ SHORTLOCK(&glTCP_OutbountCons);
conn->Next = gTCP_OutbountCons;
gTCP_OutbountCons = conn;
- RELEASE(&glTCP_OutbountCons);
+ SHORTREL(&glTCP_OutbountCons);
return &conn->Node;
}
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;
for(;;)
{
// Lock list and check if there is a packet
- LOCK( &conn->lRecievedPackets );
+ Mutex_Acquire( &conn->lRecievedPackets );
if( conn->RecievedBuffer->Length == 0 ) {
// If not, release the lock, yield and try again
- RELEASE( &conn->lRecievedPackets );
- Threads_Yield();
+ Mutex_Release( &conn->lRecievedPackets );
+ Threads_Yield(); // TODO: Less expensive wait
continue;
}
len = RingBuffer_Read( destbuf, conn->RecievedBuffer, Length );
// Release the lock (we don't need it any more)
- RELEASE( &conn->lRecievedPackets );
+ Mutex_Release( &conn->lRecievedPackets );
LEAVE('i', len);
return len;
packet->DataOffset = (sizeof(tTCPHeader)/4)*16;
packet->WindowSize = TCP_WINDOW_SIZE;
- //packet->AcknowlegementNumber = htonl(Connection->NextSequenceRcv);
- packet->AcknowlegementNumber = 0;
+ packet->AcknowlegementNumber = htonl(Connection->NextSequenceRcv);
packet->SequenceNumber = htonl(Connection->NextSequenceSend);
- //packet->Flags = TCP_FLAG_PSH; // Hey, ACK if you can!
+ packet->Flags = TCP_FLAG_PSH|TCP_FLAG_ACK; // Hey, ACK if you can!
memcpy(packet->Options, Data, 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;
return Length;
}
+/**
+ * \brief Open a connection to another host using TCP
+ * \param Conn Connection structure
+ */
+void TCP_StartConnection(tTCPConnection *Conn)
+{
+ tTCPHeader hdr = {0};
+
+ 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
+
+ TCP_SendPacket( Conn, sizeof(tTCPHeader), &hdr );
+
+ Conn->NextSequenceSend ++;
+ Conn->State = TCP_ST_SYN_SENT;
+ return ;
+}
+
/**
* \brief Control a client socket
*/
if(conn->State != TCP_ST_CLOSED) return -1;
if(!CheckMem(Data, sizeof(Uint16))) return -1;
conn->RemotePort = *(Uint16*)Data;
- return 0;
+ return conn->RemotePort;
case 6: // Set Remote IP
if( conn->State != TCP_ST_CLOSED )
return 0;
case 7: // Connect
- if(conn->LocalPort == -1)
+ if(conn->LocalPort == 0xFFFF)
conn->LocalPort = TCP_GetUnusedPort();
if(conn->RemotePort == -1)
return 0;
TCP_StartConnection(conn);
return 1;
+
+ // Get recieve buffer length
+ case 8:
+ return conn->RecievedBuffer->Length;
}
return 0;
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);
}