genfio: Splitting gen_template in 2 parts

[fio.git] / server.c

diff --git a/server.c b/server.c
index 020d1d7b5a4bc333305ac98fdaf94514d748cc26..3d31cbf6bb01e16974642275cf77582e6a928d57 100644 (file)
--- a/server.c
+++ b/server.c
@@ -11,6 +11,7 @@
 #include <sys/socket.h>
 #include <sys/stat.h>
 #include <sys/un.h>
+#include <sys/uio.h>
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <netdb.h>
@@ -680,6 +681,7 @@ static int handle_send_eta_cmd(struct fio_net_cmd *cmd)
        je->nr_running          = cpu_to_le32(je->nr_running);
        je->nr_ramp             = cpu_to_le32(je->nr_ramp);
        je->nr_pending          = cpu_to_le32(je->nr_pending);
+       je->nr_setting_up       = cpu_to_le32(je->nr_setting_up);
        je->files_open          = cpu_to_le32(je->files_open);
 
        for (i = 0; i < DDIR_RWDIR_CNT; i++) {
@@ -1465,7 +1467,7 @@ int fio_server_parse_string(const char *str, char **ptr, int *is_sock,
                host++;
                lport = atoi(host);
                if (!lport || lport > 65535) {
-                       log_err("fio: bad server port %u\n", port);
+                       log_err("fio: bad server port %u\n", lport);
                        return 1;
                }
                /* no hostname given, we are done */
@@ -1483,7 +1485,7 @@ int fio_server_parse_string(const char *str, char **ptr, int *is_sock,
                        portp++;
                        lport = atoi(portp);
                        if (!lport || lport > 65535) {
-                               log_err("fio: bad server port %u\n", port);
+                               log_err("fio: bad server port %u\n", lport);
                                return 1;
                        }
                }