search for: 104796a

...54,6 +54,7 @@ #include <nbdkit-plugin.h> #include "nbd-protocol.h" +#include "protostrings.h" #include "byte-swapping.h" #include "cleanup.h" diff --git a/server/protocol-handshake-newstyle.c b/server/protocol-handshake-newstyle.c index 866360b..104796a 100644 --- a/server/protocol-handshake-newstyle.c +++ b/server/protocol-handshake-newstyle.c @@ -42,6 +42,7 @@ #include "internal.h" #include "byte-swapping.h" #include "nbd-protocol.h" +#include "protostrings.h" /* Maximum number of client options we a...

...* See http://git.qemu.org/?p=qemu.git;a=commitdiff;h=ca4414804114fd0095b317785bc0b51862e62ebb - */ +/* NBD error codes. */ #define NBD_SUCCESS 0 #define NBD_EPERM 1 #define NBD_EIO 5 diff --git a/server/protocol-handshake-newstyle.c b/server/protocol-handshake-newstyle.c index 104796a..413dcf0 100644 --- a/server/protocol-handshake-newstyle.c +++ b/server/protocol-handshake-newstyle.c @@ -55,7 +55,7 @@ static int send_newstyle_option_reply (struct connection *conn, uint32_t option, uint32_t reply) { - struct fixed_new_option_reply fixed_new_option...

We should have only one NBD protocol file. Let's make nbdkit's version the canonical one, and use it in libnbd. Rich.