X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FIPStack%2Ftcp.c;h=23d028c9de9f75f069acd85b5b373f0b922b406f;hb=fe2794b4f932c0755674493b6a6da4b60a5c2433;hp=374150368dc58de4c316532993cd80caff9abb95;hpb=94ecc5441605ad5151e625457531e7f90470db31;p=tpg%2Facess2.git

diff --git a/Modules/IPStack/tcp.c b/Modules/IPStack/tcp.c
index 37415036..23d028c9 100644
--- a/Modules/IPStack/tcp.c
+++ b/Modules/IPStack/tcp.c
@@ -84,7 +84,7 @@ void TCP_SendPacket( tTCPConnection *Conn, size_t Length, tTCPHeader *Data )
 		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;
@@ -104,27 +104,27 @@ void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffe
 	tTCPListener	*srv;
 	tTCPConnection	*conn;
 
-	Log_Log("TCP", "SourcePort = %i, DestPort = %i",
+	Log_Log("TCP", "TCP_GetPacket: 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", "TCP_GetPacket: SequenceNumber = 0x%x", ntohl(hdr->SequenceNumber));
+	Log_Log("TCP", "TCP_GetPacket: AcknowlegementNumber = 0x%x", ntohl(hdr->AcknowlegementNumber));
+	Log_Log("TCP", "TCP_GetPacket: DataOffset = %i", hdr->DataOffset >> 4);
+	Log_Log("TCP", "TCP_GetPacket: Flags = {");
+	Log_Log("TCP", "TCP_GetPacket:   CWR = %B, ECE = %B",
 		!!(hdr->Flags & TCP_FLAG_CWR), !!(hdr->Flags & TCP_FLAG_ECE));
-	Log_Log("TCP", "  URG = %B, ACK = %B",
+	Log_Log("TCP", "TCP_GetPacket:   URG = %B, ACK = %B",
 		!!(hdr->Flags & TCP_FLAG_URG), !!(hdr->Flags & TCP_FLAG_ACK));
-	Log_Log("TCP", "  PSH = %B, RST = %B",
+	Log_Log("TCP", "TCP_GetPacket:   PSH = %B, RST = %B",
 		!!(hdr->Flags & TCP_FLAG_PSH), !!(hdr->Flags & TCP_FLAG_RST));
-	Log_Log("TCP", "  SYN = %B, FIN = %B",
+	Log_Log("TCP", "TCP_GetPacket:   SYN = %B, FIN = %B",
 		!!(hdr->Flags & TCP_FLAG_SYN), !!(hdr->Flags & TCP_FLAG_FIN));
-	Log_Log("TCP", "}");
-	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));
+	Log_Log("TCP", "TCP_GetPacket: }");
+	Log_Log("TCP", "TCP_GetPacket: WindowSize = %i", htons(hdr->WindowSize));
+	Log_Log("TCP", "TCP_GetPacket: Checksum = 0x%x", htons(hdr->Checksum));
+	Log_Log("TCP", "TCP_GetPacket: UrgentPointer = 0x%x", htons(hdr->UrgentPointer));
 */
-	Log_Log("TCP", "Flags = %s%s%s%s%s%s",
+	Log_Log("TCP", "TCP_GetPacket: 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 " : "",
@@ -155,17 +155,17 @@ void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffe
 			// Check the destination port
 			if(srv->Port != htons(hdr->DestPort))	continue;
 			
-			Log_Log("TCP", "Matches server %p", srv);
+			Log_Log("TCP", "TCP_GetPacket: Matches server %p", srv);
 			// Is this in an established connection?
 			for( conn = srv->Connections; conn; conn = conn->Next )
 			{
-				Log_Log("TCP", "conn->Interface(%p) == Interface(%p)",
+				Log_Log("TCP", "TCP_GetPacket: 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_Log("TCP", "conn->RemotePort(%i) == hdr->SourcePort(%i)",
+				Log_Log("TCP", "TCP_GetPacket: conn->RemotePort(%i) == hdr->SourcePort(%i)",
 					conn->RemotePort, ntohs(hdr->SourcePort));
 				if(conn->RemotePort != ntohs(hdr->SourcePort))	continue;
 
@@ -175,17 +175,17 @@ 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_Log("TCP", "Matches connection %p", conn);
+				Log_Log("TCP", "TCP_GetPacket: Matches connection %p", conn);
 				// We have a response!
 				TCP_INT_HandleConnectionPacket(conn, hdr, Length);
 
 				return;
 			}
 
-			Log_Log("TCP", "Opening Connection");
+			Log_Log("TCP", "TCP_GetPacket: Opening Connection");
 			// Open a new connection (well, check that it's a SYN)
 			if(hdr->Flags != TCP_FLAG_SYN) {
-				Log_Log("TCP", "Packet is not a SYN");
+				Log_Log("TCP", "TCP_GetPacket: Packet is not a SYN");
 				return ;
 			}
 			
@@ -231,7 +231,7 @@ void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffe
 			srv->ConnectionsTail = conn;
 			if(!srv->NewConnections)
 				srv->NewConnections = conn;
-			SHORTLOCK(&srv->lConnections);
+			SHORTREL(&srv->lConnections);
 
 			// Send the SYN ACK
 			hdr->Flags |= TCP_FLAG_ACK;
@@ -268,7 +268,7 @@ void TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffe
 		}
 	}
 	
-	Log_Log("TCP", "No Match");
+	Log_Log("TCP", "TCP_GetPacket: No Match");
 }
 
 /**
@@ -282,14 +282,16 @@ void TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Head
 	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);
@@ -303,6 +305,13 @@ void TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Head
 		}
 	}
 	
+	// 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);
@@ -330,6 +339,7 @@ void TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Head
 		}
 	}
 	
+	// Check for an empty packet
 	if(dataLen == 0) {
 		Log_Log("TCP", "Empty Packet");
 		return ;
@@ -416,6 +426,10 @@ void TCP_INT_AppendRecieved(tTCPConnection *Connection, tTCPStoredPacket *Pkt)
 	}
 	
 	RingBuffer_Write( Connection->RecievedBuffer, Pkt->Data, Pkt->Length );
+
+	#if USE_SELECT
+	VFS_MarkAvaliable(&Connection->Node, 1);
+	#endif
 	
 	Mutex_Release( &Connection->lRecievedPackets );
 }
@@ -753,6 +767,12 @@ Uint64 TCP_Client_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buff
 	// Poll packets
 	for(;;)
 	{
+		#if USE_SELECT
+		// Wait
+		VFS_SelectNode(Node, VFS_SELECT_READ, NULL);
+		// Lock list and read
+		Mutex_Acquire( &conn->lRecievedPackets );
+		#else
 		// Lock list and check if there is a packet
 		Mutex_Acquire( &conn->lRecievedPackets );
 		if( conn->RecievedBuffer->Length == 0 ) {
@@ -761,10 +781,16 @@ Uint64 TCP_Client_Read(tVFS_Node *Node, Uint64 Offset, Uint64 Length, void *Buff
 			Threads_Yield();	// TODO: Less expensive wait
 			continue;
 		}
+		#endif
 		
 		// Attempt to read all `Length` bytes
 		len = RingBuffer_Read( destbuf, conn->RecievedBuffer, Length );
 		
+		#if USE_SELECT
+		if( conn->RecievedBuffer->Length == 0 )
+			VFS_MarkAvaliable(Node, 0);
+		#endif
+		
 		// Release the lock (we don't need it any more)
 		Mutex_Release( &conn->lRecievedPackets );
 	
@@ -859,57 +885,59 @@ void TCP_StartConnection(tTCPConnection *Conn)
 int TCP_Client_IOCtl(tVFS_Node *Node, int ID, void *Data)
 {
 	tTCPConnection	*conn = Node->ImplPtr;
+	
+	ENTER("pNode iID pData", Node, ID, Data);
 
 	switch(ID)
 	{
 	case 4:	// Get/Set local port
 		if(!Data)
-			return conn->LocalPort;
+			LEAVE_RET('i', conn->LocalPort);
 		if(conn->State != TCP_ST_CLOSED)
-			return -1;
+			LEAVE_RET('i', -1);
 		if(!CheckMem(Data, sizeof(Uint16)))
-			return -1;
+			LEAVE_RET('i', -1);
 
 		if(Threads_GetUID() != 0 && *(Uint16*)Data < 1024)
-			return -1;
+			LEAVE_RET('i', -1);
 
 		conn->LocalPort = *(Uint16*)Data;
-		return 0;
+		LEAVE_RET('i', conn->LocalPort);
 
 	case 5:	// Get/Set remote port
-		if(!Data)	return conn->RemotePort;
-		if(conn->State != TCP_ST_CLOSED)	return -1;
-		if(!CheckMem(Data, sizeof(Uint16)))	return -1;
+		if(!Data)	LEAVE_RET('i', conn->RemotePort);
+		if(conn->State != TCP_ST_CLOSED)	LEAVE_RET('i', -1);
+		if(!CheckMem(Data, sizeof(Uint16)))	LEAVE_RET('i', -1);
 		conn->RemotePort = *(Uint16*)Data;
-		return conn->RemotePort;
+		LEAVE_RET('i', conn->RemotePort);
 
 	case 6:	// Set Remote IP
 		if( conn->State != TCP_ST_CLOSED )
-			return -1;
+			LEAVE_RET('i', -1);
 		if( conn->Interface->Type == 4 )
 		{
-			if(!CheckMem(Data, sizeof(tIPv4)))	return -1;
+			if(!CheckMem(Data, sizeof(tIPv4)))	LEAVE_RET('i', -1);
 			conn->RemoteIP.v4 = *(tIPv4*)Data;
 		}
 		else if( conn->Interface->Type == 6 )
 		{
-			if(!CheckMem(Data, sizeof(tIPv6)))	return -1;
+			if(!CheckMem(Data, sizeof(tIPv6)))	LEAVE_RET('i', -1);
 			conn->RemoteIP.v6 = *(tIPv6*)Data;
 		}
-		return 0;
+		LEAVE_RET('i', 0);
 
 	case 7:	// Connect
 		if(conn->LocalPort == 0xFFFF)
 			conn->LocalPort = TCP_GetUnusedPort();
 		if(conn->RemotePort == -1)
-			return 0;
+			LEAVE_RET('i', 0);
 
 		TCP_StartConnection(conn);
-		return 1;
+		LEAVE_RET('i', 1);
 	
 	// Get recieve buffer length
 	case 8:
-		return conn->RecievedBuffer->Length;
+		LEAVE_RET('i', conn->RecievedBuffer->Length);
 	}
 
 	return 0;
@@ -920,6 +948,8 @@ void TCP_Client_Close(tVFS_Node *Node)
 	tTCPConnection	*conn = Node->ImplPtr;
 	tTCPHeader	packet;
 	
+	ENTER("pNode", Node);
+	
 	packet.SourcePort = htons(conn->LocalPort);
 	packet.DestPort = htons(conn->RemotePort);
 	packet.DataOffset = (sizeof(tTCPHeader)/4)*16;
@@ -936,4 +966,6 @@ void TCP_Client_Close(tVFS_Node *Node)
 	while( conn->State == TCP_ST_FIN_SENT )	Threads_Yield();
 	
 	free(conn);
+	
+	LEAVE('-');
 }