// === 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;
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;
memcpy( &buf[3], Data, Length );
- Data->Checksum = IPv4_Checksum( buf, buflen );
+ Data->Checksum = htons( IPv4_Checksum( buf, buflen ) );
free(buf);
IPv4_SendPacket(Conn->Interface, Conn->RemoteIP.v4, IP4PROT_TCP, 0, Length, Data);
break;
// 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);
+ SHORTREL(&srv->lConnections);
// Send the SYN ACK
hdr->Flags |= TCP_FLAG_ACK;
tTCPStoredPacket *pkt;
int dataLen;
+ // Syncronise sequence values
if(Header->Flags & TCP_FLAG_SYN) {
Connection->NextSequenceRcv = ntohl(Header->SequenceNumber) + 1;
}
+ // Handle a server replying to our initial SYN
if( Connection->State == TCP_ST_SYN_SENT )
{
- if( (Header->Flags & (TCP_FLAG_SYN|TCP_FLAG_ACK)) == (TCP_FLAG_SYN|TCP_FLAG_ACK) ) {
-
+ 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);
}
}
+ // Handle a client confirming the connection
+ if( Connection->State == TCP_ST_HALFOPEN && (Header->Flags & TCP_FLAG_ACK) )
+ {
+ Connection->State = TCP_ST_OPEN;
+ Log_Log("TCP", "Connection fully opened");
+ }
+
// Get length of data
dataLen = Length - (Header->DataOffset>>4)*4;
Log_Log("TCP", "HandleConnectionPacket - dataLen = %i", dataLen);
}
}
+ // Check for an empty packet
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
{
*/
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');
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->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;
}
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;
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 )
TCP_StartConnection(conn);
return 1;
+
+ // Get recieve buffer length
+ case 8:
+ return conn->RecievedBuffer->Length;
}
return 0;
git.ucc.asn.au / tpg / acess2.git / blobdiff
UCC git Repository :: git.ucc.asn.au