{"id":818253,"url":"http://patchwork.ozlabs.org/api/patches/818253/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170925135801.144261-8-vsementsov@virtuozzo.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170925135801.144261-8-vsementsov@virtuozzo.com>","list_archive_url":null,"date":"2017-09-25T13:58:00","name":"[7/8] nbd/client: refactor nbd_receive_starttls","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"a0854941bd68f2546cb8610c363b255539bcb454","submitter":{"id":66592,"url":"http://patchwork.ozlabs.org/api/people/66592/?format=json","name":"Vladimir Sementsov-Ogievskiy","email":"vsementsov@virtuozzo.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20170925135801.144261-8-vsementsov@virtuozzo.com/mbox/","series":[{"id":4967,"url":"http://patchwork.ozlabs.org/api/series/4967/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=4967","date":"2017-09-25T13:58:01","name":"nbd minimal structured read","version":1,"mbox":"http://patchwork.ozlabs.org/series/4967/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/818253/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/818253/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@bilbo.ozlabs.org","Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=nongnu.org\n\t(client-ip=2001:4830:134:3::11; helo=lists.gnu.org;\n\tenvelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n\treceiver=)","Received":["from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11])\n\t(using TLSv1 with cipher AES256-SHA (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3y15NR5hhfz9tX8\n\tfor ;\n\tTue, 26 Sep 2017 00:01:27 +1000 (AEST)","from localhost ([::1]:42587 helo=lists.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.71) (envelope-from\n\t)\n\tid 1dwTwr-00006X-Np\n\tfor incoming@patchwork.ozlabs.org; Mon, 25 Sep 2017 10:01:25 -0400","from eggs.gnu.org ([2001:4830:134:3::10]:39739)\n\tby lists.gnu.org with esmtp (Exim 4.71)\n\t(envelope-from ) id 1dwTu2-0006bN-Af\n\tfor qemu-devel@nongnu.org; Mon, 25 Sep 2017 09:58:31 -0400","from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)\n\t(envelope-from ) id 1dwTtv-0007Dk-Tc\n\tfor qemu-devel@nongnu.org; Mon, 25 Sep 2017 09:58:30 -0400","from mailhub.sw.ru ([195.214.232.25]:21547 helo=relay.sw.ru)\n\tby eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)\n\t(Exim 4.71) (envelope-from )\n\tid 1dwTtv-0007CH-Ex\n\tfor qemu-devel@nongnu.org; Mon, 25 Sep 2017 09:58:23 -0400","from kvm.sw.ru (msk-vpn.virtuozzo.com [195.214.232.6])\n\tby relay.sw.ru (8.13.4/8.13.4) with ESMTP id v8PDw1fx013085;\n\tMon, 25 Sep 2017 16:58:03 +0300 (MSK)"],"From":"Vladimir Sementsov-Ogievskiy ","To":"qemu-devel@nongnu.org, qemu-block@nongnu.org","Date":"Mon, 25 Sep 2017 16:58:00 +0300","Message-Id":"<20170925135801.144261-8-vsementsov@virtuozzo.com>","X-Mailer":"git-send-email 2.11.1","In-Reply-To":"<20170925135801.144261-1-vsementsov@virtuozzo.com>","References":"<20170925135801.144261-1-vsementsov@virtuozzo.com>","X-detected-operating-system":"by eggs.gnu.org: OpenBSD 3.x [fuzzy]","X-Received-From":"195.214.232.25","Subject":"[Qemu-devel] [PATCH 7/8] nbd/client: refactor nbd_receive_starttls","X-BeenThere":"qemu-devel@nongnu.org","X-Mailman-Version":"2.1.21","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Cc":"kwolf@redhat.com, vsementsov@virtuozzo.com, Hmreitz@redhat.com,\n\tden@openvz.org, pbonzini@redhat.com","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"\"Qemu-devel\"\n\t"},"content":"Split out nbd_receive_simple_option to be reused for structured reply\noption.\n\nSigned-off-by: Vladimir Sementsov-Ogievskiy \n---\n nbd/client.c | 64 ++++++++++++++++++++++++++++++++++++++++----------------\n nbd/trace-events | 7 ++++---\n 2 files changed, 50 insertions(+), 21 deletions(-)","diff":"diff --git a/nbd/client.c b/nbd/client.c\nindex cd5a2c80ac..51ae492e92 100644\n--- a/nbd/client.c\n+++ b/nbd/client.c\n@@ -540,35 +540,63 @@ static int nbd_receive_query_exports(QIOChannel *ioc,\n }\n }\n \n-static QIOChannel *nbd_receive_starttls(QIOChannel *ioc,\n- QCryptoTLSCreds *tlscreds,\n- const char *hostname, Error **errp)\n+/* nbd_request_simple_option\n+ * return 1 for successful negotiation,\n+ * 0 if operation is unsupported,\n+ * -1 with errp set for any other error\n+ */\n+static int nbd_request_simple_option(QIOChannel *ioc, int opt, Error **errp)\n {\n nbd_opt_reply reply;\n- QIOChannelTLS *tioc;\n- struct NBDTLSHandshakeData data = { 0 };\n \n- trace_nbd_receive_starttls_request();\n- if (nbd_send_option_request(ioc, NBD_OPT_STARTTLS, 0, NULL, errp) < 0) {\n- return NULL;\n+ trace_nbd_receive_simple_option_request(opt, nbd_opt_lookup(opt));\n+ if (nbd_send_option_request(ioc, opt, 0, NULL, errp) < 0) {\n+ return -1;\n }\n \n- trace_nbd_receive_starttls_reply();\n- if (nbd_receive_option_reply(ioc, NBD_OPT_STARTTLS, &reply, errp) < 0) {\n- return NULL;\n+ trace_nbd_receive_simple_option_reply(opt, nbd_opt_lookup(opt));\n+ if (nbd_receive_option_reply(ioc, opt, &reply, errp) < 0) {\n+ return -1;\n }\n \n- if (reply.type != NBD_REP_ACK) {\n- error_setg(errp, \"Server rejected request to start TLS %\" PRIx32,\n- reply.type);\n+ if (reply.length != 0) {\n+ error_setg(errp, \"Option %d ('%s') response length is %\" PRIu32\n+ \" (it should be zero)\", opt, nbd_opt_lookup(opt),\n+ reply.length);\n nbd_send_opt_abort(ioc);\n- return NULL;\n+ return -1;\n }\n \n- if (reply.length != 0) {\n- error_setg(errp, \"Start TLS response was not zero %\" PRIu32,\n- reply.length);\n+ if (reply.type == NBD_REP_ERR_UNSUP) {\n+ return 1;\n+ }\n+\n+ if (reply.type != NBD_REP_ACK) {\n+ error_setg(errp, \"Server rejected request for option %d (%s) \"\n+ \"with reply %\" PRIx32 \" (%s)\", opt, nbd_opt_lookup(opt),\n+ reply.type, nbd_rep_lookup(reply.type));\n nbd_send_opt_abort(ioc);\n+ return -1;\n+ }\n+\n+ trace_nbd_receive_simple_option_approved(opt, nbd_opt_lookup(opt));\n+ return 0;\n+}\n+\n+static QIOChannel *nbd_receive_starttls(QIOChannel *ioc,\n+ QCryptoTLSCreds *tlscreds,\n+ const char *hostname, Error **errp)\n+{\n+ int ret;\n+ QIOChannelTLS *tioc;\n+ struct NBDTLSHandshakeData data = { 0 };\n+\n+ ret = nbd_request_simple_option(ioc, NBD_OPT_STARTTLS, errp);\n+ if (ret <= 0) {\n+ if (ret == 0) {\n+ error_setg(errp, \"Server don't support STARTTLS option\");\n+ nbd_send_opt_abort(ioc);\n+ }\n return NULL;\n }\n \ndiff --git a/nbd/trace-events b/nbd/trace-events\nindex 48a4f27682..ea44e6963f 100644\n--- a/nbd/trace-events\n+++ b/nbd/trace-events\n@@ -9,9 +9,10 @@ nbd_opt_go_info_unknown(int info, const char *name) \"Ignoring unknown info %d (%\n nbd_opt_go_info_block_size(uint32_t minimum, uint32_t preferred, uint32_t maximum) \"Block sizes are 0x%\" PRIx32 \", 0x%\" PRIx32 \", 0x%\" PRIx32\n nbd_receive_query_exports_start(const char *wantname) \"Querying export list for '%s'\"\n nbd_receive_query_exports_success(const char *wantname) \"Found desired export name '%s'\"\n-nbd_receive_starttls_request(void) \"Requesting TLS from server\"\n-nbd_receive_starttls_reply(void) \"Getting TLS reply from server\"\n-nbd_receive_starttls_new_client(void) \"TLS request approved, setting up TLS\"\n+nbd_receive_simple_option_request(int opt, const char *name) \"Requesting option %d (%s) from server\"\n+nbd_receive_simple_option_reply(int opt, const char *name) \"Getting reply for option %d (%s) from server\"\n+nbd_receive_simple_option_approved(int opt, const char *name) \"Option %d (%s) approved\"\n+nbd_receive_starttls_new_client(void) \"Setting up TLS\"\n nbd_receive_starttls_tls_handshake(void) \"Starting TLS handshake\"\n nbd_receive_negotiate(void *tlscreds, const char *hostname) \"Receiving negotiation tlscreds=%p hostname=%s\"\n nbd_receive_negotiate_magic(uint64_t magic) \"Magic is 0x%\" PRIx64\n","prefixes":["7/8"]}