X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=server.c;h=18b3a080c94655003094b39326492a814e027e8e;hp=519a7ee681af5ebe5361e10264d069a146e85ab2;hb=c82ea3d49aaa5b22188d35819dd623810ae11228;hpb=68d96e515825185b232bbc8d2e5b5136b90514be diff --git a/server.c b/server.c index 519a7ee6..18b3a080 100644 --- a/server.c +++ b/server.c @@ -1410,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; @@ -1458,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; /* @@ -1495,13 +1495,13 @@ static int fio_init_server_ip(void) opt = 1; if (setsockopt(sk, SOL_SOCKET, SO_REUSEADDR, (void *)&opt, sizeof(opt)) < 0) { - log_err("fio: setsockopt: %s\n", strerror(errno)); + log_err("fio: setsockopt(REUSEADDR): %s\n", strerror(errno)); close(sk); return -1; } #ifdef SO_REUSEPORT if (setsockopt(sk, SOL_SOCKET, SO_REUSEPORT, &opt, sizeof(opt)) < 0) { - log_err("fio: setsockopt: %s\n", strerror(errno)); + log_err("fio: setsockopt(REUSEPORT): %s\n", strerror(errno)); close(sk); return -1; }