From 68d96e515825185b232bbc8d2e5b5136b90514be Mon Sep 17 00:00:00 2001 From: Ben England Date: Tue, 26 May 2015 15:12:46 -0400 Subject: [PATCH 1/1] treat error in addr conversion to string as non-fatal --- server.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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); } -- 2.25.1