{"id":815916,"url":"http://patchwork.ozlabs.org/api/patches/815916/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/patch/20170919220125.32535-25-blp@ovn.org/","project":{"id":47,"url":"http://patchwork.ozlabs.org/api/projects/47/?format=json","name":"Open vSwitch","link_name":"openvswitch","list_id":"ovs-dev.openvswitch.org","list_email":"ovs-dev@openvswitch.org","web_url":"http://openvswitch.org/","scm_url":"git@github.com:openvswitch/ovs.git","webscm_url":"https://github.com/openvswitch/ovs","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20170919220125.32535-25-blp@ovn.org>","list_archive_url":null,"date":"2017-09-19T22:00:57","name":"[ovs-dev,RFC,24/52] ovsdb-client: Show even invalid data in \"dump\" output.","commit_ref":null,"pull_url":null,"state":"rfc","archived":false,"hash":"d73107fd9dd06d118d739415a15cb66a78b741a1","submitter":{"id":67603,"url":"http://patchwork.ozlabs.org/api/people/67603/?format=json","name":"Ben Pfaff","email":"blp@ovn.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/openvswitch/patch/20170919220125.32535-25-blp@ovn.org/mbox/","series":[{"id":3975,"url":"http://patchwork.ozlabs.org/api/series/3975/?format=json","web_url":"http://patchwork.ozlabs.org/project/openvswitch/list/?series=3975","date":"2017-09-19T22:00:34","name":"clustering implementation","version":1,"mbox":"http://patchwork.ozlabs.org/series/3975/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/815916/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/815916/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["incoming@patchwork.ozlabs.org","dev@openvswitch.org"],"Delivered-To":["patchwork-incoming@bilbo.ozlabs.org","ovs-dev@mail.linuxfoundation.org"],"Authentication-Results":"ozlabs.org;\n\tspf=pass (mailfrom) smtp.mailfrom=openvswitch.org\n\t(client-ip=140.211.169.12; helo=mail.linuxfoundation.org;\n\tenvelope-from=ovs-dev-bounces@openvswitch.org;\n\treceiver=)","Received":["from mail.linuxfoundation.org (mail.linuxfoundation.org\n\t[140.211.169.12])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256\n\tbits)) (No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xxd4t2hqgz9sNV\n\tfor ;\n\tWed, 20 Sep 2017 08:35:58 +1000 (AEST)","from mail.linux-foundation.org (localhost [127.0.0.1])\n\tby mail.linuxfoundation.org (Postfix) with ESMTP id 3CF7EDDD;\n\tTue, 19 Sep 2017 22:24:50 +0000 (UTC)","from smtp1.linuxfoundation.org (smtp1.linux-foundation.org\n\t[172.17.192.35])\n\tby mail.linuxfoundation.org (Postfix) with ESMTPS id CB33DBF8\n\tfor ; Tue, 19 Sep 2017 22:24:48 +0000 (UTC)","from slow1-d.mail.gandi.net (slow1-d.mail.gandi.net\n\t[217.70.178.86])\n\tby smtp1.linuxfoundation.org (Postfix) with ESMTP id 702BC20C\n\tfor ; Tue, 19 Sep 2017 22:24:48 +0000 (UTC)","from relay4-d.mail.gandi.net (relay4-d.mail.gandi.net\n\t[217.70.183.196])\n\tby slow1-d.mail.gandi.net (Postfix) with ESMTP id 08407534EB1\n\tfor ; Wed, 20 Sep 2017 00:02:10 +0200 (CEST)","from sigabrt.benpfaff.org (unknown [208.91.2.3])\n\t(Authenticated sender: blp@ovn.org)\n\tby relay4-d.mail.gandi.net (Postfix) with ESMTPSA id 4CE541720A3;\n\tWed, 20 Sep 2017 00:02:08 +0200 (CEST)"],"X-Greylist":"from auto-whitelisted by SQLgrey-1.7.6","X-Originating-IP":"208.91.2.3","From":"Ben Pfaff ","To":"dev@openvswitch.org","Date":"Tue, 19 Sep 2017 15:00:57 -0700","Message-Id":"<20170919220125.32535-25-blp@ovn.org>","X-Mailer":"git-send-email 2.10.2","In-Reply-To":"<20170919220125.32535-1-blp@ovn.org>","References":"<20170919220125.32535-1-blp@ovn.org>","X-Spam-Status":"No, score=-0.7 required=5.0 tests=RCVD_IN_DNSWL_LOW\n\tautolearn=disabled version=3.3.1","X-Spam-Checker-Version":"SpamAssassin 3.3.1 (2010-03-16) on\n\tsmtp1.linux-foundation.org","Cc":"Ben Pfaff ","Subject":"[ovs-dev] [PATCH RFC 24/52] ovsdb-client: Show even invalid data in\n\t\"dump\" output.","X-BeenThere":"ovs-dev@openvswitch.org","X-Mailman-Version":"2.1.12","Precedence":"list","List-Id":"","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"ovs-dev-bounces@openvswitch.org","Errors-To":"ovs-dev-bounces@openvswitch.org"},"content":"The ovsdb-client \"dump\" command is a fairly low-level tool that can be\nused, among other purposes, to debug the OVSDB protocol. It's better if\nit just prints what the server sends without being too judgmental about it.\n\nSigned-off-by: Ben Pfaff \n---\n lib/ovsdb-data.c | 17 +++++++++++++++++\n lib/ovsdb-data.h | 5 +++++\n ovsdb/ovsdb-client.c | 5 ++---\n 3 files changed, 24 insertions(+), 3 deletions(-)","diff":"diff --git a/lib/ovsdb-data.c b/lib/ovsdb-data.c\nindex 3ddf5f5bd539..711d84d9badc 100644\n--- a/lib/ovsdb-data.c\n+++ b/lib/ovsdb-data.c\n@@ -1341,6 +1341,23 @@ ovsdb_transient_datum_from_json(struct ovsdb_datum *datum,\n return ovsdb_datum_from_json(datum, &relaxed_type, json, NULL);\n }\n \n+/* Parses 'json' as a datum of the type described by 'type', but ignoring all\n+ * constraints. */\n+struct ovsdb_error * OVS_WARN_UNUSED_RESULT\n+ovsdb_unconstrained_datum_from_json(struct ovsdb_datum *datum,\n+ const struct ovsdb_type *type,\n+ const struct json *json)\n+{\n+ struct ovsdb_type relaxed_type;\n+\n+ ovsdb_base_type_init(&relaxed_type.key, type->key.type);\n+ ovsdb_base_type_init(&relaxed_type.value, type->value.type);\n+ relaxed_type.n_min = 0;\n+ relaxed_type.n_max = UINT_MAX;\n+\n+ return ovsdb_datum_from_json(datum, &relaxed_type, json, NULL);\n+}\n+\n /* Converts 'datum', of the specified 'type', to JSON format, and returns the\n * JSON. The caller is responsible for freeing the returned JSON.\n *\ndiff --git a/lib/ovsdb-data.h b/lib/ovsdb-data.h\nindex 72c8fe35bce3..257e58e2a653 100644\n--- a/lib/ovsdb-data.h\n+++ b/lib/ovsdb-data.h\n@@ -169,6 +169,11 @@ struct ovsdb_error *ovsdb_transient_datum_from_json(\n const struct ovsdb_type *,\n const struct json *)\n OVS_WARN_UNUSED_RESULT;\n+struct ovsdb_error *\n+ovsdb_unconstrained_datum_from_json(struct ovsdb_datum *datum,\n+ const struct ovsdb_type *type,\n+ const struct json *json)\n+ OVS_WARN_UNUSED_RESULT;\n struct json *ovsdb_datum_to_json(const struct ovsdb_datum *,\n const struct ovsdb_type *);\n \ndiff --git a/ovsdb/ovsdb-client.c b/ovsdb/ovsdb-client.c\nindex 76c2cdf4dd23..41b9727b12b9 100644\n--- a/ovsdb/ovsdb-client.c\n+++ b/ovsdb/ovsdb-client.c\n@@ -1231,9 +1231,8 @@ dump_table(const char *table_name, const struct shash *cols,\n y, table_name, columns[x]->name);\n }\n \n- check_ovsdb_error(ovsdb_datum_from_json(&data[y][x],\n- &columns[x]->type,\n- json, NULL));\n+ check_ovsdb_error(ovsdb_unconstrained_datum_from_json(\n+ &data[y][x], &columns[x]->type, json));\n }\n }\n \n","prefixes":["ovs-dev","RFC","24/52"]}