Re: [PATCH v4 07/10] dpp-util: add dpp_parse_configuration_object

[Denis Kenzior <denkenz at gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1885 bytes --]

Hi James,

On 12/16/21 12:08, James Prestwood wrote:
> This parses the configuration JSON object from the configuration
> response. Only a minimal configuration object is supported for
> now.
> ---
>   Makefile.am    |   3 +-
>   src/dpp-util.c | 110 +++++++++++++++++++++++++++++++++++++++++++++++++
>   src/dpp-util.h |  12 ++++++
>   3 files changed, 124 insertions(+), 1 deletion(-)
> 

<snip>

> +/*
> + * TODO: This handles the most basic configuration. i.e. a configuration object
> + * with ssid/passphrase/akm.
> + */
> +struct dpp_configuration *dpp_parse_configuration_object(const char *json,
> +							size_t json_len)
> +{
> +	struct dpp_configuration *config;
> +	struct json_contents *c;
> +	struct json_iter iter;
> +	struct json_iter discovery;
> +	struct json_iter cred;
> +	_auto_(l_free)char *tech = NULL;
> +	_auto_(l_free)char *ssid = NULL;
> +	_auto_(l_free)char *akm = NULL;
> +	_auto_(l_free)char *pass = NULL;
> +	_auto_(l_free)char *psk = NULL;

nit: I changed these to have a space after l_free) and char *

> +
> +	c = json_contents_new(json, json_len);
> +	if (!c)
> +		return NULL;
> +
> +	json_iter_init(&iter, c);
> +
> +	if (!json_iter_parse(&iter,
> +			JSON_MANDATORY("wi-fi_tech", JSON_STRING, &tech),
> +			JSON_MANDATORY("discovery", JSON_OBJECT, &discovery),
> +			JSON_MANDATORY("cred", JSON_OBJECT, &cred),
> +			JSON_UNDEFINED))
> +		goto free_contents;
> +
> +	if (!tech || strncmp(tech, "infra", 5))
> +		goto free_contents;
> +
> +

Got rid of this double empty line.

> +	if (!json_iter_parse(&discovery,
> +			JSON_MANDATORY("ssid", JSON_STRING, &ssid),
> +			JSON_UNDEFINED))
> +		goto free_contents;
> +
> +	if (!ssid || !util_ssid_is_utf8(strlen(ssid),(const uint8_t *)ssid))

And added a few spaces here for coding style reasons.

Applied, thanks.

Regards,
-Denis