X-Git-Url: http://git.meshlink.io/?a=blobdiff_plain;f=src%2Fnet_socket.c;h=31bc608f1d43fd56f346d9d2736de43c3b79e951;hb=HEAD;hp=abf6a7cf0e0eb7fa878f347efa45a6910c646927;hpb=a23ddd4f4e273b2ed68fe173b4faa69aadc98756;p=meshlink

diff --git a/src/net_socket.c b/src/net_socket.c
index abf6a7cf..8b1263b0 100644
--- a/src/net_socket.c
+++ b/src/net_socket.c
@@ -136,6 +136,10 @@ static void handle_meta_write(meshlink_handle_t *mesh, connection_t *c) {
 		return;
 	}
 
+	if(c->node) {
+		c->node->out_meta += outlen;
+	}
+
 	buffer_read(&c->outbuf, outlen);
 
 	if(!c->outbuf.len) {
@@ -161,7 +165,7 @@ static void handle_meta_io(event_loop_t *loop, void *data, int flags) {
 		if(!result) {
 			finish_connecting(mesh, c);
 		} else {
-			logger(mesh, MESHLINK_DEBUG, "Error while connecting to %s: %s", c->name, sockstrerror(result));
+			logger(mesh, MESHLINK_ERROR, "Error while connecting to %s: %s", c->name, sockstrerror(result));
 			terminate_connection(mesh, c, false);
 			return;
 		}
@@ -378,6 +382,7 @@ begin:
 			/* We are waiting for a callback from the ADNS thread */
 		} else if(outgoing->state == OUTGOING_NO_KNOWN_ADDRESSES) {
 			logger(mesh, MESHLINK_ERROR, "No known addresses for %s", outgoing->node->name);
+			list_delete(mesh->outgoings, outgoing);
 		} else {
 			logger(mesh, MESHLINK_ERROR, "Could not set up a meta connection to %s", outgoing->node->name);
 			retry_outgoing(mesh, outgoing);
@@ -524,6 +529,10 @@ void handle_new_meta_connection(event_loop_t *loop, void *data, int flags) {
 	fd = accept(l->tcp.fd, &sa.sa, &len);
 
 	if(fd < 0) {
+		if(sockwouldblock(errno)) {
+			return;
+		}
+
 		if(errno == EINVAL) { // TODO: check if Windows agrees
 			event_loop_stop(loop);
 			return;