Debug, Debug, Debug

[tpg/acess2.git] / Modules / IPStack / tcp.h

diff --git a/Modules/IPStack/tcp.h b/Modules/IPStack/tcp.h
index fb515ac..ab910fb 100644 (file)
--- a/Modules/IPStack/tcp.h
+++ b/Modules/IPStack/tcp.h
@@ -9,6 +9,7 @@
 
 typedef struct sTCPHeader      tTCPHeader;
 typedef struct sTCPListener    tTCPListener;
+typedef struct sTCPStoredPacket        tTCPStoredPacket;
 typedef struct sTCPConnection  tTCPConnection;
 
 struct sTCPHeader
@@ -17,55 +18,129 @@ struct sTCPHeader
        Uint16  DestPort;
        Uint32  SequenceNumber;
        Uint32  AcknowlegementNumber;
-       struct {
-               unsigned DataOffset: 4; // Size of the header in 32-bit words
+       #if 0
+       struct {        // Lowest to highest
                unsigned Reserved:      4;
-       };
-       struct {
-               unsigned CWR:   1;      // Congestion Window Reduced
-               unsigned ECE:   1;      // ECN-Echo
-               unsigned URG:   1;      // Urgent pointer is significant
-               unsigned ACK:   1;      // Acknowlegement field is significant
-               unsigned PSH:   1;      // Push Function
-               unsigned RST:   1;      // Reset Connection
-               unsigned SYN:   1;      // Synchronise Sequence Numbers
+               unsigned DataOffset: 4; // Size of the header in 32-bit words
+       } __attribute__ ((packed));
+       #else
+       Uint8   DataOffset;
+       #endif
+       #if 0
+       struct {        // Lowest to Highest
                unsigned FIN:   1;      // Last packet
-       } Flags;
+               unsigned SYN:   1;      // Synchronise Sequence Numbers
+               unsigned RST:   1;      // Reset Connection
+               unsigned PSH:   1;      // Push Function
+               unsigned ACK:   1;      // Acknowlegement field is significant
+               unsigned URG:   1;      // Urgent pointer is significant
+               unsigned ECE:   1;      // ECN-Echo
+               unsigned CWR:   1;      // Congestion Window Reduced
+       } __attribute__ ((packed)) Flags;
+       #else
+       Uint8   Flags;
+       #endif
        Uint16  WindowSize;
        
        Uint16  Checksum;
        Uint16  UrgentPointer;
        
        Uint8   Options[];
+} __attribute__ ((packed));
+
+enum eTCPFlags
+{
+       TCP_FLAG_FIN    = 0x01,
+       TCP_FLAG_SYN    = 0x02,
+       TCP_FLAG_RST    = 0x04,
+       TCP_FLAG_PSH    = 0x08,
+       TCP_FLAG_ACK    = 0x10,
+       TCP_FLAG_URG    = 0x20,
+       TCP_FLAG_ECE    = 0x40,
+       TCP_FLAG_CWR    = 0x80
 };
 
 struct sTCPListener
 {
-       struct sTCPListener     *Next;
-       Uint16  Port;
-       tInterface      *Interface;
-       tTCPConnection  *Connections;
+       struct sTCPListener     *Next;  //!< Next server in the list
+       Uint16  Port;           //!< Listening port (0 disables the server)
+       tInterface      *Interface;     //!< Listening Interface
+       tVFS_Node       Node;   //!< Server Directory node
+        int    NextID;         //!< Name of the next connection
+       tShortSpinlock  lConnections;   //!< Spinlock for connections
+       tTCPConnection  *Connections;   //!< Connections (linked list)
+       tTCPConnection  *volatile NewConnections;
+       tTCPConnection  *ConnectionsTail;
+};
+
+struct sTCPStoredPacket
+{
+       struct sTCPStoredPacket *Next;
+       size_t  Length;
+       Uint32  Sequence;
+       Uint8   Data[];
 };
 
 struct sTCPConnection
 {
        struct sTCPConnection   *Next;
-        int    State;
-       Uint16  LocalPort;
-       Uint16  RemotePort;
+        int    State;  //!< Connection state (see ::eTCPConnectionState)
+       Uint16  LocalPort;      //!< Local port
+       Uint16  RemotePort;     //!< Remote port
+       tInterface      *Interface;     //!< Listening Interface
+       tVFS_Node       Node;   //!< Node
+       
+       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
+       /**
+        * \}
+        */
+       
+       /**
+        * \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
+       /**
+        * \}
+        */
        
-       tInterface      *LocalInterface;
        union {
                tIPv4   v4;
                tIPv6   v6;
-       } RemoteIP;     // Type is determined by LocalInterface->Type
+       } RemoteIP;     //!< Remote IP Address
+       // Type is determined by LocalInterface->Type
 };
 
 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