X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=KernelLand%2FModules%2FIPStack%2Ftcp.c;h=28dc2c5978d3fa7ce8c6509c26095ced135be15c;hb=7143c19c04c283251ce32cd3226f04d69428cee3;hp=8b4f99db58cb1bab2bb7090a08850a5c6ebdde91;hpb=bd912eb789383ceabf98c361e75c49dbab630ace;p=tpg%2Facess2.git

diff --git a/KernelLand/Modules/IPStack/tcp.c b/KernelLand/Modules/IPStack/tcp.c
index 8b4f99db..28dc2c59 100644
--- a/KernelLand/Modules/IPStack/tcp.c
+++ b/KernelLand/Modules/IPStack/tcp.c
@@ -350,7 +350,7 @@ void TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Head
 	// Get length of data
 	dataLen = Length - (Header->DataOffset>>4)*4;
 	LOG("dataLen = %i", dataLen);
-//	Log_Debug("TCP", "State %i, dataLen = %x", Connection->State, dataLen);
+	Log_Debug("TCP", "State %i, dataLen = %x", Connection->State, dataLen);
 	
 	// 
 	// State Machine
@@ -368,14 +368,6 @@ void TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Head
 		if( Header->Flags & TCP_FLAG_SYN )
 		{
 			Connection->NextSequenceRcv ++;
-			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;
-			TCP_SendPacket( Connection, Header, 0, NULL );
 			
 			if( Header->Flags & TCP_FLAG_ACK )
 			{	
@@ -388,6 +380,14 @@ void TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Head
 				Log_Log("TCP", "ACKing SYN");
 				Connection->State = TCP_ST_SYN_RCVD;
 			}
+			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;
+			TCP_SendPacket( Connection, Header, 0, NULL );
 		}
 		break;
 	
@@ -426,12 +426,15 @@ void TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Head
 			}
 			Connection->NextSequenceRcv ++;	// TODO: Is this right? (empty packet counts as one byte)
 			Log_Log("TCP", "Empty Packet, inc and ACK the current sequence number");
+			TCP_INT_SendACK(Connection);
+			#if 0
 			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, Header, 0, NULL );
+			#endif
 			return ;
 		}
 		
@@ -442,7 +445,7 @@ void TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Head
 		
 		sequence_num = ntohl(Header->SequenceNumber);
 		
-		LOG("TCP", "0x%08x <= 0x%08x < 0x%08x",
+		LOG("0x%08x <= 0x%08x < 0x%08x",
 			Connection->NextSequenceRcv,
 			ntohl(Header->SequenceNumber),
 			Connection->NextSequenceRcv + TCP_WINDOW_SIZE
@@ -1354,7 +1357,8 @@ void TCP_Client_Close(tVFS_Node *Node)
 		while( conn->State == TCP_ST_FIN_WAIT1 )	Threads_Yield();
 		break;
 	default:
-		Log_Warning("TCP", "Unhandled connection state in TCP_Client_Close");
+		Log_Warning("TCP", "Unhandled connection state %i in TCP_Client_Close",
+			conn->State);
 		break;
 	}