15.10.2017 04:01, Eric Blake wrote:
From: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>
Minimal implementation of structured read: one structured reply chunk,
no segmentation.
Minimal structured error implementation: no text message.
Support DF flag, but just ignore it, as there is no segmentation any
way.
Signed-off-by: Vladimir Sementsov-Ogievskiy <vsement...@virtuozzo.com>
Signed-off-by: Eric Blake <ebl...@redhat.com>
---
v4: better _DF flag handling, convert errno to wire format, add
comments and tracing, rework structured error for less churn when adding
text message later, don't kill connection on redundant client option
---
nbd/server.c | 106 +++++++++++++++++++++++++++++++++++++++++++++++++------
nbd/trace-events | 2 ++
2 files changed, 98 insertions(+), 10 deletions(-)
diff --git a/nbd/server.c b/nbd/server.c
index efb6003364..23dc6be708 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -100,6 +100,8 @@ struct NBDClient {
QTAILQ_ENTRY(NBDClient) next;
int nb_requests;
bool closing;
+
+ bool structured_reply;
};
/* That's all folks */
@@ -762,6 +764,23 @@ static int nbd_negotiate_options(NBDClient *client,
uint16_t myflags,
return ret;
}
break;
+
+ case NBD_OPT_STRUCTURED_REPLY:
+ if (client->structured_reply) {
+ ret = nbd_negotiate_send_rep_err(
+ client->ioc, NBD_REP_ERR_INVALID, option, errp,
+ "structured reply already negotiated");
You were going to send a patch to spec for this..
+ } else {
+ ret = nbd_negotiate_send_rep(client->ioc, NBD_REP_ACK,
+ option, errp);
+ }
+ if (ret < 0) {
+ return ret;
+ }
+ client->structured_reply = true;
+ myflags |= NBD_CMD_FLAG_DF;
it should be NBD_FLAG_SEND_DF
[...]
the following looks ok.
--
Best regards,
Vladimir
