X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=server.c;h=b4137d12c5d1b7e9223b7fc1a1c4b33941bb9fd7;hb=refs%2Ftags%2Ffio-2.2.9;hp=3229bb3992f83e81b3926888abcfc5eb314a56bd;hpb=296ab20ad3ca51abbc4457d420c3e96e6c16ba96;p=fio.git

diff --git a/server.c b/server.c
index 3229bb39..b4137d12 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);
 	}
 
@@ -1413,7 +1410,7 @@ void fio_server_send_start(struct thread_data *td)
 }
 
 int fio_server_get_verify_state(const char *name, int threadnumber,
-				void **datap)
+				void **datap, int *version)
 {
 	struct thread_io_list *s;
 	struct cmd_sendfile out;
@@ -1461,7 +1458,7 @@ fail:
 	 * the header, and the thread_io_list checksum
 	 */
 	s = rep->data + sizeof(struct verify_state_hdr);
-	if (verify_state_hdr(rep->data, s))
+	if (verify_state_hdr(rep->data, s, version))
 		goto fail;
 
 	/*