Don't call the poll callback unnecessarily.

[utcp] / utcp_priv.h

diff --git a/utcp_priv.h b/utcp_priv.h
index 184e3386bf00e8c3a3addabd1c39bd9086f5d40a..0b2efe4e1efd9c8e81b5981554f29b8a8bc8f6cd 100644 (file)
--- a/utcp_priv.h
+++ b/utcp_priv.h
@@ -30,8 +30,24 @@
 #define FIN 4
 #define RST 8
 
+#define AUX_INIT 1
+#define AUX_FRAME 2
+#define AUX_SAK 3
+#define AUX_TIMESTAMP 4
+
+#define NSACKS 4
 #define DEFAULT_SNDBUFSIZE 4096
 #define DEFAULT_MAXSNDBUFSIZE 131072
+#define DEFAULT_RCVBUFSIZE 0
+#define DEFAULT_MAXRCVBUFSIZE 131072
+
+#define DEFAULT_MTU 1000
+
+static const long USEC_PER_SEC = 1000000;
+static const long NSEC_PER_SEC = 1000000000;
+static const int DEFAULT_USER_TIMEOUT = 60; // sec
+static const long START_RTO = 1 * USEC_PER_SEC; // usec
+static const long MAX_RTO  = 3 * USEC_PER_SEC; // usec
 
 struct hdr {
        uint16_t src; // Source port
@@ -71,15 +87,31 @@ static const char *strstate[] __attribute__((unused)) = {
        [TIME_WAIT] = "TIME_WAIT"
 };
 
+struct buffer {
+       char *data;
+       uint32_t offset;
+       uint32_t used;
+       uint32_t size;
+       uint32_t maxsize;
+};
+
+struct sack {
+       uint32_t offset;
+       uint32_t len;
+};
+
 struct utcp_connection {
        void *priv;
        struct utcp *utcp;
+       uint32_t flags;
 
        bool reapable;
+       bool do_poll;
 
        // Callbacks
 
        utcp_recv_t recv;
+       utcp_poll_t poll;
 
        // TCP State
 
@@ -95,11 +127,11 @@ struct utcp_connection {
 
                uint32_t last;
                uint32_t cwnd;
+               uint32_t ssthresh;
        } snd;
 
        struct {
                uint32_t nxt;
-               uint32_t wnd;
                uint32_t irs;
        } rcv;
 
@@ -107,24 +139,27 @@ struct utcp_connection {
 
        // Timers
 
-       struct timeval conn_timeout;
-       struct timeval rtrx_timeout;
+       struct timespec conn_timeout;
+       struct timespec rtrx_timeout;
+       struct timespec rtt_start;
+       uint32_t rtt_seq;
 
-       // Send buffer
+       // Buffers
 
-       char *sndbuf;
-       uint32_t sndbufused;
-       uint32_t sndbufsize;
-       uint32_t maxsndbufsize;
+       uint32_t prev_free;
+       struct buffer sndbuf;
+       struct buffer rcvbuf;
+       struct sack sacks[NSACKS];
 
        // Per-socket options
 
        bool nodelay;
        bool keepalive;
+       bool shut_wr;
 
        // Congestion avoidance state
 
-       struct timeval tlast;
+       struct timespec tlast;
        uint64_t bandwidth;
 };
 
@@ -137,10 +172,21 @@ struct utcp {
        utcp_pre_accept_t pre_accept;
        utcp_send_t send;
 
+       // Packet buffer
+
+       void *pkt;
+
        // Global socket options
 
-       uint16_t mtu;
-       int timeout;
+       uint16_t mtu; // The maximum size of a UTCP packet, including headers.
+       uint16_t mss; // The maximum size of the payload of a UTCP packet.
+       int timeout; // sec
+
+       // RTT variables
+
+       uint32_t srtt; // usec
+       uint32_t rttvar; // usec
+       uint32_t rto; // usec
 
        // Connection management