Kernel/iwd
3
0
Fork 0
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git synced 2024-11-25 09:39:25 +01:00
Code Releases Activity

hwsim: change radio Create() to take a dictionary

Browse Source 
The Create() API was limited to only taking a Name and boolean
(for p2p enabling). The actual hwsim nl80211 API can take more
attributes than this (which are actually utilized when creating
from the command line). To get the DBus API up to the same
functionality the two arguments in Create were replaced with
a single dictionary. This allows for extending later if more
arguments are needed.
This commit is contained in:
James Prestwood 2020-12-17 11:36:04 -08:00 committed by Denis Kenzior
parent eaf176220c
commit 6a1853b01a
1 changed files with 28 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
tools/hwsim.c
View File

@ -1599,20 +1599,38 @@ static struct l_dbus_message *radio_manager_create(struct l_dbus *dbus,
void *user_data) void *user_data)
{ {
struct l_genl_msg *new_msg; struct l_genl_msg *new_msg;
const char *name; struct l_dbus_message_iter dict;
bool p2p; struct l_dbus_message_iter variant;
const char *key;
const char *name = NULL;
bool p2p = false;
if (pending_create_msg) if (pending_create_msg)
return dbus_error_busy(message); return dbus_error_busy(message);
if (!l_dbus_message_get_arguments(message, "sb", &name, &p2p)) if (!l_dbus_message_get_arguments(message, "a{sv}", &dict))
return dbus_error_invalid_args(message); goto invalid;
new_msg = l_genl_msg_new_sized(HWSIM_CMD_NEW_RADIO, 16 + strlen(name)); while (l_dbus_message_iter_next_entry(&dict, &key, &variant)) {
bool ret = false;
if (!strcmp(key, "Name"))
ret = l_dbus_message_iter_get_variant(&variant,
"s", &name);
else if (!strcmp(key, "P2P"))
ret = l_dbus_message_iter_get_variant(&variant,
"b", &p2p);
if (!ret)
goto invalid;
}
new_msg = l_genl_msg_new_sized(HWSIM_CMD_NEW_RADIO,
16 + name ? strlen(name) : 0);
l_genl_msg_append_attr(new_msg, HWSIM_ATTR_DESTROY_RADIO_ON_CLOSE, l_genl_msg_append_attr(new_msg, HWSIM_ATTR_DESTROY_RADIO_ON_CLOSE,
0, NULL); 0, NULL);
if (name[0]) if (name)
l_genl_msg_append_attr(new_msg, HWSIM_ATTR_RADIO_NAME, l_genl_msg_append_attr(new_msg, HWSIM_ATTR_RADIO_NAME,
strlen(name) + 1, name); strlen(name) + 1, name);
@ -1627,12 +1645,15 @@ static struct l_dbus_message *radio_manager_create(struct l_dbus *dbus,
pending_create_radio_id = 0; pending_create_radio_id = 0;
return NULL; return NULL;
invalid:
return dbus_error_invalid_args(message);
} }
static void setup_radio_manager_interface(struct l_dbus_interface *interface) static void setup_radio_manager_interface(struct l_dbus_interface *interface)
{ {
l_dbus_interface_method(interface, "CreateRadio", 0, l_dbus_interface_method(interface, "CreateRadio", 0,
radio_manager_create, "o", "sb", radio_manager_create, "o", "a{sv}",
"path", "name", "p2p_device"); "path", "name", "p2p_device");
} }