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

diff --git a/utcp.c b/utcp.c
index 49b89ab..9fb68ae 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,13 @@ 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)) {
@@ -1350,7 +1357,14 @@ 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;
 
@@ -1538,6 +1552,13 @@ 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:
@@ -1545,7 +1566,6 @@ int utcp_shutdown(struct utcp_connection *c, int dir) {
 		return -1;
 
 	case SYN_SENT:
-		set_state(c, CLOSED);
 		return 0;
 
 	case SYN_RECEIVED:
@@ -1578,36 +1598,24 @@ int utcp_shutdown(struct utcp_connection *c, int dir) {
 	return 0;
 }
 
-int utcp_close(struct utcp_connection *c) {
-	if(utcp_shutdown(c, SHUT_RDWR) && errno != ENOTCONN) {
-		return -1;
-	}
-
-	c->recv = NULL;
-	c->poll = NULL;
-	c->reapable = true;
-	return 0;
-}
-
-int utcp_abort(struct utcp_connection *c) {
+static bool reset_connection(struct utcp_connection *c) {
 	if(!c) {
 		errno = EFAULT;
-		return -1;
+		return false;
 	}
 
 	if(c->reapable) {
 		debug("Error: abort() called on closed connection %p\n", c);
 		errno = EBADF;
-		return -1;
+		return false;
 	}
 
 	c->recv = NULL;
 	c->poll = NULL;
-	c->reapable = true;
 
 	switch(c->state) {
 	case CLOSED:
-		return 0;
+		return true;
 
 	case LISTEN:
 	case SYN_SENT:
@@ -1615,7 +1623,7 @@ int utcp_abort(struct utcp_connection *c) {
 	case LAST_ACK:
 	case TIME_WAIT:
 		set_state(c, CLOSED);
-		return 0;
+		return true;
 
 	case SYN_RECEIVED:
 	case ESTABLISHED:
@@ -1639,6 +1647,53 @@ int utcp_abort(struct utcp_connection *c) {
 
 	print_packet(c->utcp, "send", &hdr, sizeof(hdr));
 	c->utcp->send(c->utcp, &hdr, sizeof(hdr));
+	return true;
+}
+
+// Closes all the opened connections
+void utcp_abort_all_connections(struct utcp *utcp) {
+	if(!utcp) {
+		errno = EINVAL;
+		return;
+	}
+
+	for(int i = 0; i < utcp->nconnections; i++) {
+		struct utcp_connection *c = utcp->connections[i];
+
+		if(c->reapable || c->state == CLOSED) {
+			continue;
+		}
+
+		utcp_recv_t old_recv = c->recv;
+
+		reset_connection(c);
+
+		if(old_recv) {
+			errno = 0;
+			old_recv(c, NULL, 0);
+		}
+	}
+
+	return;
+}
+
+int utcp_close(struct utcp_connection *c) {
+	if(utcp_shutdown(c, SHUT_RDWR) && errno != ENOTCONN) {
+		return -1;
+	}
+
+	c->recv = NULL;
+	c->poll = NULL;
+	c->reapable = true;
+	return 0;
+}
+
+int utcp_abort(struct utcp_connection *c) {
+	if(!reset_connection(c)) {
+		return -1;
+	}
+
+	c->reapable = true;
 	return 0;
 }
 
@@ -1823,9 +1878,18 @@ 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;
 	}
 }