Call the poll callback with 0 whenever a connection is closed.

[utcp] / utcp.c

diff --git a/utcp.c b/utcp.c
index 9fb68aecd323dd2019171df1b86199c37af71544..5dc7501a20d805e0d57520196bae31ec41657e78 100644 (file)
--- a/utcp.c
+++ b/utcp.c
@@ -453,7 +453,7 @@ struct utcp_connection *utcp_connect_ex(struct utcp *utcp, uint16_t dst, utcp_re
                return NULL;
        }
 
-       assert((flags & ~0xf) == 0);
+       assert((flags & ~0x1f) == 0);
 
        c->flags = flags;
        c->recv = recv;
@@ -611,6 +611,20 @@ ssize_t utcp_send(struct utcp_connection *c, const void *data, size_t len) {
                return -1;
        }
 
+       // Check if we need to be able to buffer all data
+
+       if(c->flags & UTCP_NO_PARTIAL) {
+               if(len > buffer_free(&c->sndbuf)) {
+                       if(len > c->sndbuf.maxsize) {
+                               errno = EMSGSIZE;
+                               return -1;
+                       } else {
+                               errno = EWOULDBLOCK;
+                               return 0;
+                       }
+               }
+       }
+
        // Add data to send buffer.
 
        len = buffer_put(&c->sndbuf, data, len);
@@ -639,6 +653,11 @@ ssize_t utcp_send(struct utcp_connection *c, const void *data, size_t len) {
                start_retransmit_timer(c);
        }
 
+       if(is_reliable(c) && !timerisset(&c->conn_timeout)) {
+               gettimeofday(&c->conn_timeout, NULL);
+               c->conn_timeout.tv_sec += c->utcp->timeout;
+       }
+
        return len;
 }
 
@@ -1176,6 +1195,10 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
                                c->recv(c, NULL, 0);
                        }
 
+                       if(c->poll && !c->reapable) {
+                               c->poll(c, 0);
+                       }
+
                        return 0;
 
                case SYN_RECEIVED:
@@ -1203,6 +1226,10 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
                                c->recv(c, NULL, 0);
                        }
 
+                       if(c->poll && !c->reapable) {
+                               c->poll(c, 0);
+                       }
+
                        return 0;
 
                case CLOSING:
@@ -1334,12 +1361,13 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
        // 4. Update timers
 
        if(advanced) {
-               timerclear(&c->conn_timeout); // It will be set anew in utcp_timeout() if c->snd.una != c->snd.nxt.
-
                if(c->snd.una == c->snd.last) {
                        stop_retransmit_timer(c);
+                       timerclear(&c->conn_timeout);
                } else if(is_reliable(c)) {
                        start_retransmit_timer(c);
+                       gettimeofday(&c->conn_timeout, NULL);
+                       c->conn_timeout.tv_sec += utcp->timeout;
                }
        }
 
@@ -1486,7 +1514,7 @@ skip_ack:
                c->rcv.nxt++;
                len++;
 
-               // Inform the application that the peer closed the connection.
+               // Inform the application that the peer closed its end of the connection.
                if(c->recv) {
                        errno = 0;
                        c->recv(c, NULL, 0);
@@ -1665,6 +1693,7 @@ void utcp_abort_all_connections(struct utcp *utcp) {
                }
 
                utcp_recv_t old_recv = c->recv;
+               utcp_poll_t old_poll = c->poll;
 
                reset_connection(c);
 
@@ -1672,6 +1701,11 @@ void utcp_abort_all_connections(struct utcp *utcp) {
                        errno = 0;
                        old_recv(c, NULL, 0);
                }
+
+               if(old_poll && !c->reapable) {
+                       errno = 0;
+                       old_poll(c, 0);
+               }
        }
 
        return;
@@ -1734,6 +1768,10 @@ struct timeval utcp_timeout(struct utcp *utcp) {
                                c->recv(c, NULL, 0);
                        }
 
+                       if(c->poll && !c->reapable) {
+                               c->poll(c, 0);
+                       }
+
                        continue;
                }
 
@@ -1814,11 +1852,16 @@ void utcp_exit(struct utcp *utcp) {
        for(int i = 0; i < utcp->nconnections; i++) {
                struct utcp_connection *c = utcp->connections[i];
 
-               if(!c->reapable)
+               if(!c->reapable) {
                        if(c->recv) {
                                c->recv(c, NULL, 0);
                        }
 
+                       if(c->poll && !c->reapable) {
+                               c->poll(c, 0);
+                       }
+               }
+
                buffer_exit(&c->rcvbuf);
                buffer_exit(&c->sndbuf);
                free(c);
@@ -1853,9 +1896,15 @@ void utcp_reset_timers(struct utcp *utcp) {
        then.tv_sec += utcp->timeout;
 
        for(int i = 0; i < utcp->nconnections; i++) {
-               utcp->connections[i]->rtrx_timeout = now;
-               utcp->connections[i]->conn_timeout = then;
-               utcp->connections[i]->rtt_start.tv_sec = 0;
+               struct utcp_connection *c = utcp->connections[i];
+
+               if(c->reapable) {
+                       continue;
+               }
+
+               c->rtrx_timeout = now;
+               c->conn_timeout = then;
+               c->rtt_start.tv_sec = 0;
        }
 
        if(utcp->rto > START_RTO) {
@@ -1930,6 +1979,14 @@ void utcp_set_rcvbuf(struct utcp_connection *c, size_t size) {
        }
 }
 
+size_t utcp_get_sendq(struct utcp_connection *c) {
+       return c->sndbuf.used;
+}
+
+size_t utcp_get_recvq(struct utcp_connection *c) {
+       return c->rcvbuf.used;
+}
+
 bool utcp_get_nodelay(struct utcp_connection *c) {
        return c ? c->nodelay : false;
 }
@@ -1972,3 +2029,48 @@ void utcp_set_accept_cb(struct utcp *utcp, utcp_accept_t accept, utcp_pre_accept
                utcp->pre_accept = pre_accept;
        }
 }
+
+void utcp_expect_data(struct utcp_connection *c, bool expect) {
+       if(!c || c->reapable) {
+               return;
+       }
+
+       if(!(c->state == ESTABLISHED || c->state == FIN_WAIT_1 || c->state == FIN_WAIT_2)) {
+               return;
+       }
+
+       if(expect) {
+               // If we expect data, start the connection timer.
+               if(!timerisset(&c->conn_timeout)) {
+                       gettimeofday(&c->conn_timeout, NULL);
+                       c->conn_timeout.tv_sec += c->utcp->timeout;
+               }
+       } else {
+               // If we want to cancel expecting data, only clear the timer when there is no unACKed data.
+               if(c->snd.una == c->snd.last) {
+                       timerclear(&c->conn_timeout);
+               }
+       }
+}
+
+void utcp_offline(struct utcp *utcp, bool offline) {
+       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(!offline && utcp->rto > START_RTO) {
+               utcp->rto = START_RTO;
+       }
+}