X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Modules%2FIPStack%2Ftcp.h;h=ab910fb9446dc89bb371673df8b5cbf6b45e8685;hb=b0ab9997c3256041087483c0840247821bfa55c8;hp=87515ce981f910f738d5ef26b8cd26e85861e663;hpb=37e9151e7bc0b7341050286fde4341a8f0f9333c;p=tpg%2Facess2.git

diff --git a/Modules/IPStack/tcp.h b/Modules/IPStack/tcp.h
index 87515ce9..ab910fb9 100644
--- a/Modules/IPStack/tcp.h
+++ b/Modules/IPStack/tcp.h
@@ -19,7 +19,7 @@ struct sTCPHeader
 	Uint32	SequenceNumber;
 	Uint32	AcknowlegementNumber;
 	#if 0
-	struct {
+	struct {	// Lowest to highest
 		unsigned Reserved:	4;
 		unsigned DataOffset: 4;	// Size of the header in 32-bit words
 	} __attribute__ ((packed));
@@ -67,14 +67,16 @@ struct sTCPListener
 	tInterface	*Interface;	//!< Listening Interface
 	tVFS_Node	Node;	//!< Server Directory node
 	 int	NextID;		//!< Name of the next connection
-	tSpinlock	lConnections;	//!< Spinlock for connections
+	tShortSpinlock	lConnections;	//!< Spinlock for connections
 	tTCPConnection	*Connections;	//!< Connections (linked list)
-	 tTCPConnection	*volatile NewConnections;
+	tTCPConnection	*volatile NewConnections;
+	tTCPConnection	*ConnectionsTail;
 };
 
 struct sTCPStoredPacket
 {
 	struct sTCPStoredPacket	*Next;
+	size_t	Length;
 	Uint32	Sequence;
 	Uint8	Data[];
 };
@@ -88,16 +90,41 @@ struct sTCPConnection
 	tInterface	*Interface;	//!< Listening Interface
 	tVFS_Node	Node;	//!< Node
 	
-	 int	NextSequenceSend;	//!< Next sequence value for outbound packets
-	 int	NextSequenceRcv;	//!< Next expected sequence value for inbound
+	Uint32	NextSequenceSend;	//!< Next sequence value for outbound packets
+	Uint32	NextSequenceRcv;	//!< Next expected sequence value for inbound
 	
+	/**
+	 * \brief Non-ACKed packets
+	 * \note FIFO list
+	 * \{
+	 */
+	tMutex	lQueuedPackets;
 	tTCPStoredPacket	*QueuedPackets;	//!< Non-ACKed packets
+	/**
+	 * \}
+	 */
 	
-	tSpinlock	lRecievedPackets;
-	tTCPStoredPacket	*RecievedPackets;	//!< Unread Packets
-	tTCPStoredPacket	*RecievedPacketsTail;	//!< Unread Packets (End of list)
+	/**
+	 * \brief Unread Packets
+	 * \note Ring buffer
+	 * \{
+	 */
+	tMutex	lRecievedPackets;
+	tRingBuffer	*RecievedBuffer;
+	/**
+	 * \}
+	 */
 	
+	/**
+	 * \brief Out of sequence packets
+	 * \note Sorted list to improve times
+	 * \{
+	 */
+	tShortSpinlock	lFuturePackets;	//!< Future packets spinlock
 	tTCPStoredPacket	*FuturePackets;	//!< Out of sequence packets
+	/**
+	 * \}
+	 */
 	
 	union {
 		tIPv4	v4;
@@ -109,8 +136,11 @@ struct sTCPConnection
 enum eTCPConnectionState
 {
 	TCP_ST_CLOSED,
+	TCP_ST_SYN_SENT,
 	TCP_ST_HALFOPEN,
-	TCP_ST_OPEN
+	TCP_ST_OPEN,
+	TCP_ST_FIN_SENT,
+	TCP_ST_FINISHED
 };
 
 #endif