X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=utcp.c;h=5ba4eaade2f585d6ad39a702cadef13c64b01e2a;hb=42a2ce613c748e506129da781856ec8f85c92f26;hp=c21d6ab664b0146030c44d60e6feb730e924f0d8;hpb=7034cc75e0324210e96b3da5ac09c979b73173b7;p=utcp

diff --git a/utcp.c b/utcp.c
index c21d6ab..5ba4eaa 100644
--- a/utcp.c
+++ b/utcp.c
@@ -86,11 +86,24 @@ static void print_packet(struct utcp *utcp, const char *dir, const void *pkt, si
 		debug("ACK");
 
 	if(len > sizeof hdr) {
-		debug(" data=");
-		for(int i = sizeof hdr; i < len; i++) {
-			const char *data = pkt;
-			debug("%c", data[i] >= 32 ? data[i] : '.');
+		uint32_t datalen = len - sizeof hdr;
+		uint8_t *str = malloc((datalen << 1) + 7);
+		memcpy(str, " data=", 6);
+		uint8_t *strptr = str + 6;
+		const uint8_t *data = pkt;
+		const uint8_t *dataend = data + datalen;
+
+		while(data != dataend) {
+			*strptr = (*data >> 4) > 9? (*data >> 4) + 55 : (*data >> 4) + 48;
+			++strptr;
+			*strptr = (*data & 0xf) > 9? (*data & 0xf) + 55 : (*data & 0xf) + 48;
+			++strptr;
+			++data;
 		}
+		*strptr = 0;
+
+		debug(str);
+		free(str);
 	}
 
 	debug("\n");
@@ -548,13 +561,14 @@ static void retransmit(struct utcp_connection *c) {
 
 	pkt->hdr.src = c->src;
 	pkt->hdr.dst = c->dst;
+	pkt->hdr.wnd = c->rcv.wnd;
+	pkt->hdr.aux = 0;
 
 	switch(c->state) {
 		case SYN_SENT:
 			// Send our SYN again
 			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);
@@ -850,18 +864,22 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 
 	if(c->state == SYN_SENT)
 		acceptable = true;
-
-	// TODO: handle packets overlapping c->rcv.nxt.
-#if 1
-	// Only use this when accepting out-of-order packets.
 	else if(len == 0)
 		acceptable = seqdiff(hdr.seq, c->rcv.nxt) >= 0;
-	else
+	else {
+		int32_t rcv_offset = seqdiff(hdr.seq, c->rcv.nxt);
+
+		// cut already accepted front overlapping
+		if(rcv_offset < 0) {
+			acceptable = rcv_offset + len >= 0;
+			if(acceptable) {
+				data -= rcv_offset;
+				len += rcv_offset;
+			}
+		}
+
 		acceptable = seqdiff(hdr.seq, c->rcv.nxt) >= 0 && seqdiff(hdr.seq, c->rcv.nxt) + len <= c->rcvbuf.maxsize;
-#else
-	if(c->state != SYN_SENT)
-		acceptable = hdr.seq == c->rcv.nxt;
-#endif
+	}
 
 	if(!acceptable) {
 		debug("Packet not acceptable, %u <= %u + %zu < %u\n", c->rcv.nxt, hdr.seq, len, c->rcv.nxt + c->rcvbuf.maxsize);
@@ -1017,6 +1035,7 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 				//Reset the congestion window so we wait for ACKs.
 				c->snd.nxt = c->snd.una;
 				c->snd.cwnd = utcp->mtu;
+				start_retransmit_timer(c);
 			}
 		}
 	}
@@ -1164,7 +1183,7 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 	// - or we got an ack, so we should maybe send a bit more data
 	//   -> sendatleastone = false
 
-	ack(c, prevrcvnxt != c->rcv.nxt);
+	ack(c, len || prevrcvnxt != c->rcv.nxt);
 	return 0;
 
 reset: