client: don't clear client->addr after it's been set

[fio.git] / server.c

diff --git a/server.c b/server.c
index 524c8146670849c58735fc4faa041d0a6dc08095..f7be89a7ef8262e273daea43fc70d9f4e9cb6246 100644 (file)
--- a/server.c
+++ b/server.c
@@ -22,6 +22,8 @@
 #include "crc/crc16.h"
 #include "ieee754.h"
 
+#include "fio_version.h"
+
 int fio_net_port = 8765;
 
 int exit_backend = 0;
@@ -100,7 +102,7 @@ static int verify_convert_cmd(struct fio_net_cmd *cmd)
        cmd->pdu_len    = le32_to_cpu(cmd->pdu_len);
 
        switch (cmd->version) {
-       case FIO_SERVER_VER2:
+       case FIO_SERVER_VER3:
                break;
        default:
                log_err("fio: bad server cmd version %d\n", cmd->version);
@@ -307,6 +309,9 @@ static int handle_probe_cmd(struct fio_net_cmd *cmd)
        probe.fio_minor = FIO_MINOR;
        probe.fio_patch = FIO_PATCH;
 
+       probe.os        = FIO_OS;
+       probe.arch      = FIO_ARCH;
+
        return fio_net_send_cmd(server_fd, FIO_NET_CMD_PROBE, &probe, sizeof(probe));
 }
 
@@ -797,7 +802,6 @@ int fio_server_parse_string(const char *str, char **ptr, int *is_sock,
 
                        hent = gethostbyname(host);
                        if (!hent) {
-                               printf("FAIL\n");
                                free(*ptr);
                                *ptr = NULL;
                                return 1;
@@ -827,16 +831,24 @@ int fio_server_parse_string(const char *str, char **ptr, int *is_sock,
  */
 static int fio_handle_server_arg(void)
 {
-       int unused;
+       int is_sock, ret = 0;
 
        saddr_in.sin_addr.s_addr = htonl(INADDR_ANY);
-       saddr_in.sin_port = htons(fio_net_port);
 
        if (!fio_server_arg)
-               return 0;
+               goto out;
 
-       return fio_server_parse_string(fio_server_arg, &bind_sock, &unused,
+       ret = fio_server_parse_string(fio_server_arg, &bind_sock, &is_sock,
                                        &fio_net_port, &saddr_in.sin_addr);
+
+       if (!is_sock && bind_sock) {
+               free(bind_sock);
+               bind_sock = NULL;
+       }
+
+out:
+       saddr_in.sin_port = htons(fio_net_port);
+       return ret;
 }
 
 static int fio_server(void)