Replace two hardcoded timeout values with utcp->timeout.

[utcp] / utcp.c

diff --git a/utcp.c b/utcp.c
index 2ed32175dc0f98c9b2bc045f7a62fb43caeb5089..ac162fe708a0d657abffb4cb62ecd4881a7fc79a 100644 (file)
--- a/utcp.c
+++ b/utcp.c
@@ -1346,7 +1346,7 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
                case CLOSING:
                        if(c->snd.una == c->snd.last) {
                                gettimeofday(&c->conn_timeout, NULL);
-                               c->conn_timeout.tv_sec += 60;
+                               c->conn_timeout.tv_sec += utcp->timeout;
                                set_state(c, TIME_WAIT);
                        }
 
@@ -1505,7 +1505,7 @@ skip_ack:
 
                case FIN_WAIT_2:
                        gettimeofday(&c->conn_timeout, NULL);
-                       c->conn_timeout.tv_sec += 60;
+                       c->conn_timeout.tv_sec += utcp->timeout;
                        set_state(c, TIME_WAIT);
                        break;
 
@@ -1918,8 +1918,14 @@ void utcp_reset_timers(struct utcp *utcp) {
                        continue;
                }
 
-               c->rtrx_timeout = now;
-               c->conn_timeout = then;
+               if(timerisset(&c->rtrx_timeout)) {
+                       c->rtrx_timeout = now;
+               }
+
+               if(timerisset(&c->conn_timeout)) {
+                       c->conn_timeout = then;
+               }
+
                c->rtt_start.tv_sec = 0;
        }
 
@@ -2070,19 +2076,24 @@ void utcp_expect_data(struct utcp_connection *c, bool expect) {
 }
 
 void utcp_offline(struct utcp *utcp, bool offline) {
+       struct timeval now;
+       gettimeofday(&now, NULL);
+
        for(int i = 0; i < utcp->nconnections; i++) {
                struct utcp_connection *c = utcp->connections[i];
 
-               if(!c->reapable) {
-                       utcp_expect_data(c, offline);
-
-                       // If we are online again, reset the retransmission timers, but keep the connection timeout as it is,
-                       // to prevent peers toggling online/offline state frequently from keeping connections alive
-                       // if there is no progress in sending actual data.
-                       if(!offline) {
-                               gettimeofday(&utcp->connections[i]->rtrx_timeout, NULL);
-                               utcp->connections[i]->rtt_start.tv_sec = 0;
+               if(c->reapable) {
+                       continue;
+               }
+
+               utcp_expect_data(c, offline);
+
+               if(!offline) {
+                       if(timerisset(&c->rtrx_timeout)) {
+                               c->rtrx_timeout = now;
                        }
+
+                       utcp->connections[i]->rtt_start.tv_sec = 0;
                }
        }