X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FIPStack%2Ftcp.c;h=e42e940cd6ebc1608db1e2a7531c1a0166c90cf5;hb=02cbaac1233be9c5228973a787431fa5e0aa178e;hp=90f3dc9663d9fe62cb8abe7720fbc5d050203ef0;hpb=7d2f8503550796a3cd42d01f944c2baa49a2fcfa;p=tpg%2Facess2.git diff --git a/Modules/IPStack/tcp.c b/Modules/IPStack/tcp.c index 90f3dc96..e42e940c 100644 --- a/Modules/IPStack/tcp.c +++ b/Modules/IPStack/tcp.c @@ -28,7 +28,7 @@ Uint16 TCP_GetUnusedPort(); // --- 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 @@ -44,9 +44,9 @@ tSocketFile gTCP_ClientFile = {NULL, "tcpc", TCP_Client_Init}; // === 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; @@ -79,7 +79,7 @@ void TCP_SendPacket( tTCPConnection *Conn, size_t Length, tTCPHeader *Data ) 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; @@ -124,6 +124,16 @@ void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffe 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 ) { @@ -213,7 +223,7 @@ void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffe // 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 @@ -221,7 +231,7 @@ void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffe srv->ConnectionsTail = conn; if(!srv->NewConnections) srv->NewConnections = conn; - RELEASE(&srv->lConnections); + SHORTREL(&srv->lConnections); // Send the SYN ACK hdr->Flags |= TCP_FLAG_ACK; @@ -347,7 +357,7 @@ void TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Head 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) @@ -359,7 +369,7 @@ void TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Head else Connection->FuturePackets = pkt; pkt->Next = tmp; - RELEASE( &Connection->lFuturePackets ); + SHORTREL( &Connection->lFuturePackets ); } else { @@ -395,7 +405,7 @@ void TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Head */ 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)", @@ -407,7 +417,7 @@ void TCP_INT_AppendRecieved(tTCPConnection *Connection, tTCPStoredPacket *Pkt) RingBuffer_Write( Connection->RecievedBuffer, Pkt->Data, Pkt->Length ); - RELEASE( &Connection->lRecievedPackets ); + Mutex_Release( &Connection->lRecievedPackets ); } /** @@ -425,14 +435,14 @@ void TCP_INT_UpdateRecievedFromFuture(tTCPConnection *Connection) { 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; } @@ -443,7 +453,7 @@ void TCP_INT_UpdateRecievedFromFuture(tTCPConnection *Connection) Connection->FuturePackets = pkt->Next; // Release list - RELEASE( &Connection->lFuturePackets ); + SHORTREL( &Connection->lFuturePackets ); // Looks like we found one TCP_INT_AppendRecieved(Connection, pkt); @@ -538,10 +548,10 @@ tVFS_Node *TCP_Server_Init(tInterface *Interface) 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; } @@ -563,10 +573,10 @@ char *TCP_Server_ReadDir(tVFS_Node *Node, int Pos) 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; } @@ -576,12 +586,12 @@ char *TCP_Server_ReadDir(tVFS_Node *Node, int Pos) 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'); @@ -595,7 +605,7 @@ char *TCP_Server_ReadDir(tVFS_Node *Node, int Pos) * \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; @@ -617,7 +627,7 @@ tVFS_Node *TCP_Server_FindDir(tVFS_Node *Node, char *Name) Log_Debug("TCP", "srv->ConnectionsTail = %p", srv->ConnectionsTail); // Search - LOCK( &srv->lConnections ); + SHORTLOCK( &srv->lConnections ); for(conn = srv->Connections; conn; conn = conn->Next) @@ -625,7 +635,7 @@ tVFS_Node *TCP_Server_FindDir(tVFS_Node *Node, char *Name) 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) { @@ -709,10 +719,10 @@ tVFS_Node *TCP_Client_Init(tInterface *Interface) conn->RecievedBuffer = RingBuffer_Create( TCP_RECIEVE_BUFFER_SIZE ); - LOCK(&glTCP_OutbountCons); + SHORTLOCK(&glTCP_OutbountCons); conn->Next = gTCP_OutbountCons; gTCP_OutbountCons = conn; - RELEASE(&glTCP_OutbountCons); + SHORTREL(&glTCP_OutbountCons); return &conn->Node; } @@ -744,11 +754,11 @@ Uint64 TCP_Client_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buff 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; } @@ -756,7 +766,7 @@ Uint64 TCP_Client_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buff 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; @@ -823,7 +833,7 @@ Uint64 TCP_Client_Write(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buf */ void TCP_StartConnection(tTCPConnection *Conn) { - tTCPHeader hdr; + tTCPHeader hdr = {0}; Conn->State = TCP_ST_SYN_SENT; @@ -835,7 +845,6 @@ void TCP_StartConnection(tTCPConnection *Conn) 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 ); @@ -872,7 +881,7 @@ int TCP_Client_IOCtl(tVFS_Node *Node, int ID, void *Data) 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 ) @@ -897,6 +906,10 @@ int TCP_Client_IOCtl(tVFS_Node *Node, int ID, void *Data) TCP_StartConnection(conn); return 1; + + // Get recieve buffer length + case 8: + return conn->RecievedBuffer->Length; } return 0;