[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v7 07/16] nbd: Send message along with server NBD_RE
From: |
Eric Blake |
Subject: |
[Qemu-devel] [PATCH v7 07/16] nbd: Send message along with server NBD_REP_ERR errors |
Date: |
Fri, 14 Oct 2016 13:33:09 -0500 |
The NBD Protocol allows us to send human-readable messages
along with any NBD_REP_ERR error during option negotiation;
make use of this fact for clients that know what to do with
our message.
Signed-off-by: Eric Blake <address@hidden>
---
v6: tweak comments, fix indentation
v5: don't leak 'msg'
v4: new patch
---
nbd/server.c | 78 +++++++++++++++++++++++++++++++++++++++++++++---------------
1 file changed, 59 insertions(+), 19 deletions(-)
diff --git a/nbd/server.c b/nbd/server.c
index 14a5bd5..3d39292 100644
--- a/nbd/server.c
+++ b/nbd/server.c
@@ -236,6 +236,38 @@ static int nbd_negotiate_send_rep(QIOChannel *ioc,
uint32_t type, uint32_t opt)
return nbd_negotiate_send_rep_len(ioc, type, opt, 0);
}
+/* Send an error reply.
+ * Return -errno on error, 0 on success. */
+static int GCC_FMT_ATTR(4, 5)
+nbd_negotiate_send_rep_err(QIOChannel *ioc, uint32_t type,
+ uint32_t opt, const char *fmt, ...)
+{
+ va_list va;
+ char *msg;
+ int ret;
+ size_t len;
+
+ va_start(va, fmt);
+ msg = g_strdup_vprintf(fmt, va);
+ va_end(va);
+ len = strlen(msg);
+ assert(len < 4096);
+ TRACE("sending error message \"%s\"", msg);
+ ret = nbd_negotiate_send_rep_len(ioc, type, opt, len);
+ if (ret < 0) {
+ goto out;
+ }
+ if (nbd_negotiate_write(ioc, msg, len) != len) {
+ LOG("write failed (error message)");
+ ret = -EIO;
+ } else {
+ ret = 0;
+ }
+out:
+ g_free(msg);
+ return ret;
+}
+
/* Send a single NBD_REP_SERVER reply to NBD_OPT_LIST, including payload.
* Return -errno on error, 0 on success. */
static int nbd_negotiate_send_rep_list(QIOChannel *ioc, NBDExport *exp)
@@ -281,8 +313,9 @@ static int nbd_negotiate_handle_list(NBDClient *client,
uint32_t length)
if (nbd_negotiate_drop_sync(client->ioc, length) != length) {
return -EIO;
}
- return nbd_negotiate_send_rep(client->ioc,
- NBD_REP_ERR_INVALID, NBD_OPT_LIST);
+ return nbd_negotiate_send_rep_err(client->ioc,
+ NBD_REP_ERR_INVALID, NBD_OPT_LIST,
+ "OPT_LIST should not have length");
}
/* For each export, send a NBD_REP_SERVER reply. */
@@ -329,7 +362,8 @@ fail:
return rc;
}
-
+/* Handle NBD_OPT_STARTTLS. Return NULL to drop connection, or else the
+ * new channel for all further (now-encrypted) communication. */
static QIOChannel *nbd_negotiate_handle_starttls(NBDClient *client,
uint32_t length)
{
@@ -343,7 +377,8 @@ static QIOChannel *nbd_negotiate_handle_starttls(NBDClient
*client,
if (nbd_negotiate_drop_sync(ioc, length) != length) {
return NULL;
}
- nbd_negotiate_send_rep(ioc, NBD_REP_ERR_INVALID, NBD_OPT_STARTTLS);
+ nbd_negotiate_send_rep_err(ioc, NBD_REP_ERR_INVALID, NBD_OPT_STARTTLS,
+ "OPT_STARTTLS should not have length");
return NULL;
}
@@ -473,13 +508,15 @@ static int nbd_negotiate_options(NBDClient *client)
return -EINVAL;
default:
- TRACE("Option 0x%" PRIx32 " not permitted before TLS",
- clientflags);
if (nbd_negotiate_drop_sync(client->ioc, length) != length) {
return -EIO;
}
- ret = nbd_negotiate_send_rep(client->ioc, NBD_REP_ERR_TLS_REQD,
- clientflags);
+ ret = nbd_negotiate_send_rep_err(client->ioc,
+ NBD_REP_ERR_TLS_REQD,
+ clientflags,
+ "Option 0x%" PRIx32
+ "not permitted before TLS",
+ clientflags);
if (ret < 0) {
return ret;
}
@@ -505,27 +542,30 @@ static int nbd_negotiate_options(NBDClient *client)
return -EIO;
}
if (client->tlscreds) {
- TRACE("TLS already enabled");
- ret = nbd_negotiate_send_rep(client->ioc,
- NBD_REP_ERR_INVALID,
- clientflags);
+ ret = nbd_negotiate_send_rep_err(client->ioc,
+ NBD_REP_ERR_INVALID,
+ clientflags,
+ "TLS already enabled");
} else {
- TRACE("TLS not configured");
- ret = nbd_negotiate_send_rep(client->ioc,
- NBD_REP_ERR_POLICY,
- clientflags);
+ ret = nbd_negotiate_send_rep_err(client->ioc,
+ NBD_REP_ERR_POLICY,
+ clientflags,
+ "TLS not configured");
}
if (ret < 0) {
return ret;
}
break;
default:
- TRACE("Unsupported option 0x%" PRIx32, clientflags);
if (nbd_negotiate_drop_sync(client->ioc, length) != length) {
return -EIO;
}
- ret = nbd_negotiate_send_rep(client->ioc, NBD_REP_ERR_UNSUP,
- clientflags);
+ ret = nbd_negotiate_send_rep_err(client->ioc,
+ NBD_REP_ERR_UNSUP,
+ clientflags,
+ "Unsupported option 0x%"
+ PRIx32,
+ clientflags);
if (ret < 0) {
return ret;
}
--
2.7.4
- [Qemu-devel] [PATCH v7 00/16] nbd: efficient write zeroes, Eric Blake, 2016/10/14
- [Qemu-devel] [PATCH v7 03/16] nbd: Rename NBDRequest to NBDRequestData, Eric Blake, 2016/10/14
- [Qemu-devel] [PATCH v7 01/16] nbd: Add qemu-nbd -D for human-readable description, Eric Blake, 2016/10/14
- [Qemu-devel] [PATCH v7 04/16] nbd: Rename NbdClientSession to NBDClientSession, Eric Blake, 2016/10/14
- [Qemu-devel] [PATCH v7 06/16] nbd: Share common reply-sending code in server, Eric Blake, 2016/10/14
- [Qemu-devel] [PATCH v7 05/16] nbd: Rename struct nbd_request and nbd_reply, Eric Blake, 2016/10/14
- [Qemu-devel] [PATCH v7 10/16] nbd: Let client skip portions of server reply, Eric Blake, 2016/10/14
- [Qemu-devel] [PATCH v7 02/16] nbd: Treat flags vs. command type as separate fields, Eric Blake, 2016/10/14
- [Qemu-devel] [PATCH v7 07/16] nbd: Send message along with server NBD_REP_ERR errors,
Eric Blake <=
- [Qemu-devel] [PATCH v7 09/16] nbd: Let server know when client gives up negotiation, Eric Blake, 2016/10/14
- [Qemu-devel] [PATCH v7 14/16] nbd: Improve server handling of shutdown requests, Eric Blake, 2016/10/14
- [Qemu-devel] [PATCH v7 15/16] nbd: Implement NBD_CMD_WRITE_ZEROES on server, Eric Blake, 2016/10/14
- [Qemu-devel] [PATCH v7 13/16] nbd: Refactor conversion to errno to silence checkpatch, Eric Blake, 2016/10/14
- [Qemu-devel] [PATCH v7 08/16] nbd: Share common option-sending code in client, Eric Blake, 2016/10/14
- [Qemu-devel] [PATCH v7 12/16] nbd: Support shorter handshake, Eric Blake, 2016/10/14
- [Qemu-devel] [PATCH v7 11/16] nbd: Less allocation during NBD_OPT_LIST, Eric Blake, 2016/10/14
- [Qemu-devel] [PATCH v7 16/16] nbd: Implement NBD_CMD_WRITE_ZEROES on client, Eric Blake, 2016/10/14
- Re: [Qemu-devel] [PATCH v7 00/16] nbd: efficient write zeroes, Eric Blake, 2016/10/25
- Re: [Qemu-devel] [PATCH v7 00/16] nbd: efficient write zeroes, Paolo Bonzini, 2016/10/27