X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=utcp.c;h=7c4e5638ab0bbb04bf3e9e29898c5ac093b092a0;hb=fad2787f2394bad3cf105ca5b4cf411db6d34aa6;hp=b939dc8a0e5e4f6723ea2eaa6f1b610adc1ecfee;hpb=850542e9585f716985c25d5995ba5bcb2cc6ba87;p=utcp

diff --git a/utcp.c b/utcp.c
index b939dc8..7c4e563 100644
--- a/utcp.c
+++ b/utcp.c
@@ -580,12 +580,12 @@ ssize_t utcp_send(struct utcp_connection *c, const void *data, size_t len) {
 	switch(c->state) {
 	case CLOSED:
 	case LISTEN:
-	case SYN_SENT:
-	case SYN_RECEIVED:
 		debug("Error: send() called on unconnected connection %p\n", c);
 		errno = ENOTCONN;
 		return -1;
 
+	case SYN_SENT:
+	case SYN_RECEIVED:
 	case ESTABLISHED:
 	case CLOSE_WAIT:
 		break;
@@ -621,6 +621,12 @@ ssize_t utcp_send(struct utcp_connection *c, const void *data, size_t len) {
 	}
 
 	c->snd.last += len;
+
+	// Don't send anything yet if the connection has not fully established yet
+
+	if (c->state == SYN_SENT || c->state == SYN_RECEIVED)
+		return len;
+
 	ack(c, false);
 
 	if(!is_reliable(c)) {
@@ -892,6 +898,8 @@ static void handle_incoming_data(struct utcp_connection *c, uint32_t seq, const
 
 
 ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
+	const uint8_t *ptr = data;
+
 	if(!utcp) {
 		errno = EFAULT;
 		return -1;
@@ -919,8 +927,8 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 
 	// Make a copy from the potentially unaligned data to a struct hdr
 
-	memcpy(&hdr, data, sizeof(hdr));
-	data += sizeof(hdr);
+	memcpy(&hdr, ptr, sizeof(hdr));
+	ptr += sizeof(hdr);
 	len -= sizeof(hdr);
 
 	// Drop packets with an unknown CTL flag
@@ -952,7 +960,7 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 				return -1;
 			}
 
-			init = data;
+			init = ptr;
 			break;
 
 		default:
@@ -961,7 +969,7 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 		}
 
 		len -= auxlen;
-		data += auxlen;
+		ptr += auxlen;
 
 		if(!(aux & 0x800)) {
 			break;
@@ -972,9 +980,9 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 			return -1;
 		}
 
-		memcpy(&aux, data, 2);
+		memcpy(&aux, ptr, 2);
 		len -= 2;
-		data += 2;
+		ptr += 2;
 	}
 
 	// Try to match the packet to an existing connection
@@ -1112,7 +1120,7 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 			acceptable = len > (size_t) - rcv_offset;
 
 			if(acceptable) {
-				data -= rcv_offset;
+				ptr -= rcv_offset;
 				len += rcv_offset;
 				hdr.seq -= rcv_offset;
 			}
@@ -1222,13 +1230,16 @@ ssize_t utcp_recv(struct utcp *utcp, const void *data, size_t len) {
 		}
 	}
 
+	uint32_t advanced;
+
 	if(!(hdr.ctl & ACK)) {
+		advanced = 0;
 		goto skip_ack;
 	}
 
 	// 3. Advance snd.una
 
-	uint32_t advanced = seqdiff(hdr.ack, c->snd.una);
+	advanced = seqdiff(hdr.ack, c->snd.una);
 	prevrcvnxt = c->rcv.nxt;
 
 	if(advanced) {
@@ -1345,7 +1356,12 @@ skip_ack:
 
 			c->rcv.irs = hdr.seq;
 			c->rcv.nxt = hdr.seq;
-			set_state(c, ESTABLISHED);
+			if(c->shut_wr) {
+				c->snd.last++;
+				set_state(c, FIN_WAIT_1);
+			} else {
+				set_state(c, ESTABLISHED);
+			}
 			// TODO: notify application of this somehow.
 			break;
 
@@ -1420,7 +1436,7 @@ skip_ack:
 			return 0;
 		}
 
-		handle_incoming_data(c, hdr.seq, data, len);
+		handle_incoming_data(c, hdr.seq, ptr, len);
 	}
 
 	// 7. Process FIN stuff
@@ -1533,6 +1549,12 @@ int utcp_shutdown(struct utcp_connection *c, int dir) {
 		return 0;
 	}
 
+	// Only process shutting down writes once.
+	if (c->shut_wr)
+		return 0;
+
+	c->shut_wr = true;
+
 	switch(c->state) {
 	case CLOSED:
 	case LISTEN:
@@ -1540,7 +1562,6 @@ int utcp_shutdown(struct utcp_connection *c, int dir) {
 		return -1;
 
 	case SYN_SENT:
-		set_state(c, CLOSED);
 		return 0;
 
 	case SYN_RECEIVED:
@@ -1818,9 +1839,17 @@ size_t utcp_get_sndbuf(struct utcp_connection *c) {
 }
 
 size_t utcp_get_sndbuf_free(struct utcp_connection *c) {
-	if(c && (c->state == ESTABLISHED || c->state == CLOSE_WAIT)) {
+	if (!c)
+		return 0;
+
+	switch(c->state) {
+	case SYN_SENT:
+	case SYN_RECEIVED:
+	case ESTABLISHED:
+	case CLOSE_WAIT:
 		return buffer_free(&c->sndbuf);
-	} else {
+
+	default:
 		return 0;
 	}
 }