X-Git-Url: http://git.meshlink.io/?p=utcp;a=blobdiff_plain;f=utcp.c;h=e64eb2445fed00d19dd477a6f88f2cb6a61797ee;hp=454a497428dd0e698db2bdeae92189fda41eb0fb;hb=8d8944f2e16b8d11e54cb79e1d45023e84aed37f;hpb=f60a19752749bf1d28031e78c46f8924325ffcdd

diff --git a/utcp.c b/utcp.c
index 454a497..e64eb24 100644
--- a/utcp.c
+++ b/utcp.c
@@ -19,6 +19,7 @@
 
 #define _GNU_SOURCE
 
+#include <assert.h>
 #include <errno.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -31,6 +32,27 @@
 
 #include "utcp_priv.h"
 
+#ifndef EBADMSG
+#define EBADMSG         104
+#endif
+
+#ifndef SHUT_RDWR
+#define SHUT_RDWR 2
+#endif
+
+#ifdef poll
+#undef poll
+#endif
+
+#ifndef timersub
+#define timersub(a, b, r) do {\
+	(r)->tv_sec = (a)->tv_sec - (b)->tv_sec;\
+	(r)->tv_usec = (a)->tv_usec - (b)->tv_usec;\
+	if((r)->tv_usec < 0)\
+		(r)->tv_sec--, (r)->tv_usec += 1000000;\
+} while (0)
+#endif
+
 #ifdef UTCP_DEBUG
 #include <stdarg.h>
 
@@ -49,7 +71,7 @@ static void print_packet(struct utcp *utcp, const char *dir, const void *pkt, si
 	}
 
 	memcpy(&hdr, pkt, sizeof hdr);
-	fprintf (stderr, "%p %s: src=%u dst=%u seq=%u ack=%u wnd=%u ctl=", utcp, dir, hdr.src, hdr.dst, hdr.seq, hdr.ack, hdr.wnd);
+	fprintf (stderr, "%p %s: len=%zu, src=%u dst=%u seq=%u ack=%u wnd=%u ctl=", utcp, dir, len, hdr.src, hdr.dst, hdr.seq, hdr.ack, hdr.wnd);
 	if(hdr.ctl & SYN)
 		debug("SYN");
 	if(hdr.ctl & RST)
@@ -95,10 +117,14 @@ static int32_t seqdiff(uint32_t a, uint32_t b) {
 // This gives O(log(N)) lookup time, O(N log(N)) insertion time and O(N) deletion time.
 
 static int compare(const void *va, const void *vb) {
+	assert(va && vb);
+
 	const struct utcp_connection *a = *(struct utcp_connection **)va;
 	const struct utcp_connection *b = *(struct utcp_connection **)vb;
-	if(!a->src || !b->src)
-		abort();
+
+	assert(a && b);
+	assert(a->src && b->src);
+
 	int c = (int)a->src - (int)b->src;
 	if(c)
 		return c;
@@ -120,13 +146,14 @@ static struct utcp_connection *find_connection(const struct utcp *utcp, uint16_t
 static void free_connection(struct utcp_connection *c) {
 	struct utcp *utcp = c->utcp;
 	struct utcp_connection **cp = bsearch(&c, utcp->connections, utcp->nconnections, sizeof *utcp->connections, compare);
-	if(!cp)
-		abort();
+
+	assert(cp);
 
 	int i = cp - utcp->connections;
-	memmove(cp + i, cp + i + 1, (utcp->nconnections - i - 1) * sizeof *cp);
+	memmove(cp, cp + 1, (utcp->nconnections - i - 1) * sizeof *cp);
 	utcp->nconnections--;
 
+	free(c->sndbuf);
 	free(c);
 }
 
@@ -199,6 +226,7 @@ struct utcp_connection *utcp_connect(struct utcp *utcp, uint16_t dst, utcp_recv_
 		return NULL;
 
 	c->recv = recv;
+	c->priv = priv;
 
 	struct hdr hdr;
 
@@ -206,8 +234,9 @@ struct utcp_connection *utcp_connect(struct utcp *utcp, uint16_t dst, utcp_recv_
 	hdr.dst = c->dst;
 	hdr.seq = c->snd.iss;
 	hdr.ack = 0;
-	hdr.ctl = SYN;
 	hdr.wnd = c->rcv.wnd;
+	hdr.ctl = SYN;
+	hdr.aux = 0;
 
 	set_state(c, SYN_SENT);
 
@@ -233,10 +262,12 @@ void utcp_accept(struct utcp_connection *c, utcp_recv_t recv, void *priv) {
 }
 
 static void ack(struct utcp_connection *c, bool sendatleastone) {
-	uint32_t left = seqdiff(c->snd.last, c->snd.nxt);
+	int32_t left = seqdiff(c->snd.last, c->snd.nxt);
 	int32_t cwndleft = c->snd.cwnd - seqdiff(c->snd.nxt, c->snd.una);
 	char *data = c->sndbuf + seqdiff(c->snd.nxt, c->snd.una);
 
+	assert(left >= 0);
+
 	if(cwndleft <= 0)
 		cwndleft = 0;
 
@@ -248,28 +279,47 @@ static void ack(struct utcp_connection *c, bool sendatleastone) {
 
 	struct {
 		struct hdr hdr;
-		char data[c->utcp->mtu];
-	} pkt;
+		char data[];
+	} *pkt;
 
-	pkt.hdr.src = c->src;
-	pkt.hdr.dst = c->dst;
-	pkt.hdr.ack = c->rcv.nxt;
-	pkt.hdr.wnd = c->snd.wnd;
-	pkt.hdr.ctl = ACK;
+	pkt = malloc(sizeof pkt->hdr + c->utcp->mtu);
+	if(!pkt->data)
+		return;
+
+	pkt->hdr.src = c->src;
+	pkt->hdr.dst = c->dst;
+	pkt->hdr.ack = c->rcv.nxt;
+	pkt->hdr.wnd = c->snd.wnd;
+	pkt->hdr.ctl = ACK;
+	pkt->hdr.aux = 0;
 
 	do {
 		uint32_t seglen = left > c->utcp->mtu ? c->utcp->mtu : left;
-		pkt.hdr.seq = c->snd.nxt;
+		pkt->hdr.seq = c->snd.nxt;
 
-		memcpy(pkt.data, data, seglen);
+		memcpy(pkt->data, data, seglen);
 
 		c->snd.nxt += seglen;
 		data += seglen;
 		left -= seglen;
 
-		print_packet(c->utcp, "send", &pkt, sizeof pkt.hdr + seglen);
-		c->utcp->send(c->utcp, &pkt, sizeof pkt.hdr + seglen);
+		if(c->state != ESTABLISHED && !left && seglen) {
+			switch(c->state) {
+			case FIN_WAIT_1:
+			case CLOSING:
+				seglen--;
+				pkt->hdr.ctl |= FIN;
+				break;
+			default:
+				break;
+			}
+		}
+
+		print_packet(c->utcp, "send", pkt, sizeof pkt->hdr + seglen);
+		c->utcp->send(c->utcp, pkt, sizeof pkt->hdr + seglen);
 	} while(left);
+
+	free(pkt);
 }
 
 ssize_t utcp_send(struct utcp_connection *c, const void *data, size_t len) {
@@ -324,6 +374,12 @@ ssize_t utcp_send(struct utcp_connection *c, const void *data, size_t len) {
 			newbufsize = c->maxsndbufsize;
 		else
 			newbufsize = c->sndbufsize * 2;
+		if(bufused + len > newbufsize) {
+			if(bufused + len > c->maxsndbufsize)
+				newbufsize = c->maxsndbufsize;
+			else
+				newbufsize = bufused + len;
+		}
 		char *newbuf = realloc(c->sndbuf, newbufsize);
 		if(newbuf) {
 			c->sndbuf = newbuf;
@@ -352,7 +408,7 @@ static void swap_ports(struct hdr *hdr) {
 	hdr->dst = tmp;
 }
 
-int utcp_recv(struct utcp *utcp, const void *data, size_t len) {
+ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 	if(!utcp) {
 		errno = EFAULT;
 		return -1;
@@ -571,25 +627,62 @@ int utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 	// 3. Advance snd.una
 
 	uint32_t advanced = seqdiff(hdr.ack, c->snd.una);
-	c->snd.una = hdr.ack;
+	uint32_t prevrcvnxt = c->rcv.nxt;
 
 	if(advanced) {
-		debug("%p advanced %u\n", utcp, advanced);
+		int32_t data_acked = advanced;
+
+		switch(c->state) {
+			case SYN_SENT:
+			case SYN_RECEIVED:
+				data_acked--;
+				break;
+			// TODO: handle FIN as well.
+			default:
+				break;
+		}
+
+		assert(data_acked >= 0);
+
+		int32_t bufused = seqdiff(c->snd.last, c->snd.una);
+		assert(data_acked <= bufused);
+
 		// Make room in the send buffer.
 		// TODO: try to avoid memmoving too much. Circular buffer?
-		uint32_t left = seqdiff(c->snd.nxt, hdr.ack);
-		if(left)
-			memmove(c->sndbuf, c->sndbuf + advanced, left);
+		uint32_t left = bufused - data_acked;
+		if(data_acked && left)
+			memmove(c->sndbuf, c->sndbuf + data_acked, left);
+
+		c->snd.una = hdr.ack;
+
 		c->dupack = 0;
 		c->snd.cwnd += utcp->mtu;
 		if(c->snd.cwnd > c->maxsndbufsize)
 			c->snd.cwnd = c->maxsndbufsize;
+
+		// Check if we have sent a FIN that is now ACKed.
+		switch(c->state) {
+		case FIN_WAIT_1:
+			if(c->snd.una == c->snd.last)
+				set_state(c, FIN_WAIT_2);
+			break;
+		case CLOSING:
+			if(c->snd.una == c->snd.last) {
+				gettimeofday(&c->conn_timeout, NULL);
+				c->conn_timeout.tv_sec += 60;
+				set_state(c, TIME_WAIT);
+			}
+			break;
+		default:
+			break;
+		}
 	} else {
 		if(!len) {
 			c->dupack++;
 			if(c->dupack >= 3) {
 				debug("Triplicate ACK\n");
-				abort();
+				//TODO: Resend one packet and go to fast recovery mode. See RFC 6582.
+				//abort();
 			}
 		}
 	}
@@ -597,7 +690,7 @@ int utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 	// 4. Update timers
 
 	if(advanced) {
-		timerclear(&c->conn_timeout); // It should be set anew in utcp_timeout() if c->snd.una != c->snd.nxt.
+		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.nxt)
 			timerclear(&c->rtrx_timeout);
 	}
@@ -671,10 +764,15 @@ int utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 			abort();
 		}
 
-		int rxd;
+		ssize_t rxd;
 
 		if(c->recv) {
 			rxd = c->recv(c, data, len);
+			if(rxd != len) {
+				// TODO: once we have a receive buffer, handle the application not accepting all data.
+				fprintf(stderr, "c->recv(%p, %p, %zu) returned %zd\n", c, data, len, rxd);
+				abort();
+			}
 			if(rxd < 0)
 				rxd = 0;
 			else if(rxd > len)
@@ -701,6 +799,8 @@ int utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 			set_state(c, CLOSING);
 			break;
 		case FIN_WAIT_2:
+			gettimeofday(&c->conn_timeout, NULL);
+			c->conn_timeout.tv_sec += 60;
 			set_state(c, TIME_WAIT);
 			break;
 		case CLOSE_WAIT:
@@ -715,6 +815,7 @@ int utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 
 		// FIN counts as one sequence number
 		c->rcv.nxt++;
+		len++;
 
 		// Inform the application that the peer closed the connection.
 		if(c->recv) {
@@ -723,14 +824,14 @@ int utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 		}
 	}
 
-	if(!len && !advanced)
-		return 0;
-
-	if(!len && !(hdr.ctl & SYN) && !(hdr.ctl & FIN))
-		return 0;
+	// Now we send something back if:
+	// - we advanced rcv.nxt (ie, we got some data that needs to be ACKed)
+	//   -> sendatleastone = true
+	// - or we got an ack, so we should maybe send a bit more data
+	//   -> sendatleastone = false
 
 ack:
-	ack(c, true);
+	ack(c, prevrcvnxt != c->rcv.nxt);
 	return 0;
 
 reset:
@@ -751,7 +852,7 @@ reset:
 }
 
 int utcp_shutdown(struct utcp_connection *c, int dir) {
-	debug("%p shutdown %d\n", c->utcp, dir);
+	debug("%p shutdown %d\n", c ? c->utcp : NULL, dir);
 	if(!c) {
 		errno = EFAULT;
 		return -1;
@@ -790,21 +891,9 @@ int utcp_shutdown(struct utcp_connection *c, int dir) {
 		return 0;
 	}
 
-	// Send FIN
-
-	struct hdr hdr;
-
-	hdr.src = c->src;
-	hdr.dst = c->dst;
-	hdr.seq = c->snd.nxt;
-	hdr.ack = c->rcv.nxt;
-	hdr.wnd = c->snd.wnd;
-	hdr.ctl = FIN | ACK;
-
-	c->snd.nxt += 1;
+	c->snd.last++;
 
-	print_packet(c->utcp, "send", &hdr, sizeof hdr);
-	c->utcp->send(c->utcp, &hdr, sizeof hdr);
+	ack(c, false);
 	return 0;
 }
 
@@ -873,11 +962,15 @@ static void retransmit(struct utcp_connection *c) {
 
 	struct {
 		struct hdr hdr;
-		char data[c->utcp->mtu];
-	} pkt;
+		char data[];
+	} *pkt;
 
-	pkt.hdr.src = c->src;
-	pkt.hdr.dst = c->dst;
+	pkt = malloc(sizeof pkt->hdr + c->utcp->mtu);
+	if(!pkt)
+		return;
+
+	pkt->hdr.src = c->src;
+	pkt->hdr.dst = c->dst;
 
 	switch(c->state) {
 		case LISTEN:
@@ -885,27 +978,27 @@ static void retransmit(struct utcp_connection *c) {
 			break;
 
 		case SYN_SENT:
-			pkt.hdr.seq = c->snd.iss;
-			pkt.hdr.ack = 0;
-			pkt.hdr.wnd = c->rcv.wnd;
-			pkt.hdr.ctl = SYN;
-			print_packet(c->utcp, "rtrx", &pkt, sizeof pkt.hdr);
-			utcp->send(utcp, &pkt, sizeof pkt.hdr);
+			pkt->hdr.seq = c->snd.iss;
+			pkt->hdr.ack = 0;
+			pkt->hdr.wnd = c->rcv.wnd;
+			pkt->hdr.ctl = SYN;
+			print_packet(c->utcp, "rtrx", pkt, sizeof pkt->hdr);
+			utcp->send(utcp, pkt, sizeof pkt->hdr);
 			break;
 
 		case SYN_RECEIVED:
-			pkt.hdr.seq = c->snd.nxt;
-			pkt.hdr.ack = c->rcv.nxt;
-			pkt.hdr.ctl = SYN | ACK;
-			print_packet(c->utcp, "rtrx", &pkt, sizeof pkt.hdr);
-			utcp->send(utcp, &pkt, sizeof pkt.hdr);
+			pkt->hdr.seq = c->snd.nxt;
+			pkt->hdr.ack = c->rcv.nxt;
+			pkt->hdr.ctl = SYN | ACK;
+			print_packet(c->utcp, "rtrx", pkt, sizeof pkt->hdr);
+			utcp->send(utcp, pkt, sizeof pkt->hdr);
 			break;
 
 		case ESTABLISHED:
 		case FIN_WAIT_1:
-			pkt.hdr.seq = c->snd.una;
-			pkt.hdr.ack = c->rcv.nxt;
-			pkt.hdr.ctl = ACK;
+			pkt->hdr.seq = c->snd.una;
+			pkt->hdr.ack = c->rcv.nxt;
+			pkt->hdr.ctl = ACK;
 			uint32_t len = seqdiff(c->snd.nxt, c->snd.una);
 			if(c->state == FIN_WAIT_1)
 				len--;
@@ -913,17 +1006,19 @@ static void retransmit(struct utcp_connection *c) {
 				len = utcp->mtu;
 			else {
 				if(c->state == FIN_WAIT_1)
-					pkt.hdr.ctl |= FIN;
+					pkt->hdr.ctl |= FIN;
 			}
-			memcpy(pkt.data, c->sndbuf, len);
-			print_packet(c->utcp, "rtrx", &pkt, sizeof pkt.hdr + len);
-			utcp->send(utcp, &pkt, sizeof pkt.hdr + len);
+			memcpy(pkt->data, c->sndbuf, len);
+			print_packet(c->utcp, "rtrx", pkt, sizeof pkt->hdr + len);
+			utcp->send(utcp, pkt, sizeof pkt->hdr + len);
 			break;
 
 		default:
 			// TODO: implement
 			abort();
 	}
+
+	free(pkt);
 }
 
 /* Handle timeouts.
@@ -963,6 +1058,9 @@ int utcp_timeout(struct utcp *utcp) {
 			retransmit(c);
 		}
 
+		if(c->poll && c->sndbufsize < c->maxsndbufsize / 2 && (c->state == ESTABLISHED || c->state == CLOSE_WAIT))
+			c->poll(c, c->maxsndbufsize - c->sndbufsize);
+
 		if(timerisset(&c->conn_timeout) && timercmp(&c->conn_timeout, &next, <))
 			next = c->conn_timeout;
 
@@ -1007,8 +1105,13 @@ struct utcp *utcp_init(utcp_accept_t accept, utcp_pre_accept_t pre_accept, utcp_
 void utcp_exit(struct utcp *utcp) {
 	if(!utcp)
 		return;
-	for(int i = 0; i < utcp->nconnections; i++)
-		free_connection(utcp->connections[i]);
+	for(int i = 0; i < utcp->nconnections; i++) {
+		if(!utcp->connections[i]->reapable)
+			debug("Warning, freeing unclosed connection %p\n", utcp->connections[i]);
+		free(utcp->connections[i]->sndbuf);
+		free(utcp->connections[i]);
+	}
+	free(utcp->connections);
 	free(utcp);
 }
 
@@ -1033,6 +1136,10 @@ size_t utcp_get_sndbuf(struct utcp_connection *c) {
 	return c->maxsndbufsize;
 }
 
+size_t utcp_get_sndbuf_free(struct utcp_connection *c) {
+	return c->maxsndbufsize - c->sndbufsize;
+}
+
 void utcp_set_sndbuf(struct utcp_connection *c, size_t size) {
 	c->maxsndbufsize = size;
 	if(c->maxsndbufsize != size)
@@ -1058,3 +1165,11 @@ void utcp_set_keepalive(struct utcp_connection *c, bool keepalive) {
 size_t utcp_get_outq(struct utcp_connection *c) {
 	return seqdiff(c->snd.nxt, c->snd.una);
 }
+
+void utcp_set_recv_cb(struct utcp_connection *c, utcp_recv_t recv) {
+	c->recv = recv;
+}
+
+void utcp_set_poll_cb(struct utcp_connection *c, utcp_poll_t poll) {
+	c->poll = poll;
+}