From: Ben England <bengland@redhat.com>
Date: Tue, 26 May 2015 19:12:46 +0000 (-0400)
Subject: treat error in addr conversion to string as non-fatal
X-Git-Tag: fio-2.2.9~29
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=68d96e515825185b232bbc8d2e5b5136b90514be

treat error in addr conversion to string as non-fatal
---

diff --git a/server.c b/server.c
index 3229bb39..519a7ee6 100644
--- a/server.c
+++ b/server.c
@@ -956,7 +956,6 @@ int get_my_addr_str( int sk )
 	ret = getsockname(sk, sockaddr_p, &len);
 	if (ret) {
 		log_err("fio: getsockaddr: %s\n", strerror(errno));
-		close(sk);
 		return -1;
 	}
 	if (use_ipv6)
@@ -965,7 +964,6 @@ int get_my_addr_str( int sk )
 		net_addr = (char * )&myaddr4.sin_addr;
 	if (NULL == inet_ntop(use_ipv6?AF_INET6:AF_INET, net_addr, client_sockaddr_str, INET6_ADDRSTRLEN-1)) {
 		log_err("inet_ntop: failed to convert addr to string\n");
-		close(sk);
 		return -1;
 	}
 	dprint(FD_NET, "fio server bound to addr %s\n", client_sockaddr_str);
@@ -1043,8 +1041,7 @@ static int accept_loop(int listen_sk)
 		}
 
 		/* exits */
-		if (get_my_addr_str(sk))
-			return -1; /* error already logged and socket closed */
+		get_my_addr_str(sk); /* if error, it's already logged, non-fatal */
 		handle_connection(sk);
 	}