search for: e86282b

...tch nbdkit to truncate before sending that large of a chunk. --- generator/states-newstyle.c | 7 +++++-- generator/states-reply-structured.c | 13 +++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/generator/states-newstyle.c b/generator/states-newstyle.c index e86282b..369df0f 100644 --- a/generator/states-newstyle.c +++ b/generator/states-newstyle.c @@ -64,9 +64,12 @@ prepare_for_reply_payload (struct nbd_handle *h, uint32_t opt) /* Read the following payload if it is short enough to fit in the * static buffer. If it's too long, skip it. */ - /...

...ror (0, "handshake: invalid option reply length"); - return -1; - } debug (h, "negotiated structured replies on this connection"); h->structured_replies = true; break; diff --git a/generator/states-newstyle.c b/generator/states-newstyle.c index 6d81ab8..e86282b 100644 --- a/generator/states-newstyle.c +++ b/generator/states-newstyle.c @@ -16,6 +16,64 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "internal.h" + +/* Common code for parsing a reply to NBD_OPT_*. */ +static int +prepare_for_reply...

I'm still playing with ideas on how to split rstate from wstate (so that we can send a request without waiting for POLLIN to complete a pending reply), but this is some preliminary refactoring I found useful. I also fixed a couple of bugs while in the area (already pushed). There's a question of whether we want nbd_handle to be nearly 5k, or if we should instead keep it small and add one