From aefd97b779035f83369723b129f14c80364e5f1e Mon Sep 17 00:00:00 2001 From: Andy Zhou Date: Wed, 14 Oct 2015 16:57:52 -0700 Subject: [PATCH] lib: avoid set size check when generating diff datum from json Added ovsdb_transient_datum_from_json() to avoid size check for the diff datum that is transient in nature. Suppose a datum contains set, and the max number of elements is 2. If we are changing from set that contains [A, B], to a set contains [C, D], the diff datum will contains 4 elements [A, B, C, D]. Thus diff datum should not be constrained by the size limit. However the datum after diff is applied should not violate the size limit. Signed-off-by: Andy Zhou Acked-by: Ben Pfaff --- lib/ovsdb-data.c | 19 +++++++++++++++++++ lib/ovsdb-data.h | 5 +++++ 2 files changed, 24 insertions(+) diff --git a/lib/ovsdb-data.c b/lib/ovsdb-data.c index a62e92e06..f7d0b06e7 100644 --- a/lib/ovsdb-data.c +++ b/lib/ovsdb-data.c @@ -1268,6 +1268,25 @@ ovsdb_datum_from_json(struct ovsdb_datum *datum, return error; } +/* Parses 'json' as a datum of the type described by 'type' for internal + * use. This function is similar to 'ovsdb_datum_from_json', except the + * member size of set or map is not checked. + * + * The datum generated should be used then discard. It is not suitable + * for storing into IDL because of the possible member size violation. */ +struct ovsdb_error * +ovsdb_transient_datum_from_json(struct ovsdb_datum *datum, + const struct ovsdb_type *type, + const struct json *json) +{ + struct ovsdb_type relaxed_type = *type; + + relaxed_type.n_min = 0; + relaxed_type.n_max = UINT_MAX; + + return ovsdb_datum_from_json(datum, &relaxed_type, json, NULL); +} + /* Converts 'datum', of the specified 'type', to JSON format, and returns the * JSON. The caller is responsible for freeing the returned JSON. * diff --git a/lib/ovsdb-data.h b/lib/ovsdb-data.h index e144c70d0..802f7184c 100644 --- a/lib/ovsdb-data.h +++ b/lib/ovsdb-data.h @@ -161,6 +161,11 @@ struct ovsdb_error *ovsdb_datum_from_json(struct ovsdb_datum *, const struct json *, struct ovsdb_symbol_table *) OVS_WARN_UNUSED_RESULT; +struct ovsdb_error *ovsdb_transient_datum_from_json( + struct ovsdb_datum *, + const struct ovsdb_type *, + const struct json *) + OVS_WARN_UNUSED_RESULT; struct json *ovsdb_datum_to_json(const struct ovsdb_datum *, const struct ovsdb_type *); -- 2.20.1