X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=utcp.c;h=5d630694df96100f57e780f855a32cc63f7674bc;hb=f97e64bcb266c37a8eb24c3e8286272c02756e6e;hp=9fb68aecd323dd2019171df1b86199c37af71544;hpb=b2c1a352bfa105c1d289dae31cb47b8fcc3963ff;p=utcp

diff --git a/utcp.c b/utcp.c
index 9fb68ae..5d63069 100644
--- a/utcp.c
+++ b/utcp.c
@@ -415,13 +415,13 @@ static void update_rtt(struct utcp_connection *c, uint32_t rtt) {
 	if(!utcp->srtt) {
 		utcp->srtt = rtt;
 		utcp->rttvar = rtt / 2;
-		utcp->rto = rtt + max(2 * rtt, CLOCK_GRANULARITY);
 	} else {
 		utcp->rttvar = (utcp->rttvar * 3 + absdiff(utcp->srtt, rtt)) / 4;
 		utcp->srtt = (utcp->srtt * 7 + rtt) / 8;
-		utcp->rto = utcp->srtt + max(utcp->rttvar, CLOCK_GRANULARITY);
 	}
 
+	utcp->rto = utcp->srtt + max(4 * utcp->rttvar, CLOCK_GRANULARITY);
+
 	if(utcp->rto > MAX_RTO) {
 		utcp->rto = MAX_RTO;
 	}
@@ -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,13 +611,35 @@ 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);
+	if(is_reliable(c) || (c->state != SYN_SENT && c->state != SYN_RECEIVED)) {
+		len = buffer_put(&c->sndbuf, data, len);
+	} else {
+		return 0;
+	}
 
 	if(len <= 0) {
-		errno = EWOULDBLOCK;
-		return 0;
+		if(is_reliable(c)) {
+			errno = EWOULDBLOCK;
+			return 0;
+		} else {
+			return len;
+		}
 	}
 
 	c->snd.last += len;
@@ -639,6 +661,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;
 }
 
@@ -986,6 +1013,8 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 		ptr += 2;
 	}
 
+	bool has_data = len || (hdr.ctl & (SYN | FIN));
+
 	// Try to match the packet to an existing connection
 
 	struct utcp_connection *c = find_connection(utcp, hdr.dst, hdr.src);
@@ -1028,6 +1057,7 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 				c->flags = UTCP_TCP;
 			}
 
+synack:
 			// Return SYN+ACK, go to SYN_RECEIVED state
 			c->snd.wnd = hdr.wnd;
 			c->rcv.irs = hdr.seq;
@@ -1080,8 +1110,6 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 
 	// It is for an existing connection.
 
-	uint32_t prevrcvnxt = c->rcv.nxt;
-
 	// 1. Drop invalid packets.
 
 	// 1a. Drop packets that should not happen in our current state.
@@ -1105,41 +1133,43 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 		break;
 	}
 
-	// 1b. Drop packets with a sequence number not in our receive window.
+	// 1b. Discard data that is not in our receive window.
 
-	bool acceptable;
+	if(is_reliable(c)) {
+		bool acceptable;
 
-	if(c->state == SYN_SENT) {
-		acceptable = true;
-	} else if(len == 0) {
-		acceptable = seqdiff(hdr.seq, c->rcv.nxt) >= 0;
-	} else {
-		int32_t rcv_offset = seqdiff(hdr.seq, c->rcv.nxt);
+		if(c->state == SYN_SENT) {
+			acceptable = true;
+		} else if(len == 0) {
+			acceptable = seqdiff(hdr.seq, c->rcv.nxt) >= 0;
+		} else {
+			int32_t rcv_offset = seqdiff(hdr.seq, c->rcv.nxt);
 
-		// cut already accepted front overlapping
-		if(rcv_offset < 0) {
-			acceptable = len > (size_t) - rcv_offset;
+			// cut already accepted front overlapping
+			if(rcv_offset < 0) {
+				acceptable = len > (size_t) - rcv_offset;
 
-			if(acceptable) {
-				ptr -= rcv_offset;
-				len += rcv_offset;
-				hdr.seq -= rcv_offset;
+				if(acceptable) {
+					ptr -= rcv_offset;
+					len += rcv_offset;
+					hdr.seq -= rcv_offset;
+				}
+			} else {
+				acceptable = seqdiff(hdr.seq, c->rcv.nxt) >= 0 && seqdiff(hdr.seq, c->rcv.nxt) + len <= c->rcvbuf.maxsize;
 			}
-		} else {
-			acceptable = seqdiff(hdr.seq, c->rcv.nxt) >= 0 && seqdiff(hdr.seq, c->rcv.nxt) + len <= c->rcvbuf.maxsize;
 		}
-	}
 
-	if(!acceptable) {
-		debug("Packet not acceptable, %u <= %u + %lu < %u\n", c->rcv.nxt, hdr.seq, (unsigned long)len, c->rcv.nxt + c->rcvbuf.maxsize);
+		if(!acceptable) {
+			debug("Packet not acceptable, %u <= %u + %lu < %u\n", c->rcv.nxt, hdr.seq, (unsigned long)len, c->rcv.nxt + c->rcvbuf.maxsize);
 
-		// Ignore unacceptable RST packets.
-		if(hdr.ctl & RST) {
-			return 0;
-		}
+			// Ignore unacceptable RST packets.
+			if(hdr.ctl & RST) {
+				return 0;
+			}
 
-		// Otherwise, continue processing.
-		len = 0;
+			// Otherwise, continue processing.
+			len = 0;
+		}
 	}
 
 	c->snd.wnd = hdr.wnd; // TODO: move below
@@ -1148,6 +1178,12 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 	// ackno should not roll back, and it should also not be bigger than what we ever could have sent
 	// (= snd.una + c->sndbuf.used).
 
+	if(!is_reliable(c)) {
+		if(hdr.ack != c->snd.last && c->state >= ESTABLISHED) {
+			hdr.ack = c->snd.una;
+		}
+	}
+
 	if(hdr.ctl & ACK && (seqdiff(hdr.ack, c->snd.last) > 0 || seqdiff(hdr.ack, c->snd.una) < 0)) {
 		debug("Packet ack seqno out of range, %u <= %u < %u\n", c->snd.una, hdr.ack, c->snd.una + c->sndbuf.used);
 
@@ -1176,6 +1212,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 +1243,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:
@@ -1241,7 +1285,6 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 	// 3. Advance snd.una
 
 	advanced = seqdiff(hdr.ack, c->snd.una);
-	prevrcvnxt = c->rcv.nxt;
 
 	if(advanced) {
 		// RTT measurement
@@ -1273,8 +1316,10 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 
 		assert(data_acked >= 0);
 
+#ifndef NDEBUG
 		int32_t bufused = seqdiff(c->snd.last, c->snd.una);
 		assert(data_acked <= bufused);
+#endif
 
 		if(data_acked) {
 			buffer_get(&c->sndbuf, NULL, data_acked);
@@ -1306,7 +1351,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);
 			}
 
@@ -1334,12 +1379,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;
 		}
 	}
 
@@ -1369,6 +1415,9 @@ skip_ack:
 			break;
 
 		case SYN_RECEIVED:
+			// This is a retransmit of a SYN, send back the SYNACK.
+			goto synack;
+
 		case ESTABLISHED:
 		case FIN_WAIT_1:
 		case FIN_WAIT_2:
@@ -1444,7 +1493,7 @@ skip_ack:
 
 	// 7. Process FIN stuff
 
-	if((hdr.ctl & FIN) && hdr.seq + len == c->rcv.nxt) {
+	if((hdr.ctl & FIN) && (!is_reliable(c) || hdr.seq + len == c->rcv.nxt)) {
 		switch(c->state) {
 		case SYN_SENT:
 		case SYN_RECEIVED:
@@ -1464,7 +1513,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;
 
@@ -1486,7 +1535,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);
@@ -1494,12 +1543,15 @@ skip_ack:
 	}
 
 	// Now we send something back if:
-	// - we advanced rcv.nxt (ie, we got some data that needs to be ACKed)
+	// - we received data, so we have to send back an ACK
 	//   -> sendatleastone = true
 	// - or we got an ack, so we should maybe send a bit more data
 	//   -> sendatleastone = false
 
-	ack(c, len || prevrcvnxt != c->rcv.nxt);
+	if(is_reliable(c) || hdr.ctl & SYN || hdr.ctl & FIN) {
+		ack(c, has_data);
+	}
+
 	return 0;
 
 reset:
@@ -1665,6 +1717,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 +1725,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 +1792,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 +1876,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 +1920,21 @@ 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;
+		}
+
+		if(timerisset(&c->rtrx_timeout)) {
+			c->rtrx_timeout = now;
+		}
+
+		if(timerisset(&c->conn_timeout)) {
+			c->conn_timeout = then;
+		}
+
+		c->rtt_start.tv_sec = 0;
 	}
 
 	if(utcp->rto > START_RTO) {
@@ -1930,6 +2009,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 +2059,53 @@ 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) {
+	struct timeval now;
+	gettimeofday(&now, NULL);
+
+	for(int i = 0; i < utcp->nconnections; i++) {
+		struct utcp_connection *c = utcp->connections[i];
+
+		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;
+		}
+	}
+
+	if(!offline && utcp->rto > START_RTO) {
+		utcp->rto = START_RTO;
+	}
+}