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

diff --git a/server.h b/server.h
index 99689d40..3f1bde4e 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"
@@ -24,18 +25,18 @@ struct fio_net_cmd {
 	 */
 	uint16_t cmd_crc16;	/* cmd checksum */
 	uint16_t pdu_crc16;	/* payload checksum */
-	uint8_t payload[0];	/* payload */
+	uint8_t payload[];	/* payload */
 };
 
 struct fio_net_int_cmd {
-	struct fio_net_cmd cmd;
 	struct flist_head list;
 	struct timeval tv;
 	uint64_t saved_tag;
+	struct fio_net_cmd cmd;
 };
 
 enum {
-	FIO_SERVER_VER		= 6,
+	FIO_SERVER_VER		= 9,
 
 	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;
@@ -87,16 +86,17 @@ struct cmd_probe_pdu {
 
 struct cmd_single_line_pdu {
 	uint16_t len;
-	uint8_t text[0];
+	uint8_t text[];
 };
 
 struct cmd_line_pdu {
 	uint16_t lines;
-	struct cmd_single_line_pdu options[0];
+	struct cmd_single_line_pdu options[];
 };
 
 struct cmd_start_pdu {
 	uint32_t jobs;
+	uint32_t stat_outputs;
 };
 
 struct cmd_end_pdu {
@@ -109,7 +109,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 +125,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);