X-Git-Url: https://git.kernel.dk/?a=blobdiff_plain;f=server.h;h=9bf8907f1b7d754fb7f35386be70a95ea787015c;hb=ee88d05666760999be7428beda20f3b24d571d5b;hp=99689d403d9c8c83e103776f01e0f80a5dd822b2;hpb=11e950bd785d9f03b7d35a8ee4b4704256217504;p=fio.git

diff --git a/server.h b/server.h
index 99689d40..9bf8907f 100644
--- a/server.h
+++ b/server.h
@@ -4,6 +4,7 @@
 #include <inttypes.h>
 #include <string.h>
 #include <sys/time.h>
+#include <netinet/in.h>
 
 #include "stat.h"
 #include "os/os.h"
@@ -35,7 +36,7 @@ struct fio_net_int_cmd {
 };
 
 enum {
-	FIO_SERVER_VER		= 6,
+	FIO_SERVER_VER		= 8,
 
 	FIO_SERVER_MAX_PDU	= 1024,
 
@@ -77,9 +78,7 @@ struct cmd_du_pdu {
 struct cmd_probe_pdu {
 	uint8_t hostname[64];
 	uint8_t bigendian;
-	uint8_t fio_major;
-	uint8_t fio_minor;
-	uint8_t fio_patch;
+	uint8_t fio_version[32];
 	uint8_t os;
 	uint8_t arch;
 	uint8_t bpp;
@@ -109,7 +108,7 @@ extern int fio_server_log(const char *format, ...);
 extern int fio_net_send_cmd(int, uint16_t, const void *, off_t, uint64_t);
 extern int fio_net_send_simple_cmd(int, uint16_t, uint64_t, struct flist_head *);
 extern void fio_server_set_arg(const char *);
-extern int fio_server_parse_string(const char *, char **, int *, int *, struct in_addr *);
+extern int fio_server_parse_string(const char *, char **, int *, int *, struct in_addr *, struct in6_addr *, int *);
 extern const char *fio_server_op(unsigned int);
 extern void fio_server_got_signal(int);
 
@@ -125,6 +124,7 @@ extern int fio_clients_send_ini(const char *);
 extern int fio_handle_clients(void);
 extern int fio_client_add(const char *, void **);
 extern void fio_client_add_cmd_option(void *, const char *);
+extern void fio_client_add_ini_file(void *, const char *);
 
 extern int fio_recv_data(int sk, void *p, unsigned int len);
 extern int fio_send_data(int sk, const void *p, unsigned int len);