X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;ds=sidebyside;f=server.c;h=29e2387326cfd0cf644ac639192018f876164dc2;hb=1ab4dea477b51355419fabf80de03759e19d1556;hp=8fe7dac706973b4893c8691bf69695950ee62cd6;hpb=bb447a27c8cbab03a54fa6ceec1a244aabec57d2;p=fio.git

diff --git a/server.c b/server.c
index 8fe7dac7..29e23873 100644
--- a/server.c
+++ b/server.c
@@ -8,7 +8,7 @@
 #include <sys/poll.h>
 #include <sys/types.h>
 #include <sys/wait.h>
-#include <sys/mman.h>
+#include <sys/socket.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
@@ -400,7 +400,7 @@ void fio_server_idle_loop(void)
 static int accept_loop(int listen_sk)
 {
 	struct sockaddr_in addr;
-	unsigned int len = sizeof(addr);
+	fio_socklen_t len = sizeof(addr);
 	struct pollfd pfd;
 	int ret, sk, flags, exitval = 0;
 
@@ -429,7 +429,7 @@ again:
 	if (exit_backend)
 		goto out;
 
-	sk = accept(listen_sk, &addr, &len);
+	sk = accept(listen_sk, (struct sockaddr *) &addr, &len);
 	if (sk < 0) {
 		log_err("fio: accept: %s\n", strerror(errno));
 		return -1;
@@ -456,7 +456,7 @@ int fio_server_text_output(const char *buf, unsigned int len)
 	if (server_fd != -1)
 		return fio_net_send_cmd(server_fd, FIO_NET_CMD_TEXT, buf, len);
 
-	return 0;
+	return fwrite(buf, len, 1, f_err);
 }
 
 static void convert_io_stat(struct io_stat *dst, struct io_stat *src)
@@ -631,7 +631,7 @@ static int fio_server(void)
 {
 	struct sockaddr_in saddr_in;
 	struct sockaddr addr;
-	unsigned int len;
+	fio_socklen_t len;
 	int sk, opt, ret;
 
 	dprint(FD_NET, "starting server\n");