server: sanity check incoming command size (and payload)

[fio.git] / server.h

diff --git a/server.h b/server.h
index e84a709565552a8a12fe4c57152c3813ac80408b..2958e7306c3ecb4c28d02c1309b0f2de9ed59a13 100644 (file)
--- a/server.h
+++ b/server.h
@@ -38,9 +38,10 @@ struct fio_net_cmd_reply {
 };
 
 enum {
-       FIO_SERVER_VER                  = 20,
+       FIO_SERVER_VER                  = 33,
 
        FIO_SERVER_MAX_FRAGMENT_PDU     = 1024,
+       FIO_SERVER_MAX_CMD_MB           = 2048,
 
        FIO_NET_CMD_QUIT                = 1,
        FIO_NET_CMD_EXIT                = 2,
@@ -71,6 +72,8 @@ enum {
        FIO_NET_NAME_MAX                = 256,
 
        FIO_NET_CLIENT_TIMEOUT          = 5000,
+
+       FIO_PROBE_FLAG_ZLIB             = 1UL << 0,
 };
 
 struct cmd_ts_pdu {
@@ -83,7 +86,11 @@ struct cmd_du_pdu {
        struct disk_util_agg agg;
 };
 
-struct cmd_probe_pdu {
+struct cmd_client_probe_pdu {
+       uint64_t flags;
+};
+
+struct cmd_probe_reply_pdu {
        uint8_t hostname[64];
        uint8_t bigendian;
        uint8_t fio_version[32];
@@ -139,6 +146,7 @@ struct cmd_iolog_pdu {
        uint32_t thread_number;
        uint32_t nr_samples;
        uint32_t log_type;
+       uint32_t compressed;
        uint8_t name[FIO_NET_NAME_MAX];
        struct io_sample samples[0];
 };
@@ -149,7 +157,7 @@ extern int fio_net_send_cmd(int, uint16_t, const void *, off_t, uint64_t *, stru
 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 *, struct in6_addr *, int *);
-extern int fio_server_parse_host(const char *, int *, struct in_addr *, struct in6_addr *);
+extern int fio_server_parse_host(const char *, int, struct in_addr *, struct in6_addr *);
 extern const char *fio_server_op(unsigned int);
 extern void fio_server_got_signal(int);