Turn constants back into macros.

[utcp] / utcp_priv.h

diff --git a/utcp_priv.h b/utcp_priv.h
index 7d2d07396c7c6b097d39ea39bd23dfca98f43be1..fe3fa6d799c84502ad97c5212f868ccf01da9126 100644 (file)
--- a/utcp_priv.h
+++ b/utcp_priv.h
@@ -43,11 +43,11 @@
 
 #define DEFAULT_MTU 1000
 
-#define USEC_PER_SEC 1000000
-#define DEFAULT_USER_TIMEOUT 60 // sec
-#define CLOCK_GRANULARITY 1000 // usec
-#define START_RTO 1000000 // usec
-#define MAX_RTO 3000000 // usec
+#define USEC_PER_SEC 1000000L
+#define NSEC_PER_SEC 1000000000L
+#define DEFAULT_USER_TIMEOUT 60
+#define START_RTO (1 * USEC_PER_SEC)
+#define MAX_RTO (3 * USEC_PER_SEC)
 
 struct hdr {
        uint16_t src; // Source port
@@ -106,6 +106,7 @@ struct utcp_connection {
        uint32_t flags;
 
        bool reapable;
+       bool do_poll;
 
        // Callbacks
 
@@ -138,13 +139,14 @@ struct utcp_connection {
 
        // Timers
 
-       struct timeval conn_timeout;
-       struct timeval rtrx_timeout;
-       struct timeval rtt_start;
+       struct timespec conn_timeout;
+       struct timespec rtrx_timeout;
+       struct timespec rtt_start;
        uint32_t rtt_seq;
 
        // Buffers
 
+       uint32_t prev_free;
        struct buffer sndbuf;
        struct buffer rcvbuf;
        struct sack sacks[NSACKS];
@@ -157,7 +159,7 @@ struct utcp_connection {
 
        // Congestion avoidance state
 
-       struct timeval tlast;
+       struct timespec tlast;
        uint64_t bandwidth;
 };