X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=utcp.c;h=d49c4ddcce2cfbf5822efb899b49b4cd186419c4;hb=56d4c8a695a624dde490d7539f4cd9a4fcea9c06;hp=df2a31ec6a5f7bcad210170eace9a7dda4a78c8e;hpb=d6fd886cef9bc465c03a95e9b89f44b2810066aa;p=utcp

diff --git a/utcp.c b/utcp.c
index df2a31e..d49c4dd 100644
--- a/utcp.c
+++ b/utcp.c
@@ -130,13 +130,11 @@ static ssize_t buffer_put(struct buffer *buf, const void *data, size_t len) {
 		if(newsize > buf->maxsize)
 			newsize = buf->maxsize;
 		char *newdata = realloc(buf->data, newsize);
-		fprintf(stderr, "%p = realloc(%p, %zu)\n", newdata, buf->data, newsize);
 		if(!newdata)
 			return -1;
 		buf->data = newdata;
 		buf->size = newsize;
 	}
-	fprintf(stderr, "memcpy(%p, %p, %zu)\n", buf->data + buf->used, data, len);
 	memcpy(buf->data + buf->used, data, len);
 	buf->used += len;
 	return len;
@@ -368,7 +366,7 @@ static void ack(struct utcp_connection *c, bool sendatleastone) {
 		c->snd.nxt += seglen;
 		left -= seglen;
 
-		if(c->state != ESTABLISHED && !left && seglen) {
+		if(c->state != ESTABLISHED && seglen && c->snd.nxt == c->snd.last) {
 			switch(c->state) {
 			case FIN_WAIT_1:
 			case CLOSING:
@@ -442,6 +440,77 @@ static void swap_ports(struct hdr *hdr) {
 	hdr->dst = tmp;
 }
 
+static void retransmit(struct utcp_connection *c) {
+	if(c->state == CLOSED || c->snd.nxt == c->snd.una)
+		return;
+
+	struct utcp *utcp = c->utcp;
+
+	struct {
+		struct hdr hdr;
+		char data[];
+	} *pkt;
+
+	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:
+			// TODO: this should not happen
+			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);
+			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);
+			break;
+
+		case ESTABLISHED:
+		case FIN_WAIT_1:
+			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--;
+			if(len > utcp->mtu)
+				len = utcp->mtu;
+			else {
+				if(c->state == FIN_WAIT_1)
+					pkt->hdr.ctl |= FIN;
+			}
+			buffer_copy(&c->sndbuf, pkt->data, 0, len);
+			print_packet(c->utcp, "rtrx", pkt, sizeof pkt->hdr + len);
+			utcp->send(utcp, pkt, sizeof pkt->hdr + len);
+			break;
+
+		default:
+			// TODO: implement
+#ifdef UTCP_DEBUG
+			abort();
+#endif
+			break;
+	}
+
+	free(pkt);
+}
+
+
 ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 	if(!utcp) {
 		errno = EFAULT;
@@ -557,7 +626,10 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 	case TIME_WAIT:
 		break;
 	default:
+#ifdef UTCP_DEBUG
 		abort();
+#endif
+		break;
 	}
 
 	// 1b. Drop packets with a sequence number not in our receive window.
@@ -589,12 +661,13 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 #endif
 
 	if(!acceptable) {
-		debug("Packet not acceptable, %u  <= %u + %zu < %u\n", c->rcv.nxt, hdr.seq, len, c->rcv.nxt + c->rcv.wnd);
+		debug("Packet not acceptable, %u <= %u + %zu < %u\n", c->rcv.nxt, hdr.seq, len, c->rcv.nxt + c->rcv.wnd);
 		// Ignore unacceptable RST packets.
 		if(hdr.ctl & RST)
 			return 0;
 		// Otherwise, send an ACK back in the hope things improve.
-		goto ack;
+		ack(c, true);
+		return 0;
 	}
 
 	c->snd.wnd = hdr.wnd; // TODO: move below
@@ -656,7 +729,10 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 			set_state(c, CLOSED);
 			return 0;
 		default:
+#ifdef UTCP_DEBUG
 			abort();
+#endif
+			break;
 		}
 	}
 
@@ -712,10 +788,13 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 	} else {
 		if(!len) {
 			c->dupack++;
-			if(c->dupack >= 3) {
+			if(c->dupack == 3) {
 				debug("Triplicate ACK\n");
 				//TODO: Resend one packet and go to fast recovery mode. See RFC 6582.
-				//abort();
+				//We do a very simple variant here; reset the nxt pointer to the last acknowledged packet from the peer.
+				//This will cause us to start retransmitting, but at the same speed as the incoming ACKs arrive,
+				//thus preventing a drop in speed.
+				c->snd.nxt = c->snd.una;
 			}
 		}
 	}
@@ -752,7 +831,10 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 			// Ehm, no. We should never receive a second SYN.
 			goto reset;
 		default:
+#ifdef UTCP_DEBUG
 			abort();
+#endif
+			return 0;
 		}
 
 		// SYN counts as one sequence number
@@ -782,7 +864,10 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 		case SYN_SENT:
 		case SYN_RECEIVED:
 			// This should never happen.
+#ifdef UTCP_DEBUG
 			abort();
+#endif
+			return 0;
 		case ESTABLISHED:
 		case FIN_WAIT_1:
 		case FIN_WAIT_2:
@@ -794,7 +879,10 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 			// Ehm no, We should never receive more data after a FIN.
 			goto reset;
 		default:
+#ifdef UTCP_DEBUG
 			abort();
+#endif
+			return 0;
 		}
 
 		ssize_t rxd;
@@ -803,7 +891,6 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 			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)
@@ -824,7 +911,10 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 		case SYN_SENT:
 		case SYN_RECEIVED:
 			// This should never happen.
+#ifdef UTCP_DEBUG
 			abort();
+#endif
+			break;
 		case ESTABLISHED:
 			set_state(c, CLOSE_WAIT);
 			break;
@@ -843,7 +933,10 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 			// Ehm, no. We should never receive a second FIN.
 			goto reset;
 		default:
+#ifdef UTCP_DEBUG
 			abort();
+#endif
+			break;
 		}
 
 		// FIN counts as one sequence number
@@ -885,7 +978,7 @@ reset:
 }
 
 int utcp_shutdown(struct utcp_connection *c, int dir) {
-	debug("%p shutdown %d\n", c ? c->utcp : NULL, dir);
+	debug("%p shutdown %d at %u\n", c ? c->utcp : NULL, dir, c->snd.last);
 	if(!c) {
 		errno = EFAULT;
 		return -1;
@@ -898,6 +991,7 @@ int utcp_shutdown(struct utcp_connection *c, int dir) {
 	}
 
 	// TODO: handle dir
+	// TODO: check that repeated calls with the same parameters should have no effect
 
 	switch(c->state) {
 	case CLOSED:
@@ -933,6 +1027,8 @@ int utcp_shutdown(struct utcp_connection *c, int dir) {
 int utcp_close(struct utcp_connection *c) {
 	if(utcp_shutdown(c, SHUT_RDWR))
 		return -1;
+	c->recv = NULL;
+	c->poll = NULL;
 	c->reapable = true;
 	return 0;
 }
@@ -949,6 +1045,8 @@ int utcp_abort(struct utcp_connection *c) {
 		return -1;
 	}
 
+	c->recv = NULL;
+	c->poll = NULL;
 	c->reapable = true;
 
 	switch(c->state) {
@@ -987,80 +1085,13 @@ int utcp_abort(struct utcp_connection *c) {
 	return 0;
 }
 
-static void retransmit(struct utcp_connection *c) {
-	if(c->state == CLOSED || c->snd.nxt == c->snd.una)
-		return;
-
-	struct utcp *utcp = c->utcp;
-
-	struct {
-		struct hdr hdr;
-		char data[];
-	} *pkt;
-
-	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:
-			// TODO: this should not happen
-			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);
-			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);
-			break;
-
-		case ESTABLISHED:
-		case FIN_WAIT_1:
-			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--;
-			if(len > utcp->mtu)
-				len = utcp->mtu;
-			else {
-				if(c->state == FIN_WAIT_1)
-					pkt->hdr.ctl |= FIN;
-			}
-			buffer_copy(&c->sndbuf, pkt->data, 0, 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.
  * One call to this function will loop through all connections,
  * checking if something needs to be resent or not.
  * The return value is the time to the next timeout in milliseconds,
  * or maybe a negative value if the timeout is infinite.
  */
-int utcp_timeout(struct utcp *utcp) {
+struct timeval utcp_timeout(struct utcp *utcp) {
 	struct timeval now;
 	gettimeofday(&now, NULL);
 	struct timeval next = {now.tv_sec + 3600, now.tv_usec};
@@ -1110,9 +1141,7 @@ int utcp_timeout(struct utcp *utcp) {
 
 	struct timeval diff;
 	timersub(&next, &now, &diff);
-	if(diff.tv_sec < 0)
-		return 0;
-	return diff.tv_sec * 1000 + diff.tv_usec / 1000;
+	return diff;
 }
 
 struct utcp *utcp_init(utcp_accept_t accept, utcp_pre_accept_t pre_accept, utcp_send_t send, void *priv) {
@@ -1149,60 +1178,71 @@ void utcp_exit(struct utcp *utcp) {
 }
 
 uint16_t utcp_get_mtu(struct utcp *utcp) {
-	return utcp->mtu;
+	return utcp ? utcp->mtu : 0;
 }
 
 void utcp_set_mtu(struct utcp *utcp, uint16_t mtu) {
 	// TODO: handle overhead of the header
-	utcp->mtu = mtu;
+	if(utcp)
+		utcp->mtu = mtu;
 }
 
 int utcp_get_user_timeout(struct utcp *u) {
-	return u->timeout;
+	return u ? u->timeout : 0;
 }
 
 void utcp_set_user_timeout(struct utcp *u, int timeout) {
-	u->timeout = timeout;
+	if(u)
+		u->timeout = timeout;
 }
 
 size_t utcp_get_sndbuf(struct utcp_connection *c) {
-	return c->sndbuf.maxsize;
+	return c ? c->sndbuf.maxsize : 0;
 }
 
 size_t utcp_get_sndbuf_free(struct utcp_connection *c) {
-	return buffer_free(&c->sndbuf);
+	if(c && (c->state == ESTABLISHED || c->state == CLOSE_WAIT))
+		return buffer_free(&c->sndbuf);
+	else
+		return 0;
 }
 
 void utcp_set_sndbuf(struct utcp_connection *c, size_t size) {
+	if(!c)
+		return;
 	c->sndbuf.maxsize = size;
 	if(c->sndbuf.maxsize != size)
 		c->sndbuf.maxsize = -1;
 }
 
 bool utcp_get_nodelay(struct utcp_connection *c) {
-	return c->nodelay;
+	return c ? c->nodelay : false;
 }
 
 void utcp_set_nodelay(struct utcp_connection *c, bool nodelay) {
-	c->nodelay = nodelay;
+	if(c)
+		c->nodelay = nodelay;
 }
 
 bool utcp_get_keepalive(struct utcp_connection *c) {
-	return c->keepalive;
+	return c ? c->keepalive : false;
 }
 
 void utcp_set_keepalive(struct utcp_connection *c, bool keepalive) {
-	c->keepalive = keepalive;
+	if(c)
+		c->keepalive = keepalive;
 }
 
 size_t utcp_get_outq(struct utcp_connection *c) {
-	return seqdiff(c->snd.nxt, c->snd.una);
+	return c ? seqdiff(c->snd.nxt, c->snd.una) : 0;
 }
 
 void utcp_set_recv_cb(struct utcp_connection *c, utcp_recv_t recv) {
-	c->recv = recv;
+	if(c)
+		c->recv = recv;
 }
 
 void utcp_set_poll_cb(struct utcp_connection *c, utcp_poll_t poll) {
-	c->poll = poll;
+	if(c)
+		c->poll = poll;
 }