Don't call abort() in retransmit().

[utcp] / utcp_priv.h

diff --git a/utcp_priv.h b/utcp_priv.h
index 6c1386307e691ca79babe93f66b62108ada9a177..b9979539465a7ac7e5cbae1b9e5c3258fc8a445a 100644 (file)
--- a/utcp_priv.h
+++ b/utcp_priv.h
@@ -57,7 +57,7 @@ enum state {
        TIME_WAIT
 };
 
-static const char *strstate[] = {
+static const char *strstate[] __attribute__((unused)) = {
        [CLOSED] = "CLOSED",
        [LISTEN] = "LISTEN",
        [SYN_SENT] = "SYN_SENT",
@@ -71,25 +71,38 @@ static const char *strstate[] = {
        [TIME_WAIT] = "TIME_WAIT"
 };
 
+struct buffer {
+       char *data;
+       uint32_t used;
+       uint32_t size;
+       uint32_t maxsize;
+};
+
 struct utcp_connection {
        void *priv;
        struct utcp *utcp;
+
        bool reapable;
 
-       bool nodelay;
-       bool keepalive;
+       // Callbacks
+
+       utcp_recv_t recv;
+       utcp_poll_t poll;
+
+       // TCP State
 
        uint16_t src;
        uint16_t dst;
        enum state state;
 
-       // The following two structures form the TCB
-
        struct {
                uint32_t una;
                uint32_t nxt;
                uint32_t wnd;
                uint32_t iss;
+
+               uint32_t last;
+               uint32_t cwnd;
        } snd;
 
        struct {
@@ -98,26 +111,44 @@ struct utcp_connection {
                uint32_t irs;
        } rcv;
 
-       utcp_recv_t recv;
+       int dupack;
+
+       // Timers
 
        struct timeval conn_timeout;
        struct timeval rtrx_timeout;
 
-       char *sndbuf;
-       uint32_t sndbufsize;
-       uint32_t maxsndbufsize;
+       // Send buffer
+
+       struct buffer sndbuf;
+
+       // Per-socket options
+
+       bool nodelay;
+       bool keepalive;
+
+       // Congestion avoidance state
+
+       struct timeval tlast;
+       uint64_t bandwidth;
 };
 
 struct utcp {
        void *priv;
 
+       // Callbacks
+
        utcp_accept_t accept;
        utcp_pre_accept_t pre_accept;
        utcp_send_t send;
 
+       // Global socket options
+
        uint16_t mtu;
        int timeout;
 
+       // Connection management
+
        struct utcp_connection **connections;
        int nconnections;
        int nallocated;