From: John Hodge Date: Thu, 4 Mar 2010 14:32:03 +0000 (+0800) Subject: More work on TCP, Connection is successfully established, but problemw with ACKing... X-Git-Tag: rel0.06~289 X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=f2fd50e797e6a3b3590e4c2e13b6782dd87c25a2;p=tpg%2Facess2.git More work on TCP, Connection is successfully established, but problemw with ACKing packets. - RST is sent after ACKing first data packet. - Also did some changes to Debug_DumpHex and Threads_Get* --- diff --git a/Kernel/Makefile.BuildNum b/Kernel/Makefile.BuildNum index a1e25812..96320a61 100644 --- a/Kernel/Makefile.BuildNum +++ b/Kernel/Makefile.BuildNum @@ -1 +1 @@ -BUILD_NUM = 1479 +BUILD_NUM = 1508 diff --git a/Kernel/debug.c b/Kernel/debug.c index 857ab596..be937169 100644 --- a/Kernel/debug.c +++ b/Kernel/debug.c @@ -380,10 +380,15 @@ void Debug_HexDump(char *Header, void *Data, Uint Length) while(Length >= 16) { - Log("%04x: %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x %02x", + #define CH(n) ((' '<=cdat[(n)]&&cdat[(n)]<=0x7F) ? cdat[(n)] : '.') + Log("%04x: %02x %02x %02x %02x %02x %02x %02x %02x" + " %02x %02x %02x %02x %02x %02x %02x %02x" + " %c%c%c%c%c%c%c%c %c%c%c%c%c%c%c%c", pos, cdat[0], cdat[1], cdat[2], cdat[3], cdat[4], cdat[5], cdat[6], cdat[7], - cdat[8], cdat[9], cdat[10], cdat[11], cdat[12], cdat[13], cdat[14], cdat[15] + cdat[8], cdat[9], cdat[10], cdat[11], cdat[12], cdat[13], cdat[14], cdat[15], + CH(0), CH(1), CH(2), CH(3), CH(4), CH(5), CH(6), CH(7), + CH(8), CH(9), CH(10), CH(11), CH(12), CH(13), CH(14), CH(15) ); Length -= 16; cdat += 16; diff --git a/Kernel/include/acess.h b/Kernel/include/acess.h index d7f2b0d6..65a4b6e0 100644 --- a/Kernel/include/acess.h +++ b/Kernel/include/acess.h @@ -13,6 +13,8 @@ #include "errno.h" // --- Types --- +typedef int tPID; +typedef int tTID; typedef Uint tUID; typedef Uint tGID; typedef Sint64 tTimestamp; @@ -367,6 +369,8 @@ extern int Proc_Spawn(char *Path); extern void Threads_Exit(); extern void Threads_Yield(); extern void Threads_Sleep(); +extern tPID Threads_GetPID(); +extern tTID Threads_GetTID(); extern tUID Threads_GetUID(); extern tGID Threads_GetGID(); extern int SpawnTask(tThreadFunction Function, void *Arg); diff --git a/Kernel/threads.c b/Kernel/threads.c index 33417083..075350dd 100644 --- a/Kernel/threads.c +++ b/Kernel/threads.c @@ -610,11 +610,11 @@ void Threads_SendSignal(int TID, int Num) #endif // --- Process Structure Access Functions --- -int Threads_GetPID() +tPID Threads_GetPID() { return Proc_GetCurThread()->TGID; } -int Threads_GetTID() +tTID Threads_GetTID() { return Proc_GetCurThread()->TID; } diff --git a/Modules/IPStack/tcp.c b/Modules/IPStack/tcp.c index 302e07eb..135c9c80 100644 --- a/Modules/IPStack/tcp.c +++ b/Modules/IPStack/tcp.c @@ -69,7 +69,7 @@ void TCP_StartConnection(tTCPConnection *Conn) hdr.DestPort = Conn->RemotePort; Conn->NextSequenceSend = rand(); hdr.SequenceNumber = Conn->NextSequenceSend; - hdr.DataOffset = (sizeof(tTCPHeader)+3)/4; + hdr.DataOffset = (sizeof(tTCPHeader)/4) << 4; hdr.Flags = TCP_FLAG_SYN; hdr.WindowSize = 0; // TODO hdr.Checksum = 0; // TODO @@ -101,7 +101,7 @@ 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; } } @@ -116,48 +116,57 @@ void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffe tTCPListener *srv; tTCPConnection *conn; - Log("[TCP ] sizeof(tTCPHeader) = %i", sizeof(tTCPHeader)); - Log("[TCP ] SourcePort = %i", ntohs(hdr->SourcePort)); - Log("[TCP ] DestPort = %i", ntohs(hdr->DestPort)); + Log("[TCP ] SourcePort = %i, DestPort = %i", + ntohs(hdr->SourcePort), ntohs(hdr->DestPort)); Log("[TCP ] SequenceNumber = 0x%x", ntohl(hdr->SequenceNumber)); Log("[TCP ] AcknowlegementNumber = 0x%x", 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 ] CWR = %B, ECE = %B", + !!(hdr->Flags & TCP_FLAG_CWR), !!(hdr->Flags & TCP_FLAG_ECE)); + Log("[TCP ] URG = %B, ACK = %B", + !!(hdr->Flags & TCP_FLAG_URG), !!(hdr->Flags & TCP_FLAG_ACK)); + Log("[TCP ] PSH = %B, RST = %B", + !!(hdr->Flags & TCP_FLAG_PSH), !!(hdr->Flags & TCP_FLAG_RST)); + Log("[TCP ] SYN = %B, FIN = %B", + !!(hdr->Flags & TCP_FLAG_SYN), !!(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)); + if( Length > (hdr->DataOffset >> 4)*4 ) + { + Debug_HexDump( + "[TCP ] Packet Data = ", + (Uint8*)hdr + (hdr->DataOffset >> 4)*4, + Length - (hdr->DataOffset >> 4)*4 + ); + } + // Check Servers { for( srv = gTCP_Listeners; srv; srv = srv->Next ) { - Log("[TCP ] Server %p, Port = 0x%04x", srv, srv->Port); // Check if the server is active if(srv->Port == 0) continue; // Check the interface - Log("[TCP ] Interface = %p (== %p ?)", srv->Interface, Interface); if(srv->Interface && srv->Interface != Interface) continue; // Check the destination port - Log("[TCP ] hdr->DestPort = 0x%04x", ntohs(hdr->DestPort)); if(srv->Port != htons(hdr->DestPort)) continue; - Log("[TCP ] Matches"); + Log("[TCP ] Matches server %p", srv); // Is this in an established connection? for( conn = srv->Connections; conn; conn = conn->Next ) { + 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 + Log("[TCP ] conn->RemotePort(%i) == hdr->SourcePort(%i)", + conn->RemotePort, ntohs(hdr->SourcePort)); if(conn->RemotePort != ntohs(hdr->SourcePort)) continue; // Check Source IP @@ -166,6 +175,7 @@ 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("[TCP ] Matches connection %p", conn); // We have a response! TCP_INT_HandleConnectionPacket(conn, hdr, Length); @@ -176,7 +186,7 @@ void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffe // Open a new connection (well, check that it's a SYN) if(hdr->Flags != TCP_FLAG_SYN) { Log("[TCP ] Packet is not a SYN"); - continue; + return ; } // TODO: Check for halfopen max @@ -193,7 +203,8 @@ void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffe case 6: conn->RemoteIP.v6 = *(tIPv6*)Address; break; } - conn->NextSequenceRcv = ntohl( hdr->SequenceNumber ); + conn->NextSequenceRcv = ntohl( hdr->SequenceNumber ) + 1; + // + (Length-(hdr->DataOffset>>4)*4); conn->NextSequenceSend = rand(); // Create node @@ -208,21 +219,28 @@ void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffe // 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); - conn->Next = srv->Connections; - srv->Connections = conn; + 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 - Log("[TCP ] TODO: Sending SYN ACK"); hdr->Flags |= TCP_FLAG_ACK; - hdr->AcknowlegementNumber = hdr->SequenceNumber; + hdr->AcknowlegementNumber = htonl(conn->NextSequenceRcv); hdr->SequenceNumber = htonl(conn->NextSequenceSend); hdr->DestPort = hdr->SourcePort; - hdr->SourcePort = htonl(srv->Port); + hdr->SourcePort = htons(srv->Port); + hdr->DataOffset = (sizeof(tTCPHeader)/4) << 4; TCP_SendPacket( conn, sizeof(tTCPHeader), hdr ); - break; + return ; } } @@ -244,8 +262,11 @@ void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffe continue; TCP_INT_HandleConnectionPacket(conn, hdr, Length); + return ; } } + + Log("[TCP ] No Match"); } /** @@ -261,23 +282,37 @@ void TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Head Connection->NextSequenceRcv = Header->SequenceNumber + 1; } + // Get length of data + dataLen = Length - (Header->DataOffset>>4)*4; + Log("[TCP ] HandleConnectionPacket - dataLen = %i", dataLen); + if(Header->Flags & TCP_FLAG_ACK) { // TODO: Process an ACKed Packet Log("[TCP ] Conn %p, Packet 0x%x ACKed", Connection, Header->AcknowlegementNumber); - return ; } + if(dataLen == 0) return ; + + // NOTES: + // Flags + // PSH - Has Data? + // /NOTES + // Allocate and fill cached packet - dataLen = Length - (Header->DataOffset&0xF)*4; pkt = malloc( dataLen + sizeof(tTCPStoredPacket) ); pkt->Next = NULL; - pkt->Sequence = Header->SequenceNumber; - memcpy(pkt->Data, (Uint8*)Header + (Header->DataOffset&0xF)*4, dataLen); + 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? - if( Header->SequenceNumber != Connection->NextSequenceRcv ) + if( pkt->Sequence != Connection->NextSequenceRcv ) { tTCPStoredPacket *tmp, *prev; + + 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; @@ -306,9 +341,10 @@ void TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Head } // TODO: Check ACK code validity - Header->AcknowlegementNumber = pkt->Sequence; - Header->SequenceNumber = Connection->NextSequenceSend; - Header->Flags |= TCP_FLAG_ACK; + Header->AcknowlegementNumber = ntohl(pkt->Sequence); + Header->SequenceNumber = ntohl(Connection->NextSequenceSend); + Header->Flags &= TCP_FLAG_SYN; + Header->Flags = TCP_FLAG_ACK; TCP_SendPacket( Connection, sizeof(tTCPHeader), Header ); } @@ -464,13 +500,27 @@ char *TCP_Server_ReadDir(tVFS_Node *Node, int Pos) tTCPConnection *conn; char *ret; - while( srv->NewConnections == NULL ) Threads_Yield(); + 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; + + RELEASE( &srv->lConnections ); ret = malloc(9); - itoa(ret, Node->ImplInt, 16, '0', 8); + itoa(ret, Node->ImplInt, 16, 8, '0'); + Log("TCP_Server_ReadDir: RETURN '%s'", ret); return ret; } @@ -481,7 +531,27 @@ 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); + + // Sanity Check + itoa(tmp, id, 16, 8, '0'); + if(strcmp(tmp, Name) != 0) return NULL; + + // Search + LOCK( &srv->lConnections ); + for(conn = srv->Connections; + conn && conn->Node.ImplInt != id; + conn = conn->Next); + RELEASE( &srv->lConnections ); + + // If not found, ret NULL + if(!conn) return NULL; + + // Return node + return &conn->Node; } /** @@ -570,22 +640,20 @@ Uint64 TCP_Client_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buff tTCPConnection *conn = Node->ImplPtr; tTCPStoredPacket *pkt; + Log("TCP_Client_Read: (Length=%i)", Length); + // Check if connection is open if( conn->State != TCP_ST_OPEN ) return 0; // Poll packets for(;;) - { - // Sleep until the packet is recieved - while( conn->RecievedPackets == NULL ) - Threads_Yield(); - // Threads_Sleep(); - + { // Lock list and check if there is a packet LOCK( &conn->lRecievedPackets ); if( conn->RecievedPackets == NULL ) { - // If not, release the lock and return to waiting + // If not, release the lock, yield and try again RELEASE( &conn->lRecievedPackets ); + Threads_Yield(); continue; } @@ -595,6 +663,8 @@ Uint64 TCP_Client_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buff // 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); diff --git a/Modules/IPStack/tcp.h b/Modules/IPStack/tcp.h index 93e5c1ed..c2ca8930 100644 --- a/Modules/IPStack/tcp.h +++ b/Modules/IPStack/tcp.h @@ -19,7 +19,7 @@ struct sTCPHeader Uint32 SequenceNumber; Uint32 AcknowlegementNumber; #if 0 - struct { + struct { // Lowest to highest unsigned Reserved: 4; unsigned DataOffset: 4; // Size of the header in 32-bit words } __attribute__ ((packed)); @@ -69,7 +69,8 @@ struct sTCPListener int NextID; //!< Name of the next connection tSpinlock lConnections; //!< Spinlock for connections tTCPConnection *Connections; //!< Connections (linked list) - tTCPConnection *volatile NewConnections; + tTCPConnection *volatile NewConnections; + tTCPConnection *ConnectionsTail; }; struct sTCPStoredPacket