X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Futcp.c;h=ca91bee26ef6d21c0f0f57dd743c27c0f9b14f8b;hb=HEAD;hp=e3070b890ebedc754a50260c2c5c8169a8b47b89;hpb=39f2e20489cbc3e924547b684340bf722a0df028;p=meshlink

diff --git a/src/utcp.c b/src/utcp.c
index e3070b89..ca91bee2 100644
--- a/src/utcp.c
+++ b/src/utcp.c
@@ -1600,6 +1600,8 @@ synack:
 			// The peer has aborted our connection.
 			set_state(c, CLOSED);
 			errno = ECONNRESET;
+			buffer_clear(&c->sndbuf);
+			buffer_clear(&c->rcvbuf);
 
 			if(c->recv) {
 				c->recv(c, NULL, 0);
@@ -2075,9 +2077,6 @@ static bool reset_connection(struct utcp_connection *c) {
 	buffer_clear(&c->sndbuf);
 	buffer_clear(&c->rcvbuf);
 
-	c->recv = NULL;
-	c->poll = NULL;
-
 	switch(c->state) {
 	case CLOSED:
 		return true;
@@ -2109,6 +2108,7 @@ static bool reset_connection(struct utcp_connection *c) {
 	hdr.ack = c->rcv.nxt;
 	hdr.wnd = 0;
 	hdr.ctl = RST;
+	hdr.aux = 0;
 
 	print_packet(c, "send", &hdr, sizeof(hdr));
 	c->utcp->send(c->utcp, &hdr, sizeof(hdr));
@@ -2124,8 +2124,8 @@ static void set_reapable(struct utcp_connection *c) {
 	c->reapable = true;
 }
 
-// Closes all the opened connections
-void utcp_abort_all_connections(struct utcp *utcp) {
+// Resets all connections, but does not invalidate connection handles
+void utcp_reset_all_connections(struct utcp *utcp) {
 	if(!utcp) {
 		errno = EINVAL;
 		return;
@@ -2138,19 +2138,16 @@ void utcp_abort_all_connections(struct utcp *utcp) {
 			continue;
 		}
 
-		utcp_recv_t old_recv = c->recv;
-		utcp_poll_t old_poll = c->poll;
+		reset_connection(c);
 
-		utcp_abort(c);
-
-		if(old_recv) {
+		if(c->recv) {
 			errno = 0;
-			old_recv(c, NULL, 0);
+			c->recv(c, NULL, 0);
 		}
 
-		if(old_poll && !c->reapable) {
+		if(c->poll && !c->reapable) {
 			errno = 0;
-			old_poll(c, 0);
+			c->poll(c, 0);
 		}
 	}
 
@@ -2207,6 +2204,8 @@ struct timespec utcp_timeout(struct utcp *utcp) {
 		if(timespec_isset(&c->conn_timeout) && timespec_lt(&c->conn_timeout, &now)) {
 			errno = ETIMEDOUT;
 			c->state = CLOSED;
+			buffer_clear(&c->sndbuf);
+			buffer_clear(&c->rcvbuf);
 
 			if(c->recv) {
 				c->recv(c, NULL, 0);
@@ -2309,6 +2308,9 @@ void utcp_exit(struct utcp *utcp) {
 		struct utcp_connection *c = utcp->connections[i];
 
 		if(!c->reapable) {
+			buffer_clear(&c->sndbuf);
+			buffer_clear(&c->rcvbuf);
+
 			if(c->recv) {
 				c->recv(c, NULL, 0);
 			}