From: John Hodge <tpg@mutabah.net>
Date: Sun, 7 Aug 2011 03:46:54 +0000 (+0800)
Subject: IPStack - Fixed TCP locking up when the receive buffer is full
X-Git-Tag: rel0.10~5
X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=366c0b5458300d9f9ad009bf782845e7ba20293d;hp=d4e3d74bb9ed79be25604e30231cd64e7091fdc2;p=tpg%2Facess2.git

IPStack - Fixed TCP locking up when the receive buffer is full

- Forgot to release a mutex
---

diff --git a/Modules/IPStack/tcp.c b/Modules/IPStack/tcp.c
index 3952d8e6..24f2c239 100644
--- a/Modules/IPStack/tcp.c
+++ b/Modules/IPStack/tcp.c
@@ -26,7 +26,7 @@ void	TCP_StartConnection(tTCPConnection *Conn);
 void	TCP_SendPacket(tTCPConnection *Conn, size_t Length, tTCPHeader *Data);
 void	TCP_GetPacket(tInterface *Interface, void *Address, int Length, void *Buffer);
 void	TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Header, int Length);
-void	TCP_INT_AppendRecieved(tTCPConnection *Connection, const void *Data, size_t Length);
+int	TCP_INT_AppendRecieved(tTCPConnection *Connection, const void *Data, size_t Length);
 void	TCP_INT_UpdateRecievedFromFuture(tTCPConnection *Connection);
 Uint16	TCP_GetUnusedPort();
  int	TCP_AllocatePort(Uint16 Port);
@@ -424,11 +424,15 @@ void TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Head
 		// Is this packet the next expected packet?
 		if( sequence_num == Connection->NextSequenceRcv )
 		{
+			 int	rv;
 			// Ooh, Goodie! Add it to the recieved list
-			TCP_INT_AppendRecieved(Connection,
+			rv = TCP_INT_AppendRecieved(Connection,
 				(Uint8*)Header + (Header->DataOffset>>4)*4,
 				dataLen
 				);
+			if(rv != 0) {
+				break;
+			}
 			Log_Log("TCP", "0x%08x += %i", Connection->NextSequenceRcv, dataLen);
 			Connection->NextSequenceRcv += dataLen;
 			
@@ -619,16 +623,19 @@ void TCP_INT_HandleConnectionPacket(tTCPConnection *Connection, tTCPHeader *Head
  * \param Data	Packet contents
  * \param Length	Length of \a Data
  */
-void TCP_INT_AppendRecieved(tTCPConnection *Connection, const void *Data, size_t Length)
+int TCP_INT_AppendRecieved(tTCPConnection *Connection, const void *Data, size_t Length)
 {
 	Mutex_Acquire( &Connection->lRecievedPackets );
+
 	if(Connection->RecievedBuffer->Length + Length > Connection->RecievedBuffer->Space )
 	{
-		Log_Error("TCP", "Buffer filled, packet dropped (%s)",
-		//	TCP_INT_DumpConnection(Connection)
-			""
+		VFS_MarkAvaliable(&Connection->Node, 1);
+		Log_Error("TCP", "Buffer filled, packet dropped (:%i) - %i + %i > %i",
+			Connection->LocalPort, Connection->RecievedBuffer->Length, Length,
+			Connection->RecievedBuffer->Space
 			);
-		return ;
+		Mutex_Release( &Connection->lRecievedPackets );
+		return 1;
 	}
 	
 	RingBuffer_Write( Connection->RecievedBuffer, Data, Length );
@@ -636,6 +643,7 @@ void TCP_INT_AppendRecieved(tTCPConnection *Connection, const void *Data, size_t
 	VFS_MarkAvaliable(&Connection->Node, 1);
 	
 	Mutex_Release( &Connection->lRecievedPackets );
+	return 0;
 }
 
 /**