X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=utcp.c;h=f4bd7cf718c19197c00ad14efb1b322275a21739;hb=6ef1b39de8c0b0537da02b212acaba3242afe142;hp=d09b9e7d526e80c4ce39590c19c718904fe32590;hpb=f1035e971bb894203bdfba6cafbaf0bb30f197eb;p=utcp

diff --git a/utcp.c b/utcp.c
index d09b9e7..f4bd7cf 100644
--- a/utcp.c
+++ b/utcp.c
@@ -639,6 +639,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;
 }
 
@@ -1334,12 +1339,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;
 		}
 	}
 
@@ -1664,11 +1670,13 @@ void utcp_abort_all_connections(struct utcp *utcp) {
 			continue;
 		}
 
+		utcp_recv_t old_recv = c->recv;
+
 		reset_connection(c);
 
-		if(c->recv) {
+		if(old_recv) {
 			errno = 0;
-			c->recv(c, NULL, 0);
+			old_recv(c, NULL, 0);
 		}
 	}
 
@@ -1732,6 +1740,10 @@ struct timeval utcp_timeout(struct utcp *utcp) {
 				c->recv(c, NULL, 0);
 			}
 
+			if(c->poll) {
+				c->poll(c, 0);
+			}
+
 			continue;
 		}
 
@@ -1928,6 +1940,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;
 }