DGNum/hostapd
6
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

DPP: Do not require dpp_configurator_params to start with a space

Browse source 
This ugly hack for being able to search for optional arguments with
space before them was quite inconvenient and unexpected. Clean this up
by handling this mess internally with a memory allocation and string
duplication if needed so that the users of wpa_supplicant control
interface do not need to care about such details.

Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
This commit is contained in:
Jouni Malinen 2020-02-11 06:41:33 +02:00
parent c7cc80fbc8
commit de08fae66a
1 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/common/dpp.c
View file

@ -4680,9 +4680,22 @@ int dpp_set_configurator(struct dpp_global *dpp, void *msg_ctx,
const char *cmd)
{
const char *pos;
char *tmp = NULL;
int ret = -1;
if (!cmd)
return 0;
if (cmd[0] != ' ') {
size_t len;
len = os_strlen(cmd);
tmp = os_malloc(len + 2);
if (!tmp)
goto fail;
tmp[0] = ' ';
os_memcpy(tmp + 1, cmd, len + 1);
cmd = tmp;
}
wpa_printf(MSG_DEBUG, "DPP: Set configurator parameters: %s", cmd);
@ -4693,7 +4706,7 @@ int dpp_set_configurator(struct dpp_global *dpp, void *msg_ctx,
if (!auth->conf) {
wpa_printf(MSG_INFO,
"DPP: Could not find the specified configurator");
return -1;
goto fail;
}
}
@ -4712,9 +4725,12 @@ int dpp_set_configurator(struct dpp_global *dpp, void *msg_ctx,
if (dpp_configuration_parse(auth, cmd) < 0) {
wpa_msg(msg_ctx, MSG_INFO,
"DPP: Failed to set configurator parameters");
return -1;
goto fail;
}
return 0;
ret = 0;
fail:
os_free(tmp);
return ret;
}