projects
/
fio.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
296ab20
)
treat error in addr conversion to string as non-fatal
author
Ben England
<bengland@redhat.com>
Tue, 26 May 2015 19:12:46 +0000
(15:12 -0400)
committer
Ben England
<bengland@redhat.com>
Tue, 26 May 2015 19:12:46 +0000
(15:12 -0400)
server.c
patch
|
blob
|
blame
|
history
diff --git
a/server.c
b/server.c
index 3229bb3992f83e81b3926888abcfc5eb314a56bd..519a7ee681af5ebe5361e10264d069a146e85ab2 100644
(file)
--- 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));
ret = getsockname(sk, sockaddr_p, &len);
if (ret) {
log_err("fio: getsockaddr: %s\n", strerror(errno));
- close(sk);
return -1;
}
if (use_ipv6)
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");
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);
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 */
}
/* 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);
}
handle_connection(sk);
}