X-Git-Url: https://tinc-vpn.org/git/browse?p=tinc;a=blobdiff_plain;f=src%2Fnet.c;h=3f17083c192dec33ceb2fb5481513294263d6b8f;hp=59dd39b30c327b8f15f5deb6360148a043deb466;hb=e00b44cb98e4d50a0d426048ba01dbd80bcb5941;hpb=c11dc8079b60d9f8c5b1c7e8fecd90d0fac5a20c

diff --git a/src/net.c b/src/net.c
index 59dd39b3..3f17083c 100644
--- a/src/net.c
+++ b/src/net.c
@@ -303,7 +303,7 @@ static void check_network_activity(fd_set * readset, fd_set * writeset) {
 				else {
 					ifdebug(CONNECTIONS) logger(LOG_DEBUG,
 							   "Error while connecting to %s (%s): %s",
-							   c->name, c->hostname, strerror(result));
+							   c->name, c->hostname, sockstrerror(result));
 					closesocket(c->socket);
 					do_outgoing_connection(c);
 					continue;
@@ -369,9 +369,8 @@ int main_loop(void) {
 #endif
 
 		if(r < 0) {
-			if(errno != EINTR && errno != EAGAIN) {
-				logger(LOG_ERR, "Error while waiting for input: %s",
-					   strerror(errno));
+			if(!sockwouldblock(sockerrno)) {
+				logger(LOG_ERR, "Error while waiting for input: %s", sockstrerror(sockerrno));
 				dump_connections();
 				return 1;
 			}