Kernel
/
iwd
mirror of https://git.kernel.org/pub/scm/network/wireless/iwd.git
3
0
Fork 0
Code Releases Activity

p2p: Add main device settings 

Read WSC configuration methods and the Primary Device Type from the
config file and expose device name as a property.
This commit is contained in:
Andrew Zaborowski 2020-04-23 18:24:32 +02:00 committed by Denis Kenzior
parent e1b1461a8e
commit ff65e1fd9a
1 changed files with 132 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

132
src/p2p.c
View File

@ -60,6 +60,8 @@ struct p2p_device {
uint8_t addr[6];
struct wiphy *wiphy;
unsigned int connections_left;
struct p2p_capability_attr capability;
struct p2p_device_info_attr device_info;
struct l_queue *peer_list;
};
@ -121,6 +123,15 @@ static void p2p_peer_put(void *user_data)
p2p_peer_free(peer);
}
#define P2P_SUPPORTED_METHODS ( \
WSC_CONFIGURATION_METHOD_LABEL | \
WSC_CONFIGURATION_METHOD_KEYPAD | \
WSC_CONFIGURATION_METHOD_VIRTUAL_PUSH_BUTTON | \
WSC_CONFIGURATION_METHOD_PHYSICAL_PUSH_BUTTON | \
WSC_CONFIGURATION_METHOD_P2P | \
WSC_CONFIGURATION_METHOD_VIRTUAL_DISPLAY_PIN | \
WSC_CONFIGURATION_METHOD_PHYSICAL_DISPLAY_PIN)
struct p2p_device *p2p_device_update_from_genl(struct l_genl_msg *msg,
bool create)
{
@ -131,6 +142,9 @@ struct p2p_device *p2p_device_update_from_genl(struct l_genl_msg *msg,
const uint64_t *wdev_id = NULL;
struct wiphy *wiphy = NULL;
struct p2p_device *dev;
char hostname[HOST_NAME_MAX + 1];
char *str;
unsigned int uint_val;
if (!l_genl_attr_init(&attr, msg))
return NULL;
@ -200,8 +214,78 @@ struct p2p_device *p2p_device_update_from_genl(struct l_genl_msg *msg,
dev->wdev_id = *wdev_id;
memcpy(dev->addr, ifaddr, ETH_ALEN);
dev->wiphy = wiphy;
gethostname(hostname, sizeof(hostname));
dev->connections_left = 1;
/* TODO: allow masking capability bits through a setting? */
dev->capability.device_caps = P2P_DEVICE_CAP_CONCURRENT_OP;
dev->capability.group_caps = 0;
memcpy(dev->device_info.device_addr, dev->addr, 6);
dev->device_info.wsc_config_methods =
WSC_CONFIGURATION_METHOD_P2P |
WSC_CONFIGURATION_METHOD_PUSH_BUTTON;
dev->device_info.primary_device_type.category = 1; /* Computer */
memcpy(dev->device_info.primary_device_type.oui, microsoft_oui, 3);
dev->device_info.primary_device_type.oui_type = 0x04;
dev->device_info.primary_device_type.subcategory = 1; /* PC */
l_strlcpy(dev->device_info.device_name, hostname,
sizeof(dev->device_info.device_name));
if (l_settings_get_uint(iwd_get_config(), "P2P",
"ConfigurationMethods", &uint_val)) {
if (!(uint_val & P2P_SUPPORTED_METHODS))
l_error("[P2P].ConfigurationMethods must contain "
"at least one supported method");
else if (uint_val & ~0xffff)
l_error("[P2P].ConfigurationMethods should be a "
"16-bit integer");
else
dev->device_info.wsc_config_methods =
uint_val & P2P_SUPPORTED_METHODS;
}
str = l_settings_get_string(iwd_get_config(), "P2P", "DeviceType");
/*
* Standard WSC subcategories are unique and more specific than
* categories so there's no point for the user to specify the
* category if they choose to use the string format.
*
* As an example our default value (Computer - PC) can be
* encoded as either of:
*
* DeviceType=pc
* DeviceType=0x00010050f2040001
*/
if (str && !wsc_device_type_from_subcategory_str(
&dev->device_info.primary_device_type,
str)) {
unsigned long long u;
char *endp;
u = strtoull(str, &endp, 0);
/*
* Accept any custom category, OUI and subcategory values but
* require non-zero category as a sanity check.
*/
if (*endp != '\0' || (u & 0xffff000000000000ll) == 0)
l_error("[P2P].DeviceType must be a subcategory string "
"or a 64-bit integer encoding the full Primary"
" Device Type attribute: "
"<Category>|<OUI>|<OUI Type>|<Subcategory>");
else {
dev->device_info.primary_device_type.category = u >> 48;
dev->device_info.primary_device_type.oui[0] = u >> 40;
dev->device_info.primary_device_type.oui[1] = u >> 32;
dev->device_info.primary_device_type.oui[2] = u >> 24;
dev->device_info.primary_device_type.oui_type = u >> 16;
dev->device_info.primary_device_type.subcategory = u;
}
}
l_queue_push_tail(p2p_device_list, dev);
l_debug("Created P2P device %" PRIx64, dev->wdev_id);
@ -233,6 +317,51 @@ bool p2p_device_destroy(struct p2p_device *dev)
return true;
}
static bool p2p_device_get_name(struct l_dbus *dbus,
struct l_dbus_message *message,
struct l_dbus_message_builder *builder,
void *user_data)
{
struct p2p_device *dev = user_data;
l_dbus_message_builder_append_basic(builder, 's',
dev->device_info.device_name);
return true;
}
static struct l_dbus_message *p2p_device_set_name(struct l_dbus *dbus,
struct l_dbus_message *message,
struct l_dbus_message_iter *new_value,
l_dbus_property_complete_cb_t complete,
void *user_data)
{
struct p2p_device *dev = user_data;
const char *new_name;
bool changed = false;
if (!l_dbus_message_iter_get_variant(new_value, "s", &new_name))
return dbus_error_invalid_args(message);
if (!strcmp(new_name, dev->device_info.device_name))
goto done;
if (strlen(new_name) > sizeof(dev->device_info.device_name) - 1)
return dbus_error_invalid_args(message);
changed = true;
l_strlcpy(dev->device_info.device_name, new_name,
sizeof(dev->device_info.device_name));
done:
complete(dbus, message, NULL);
if (changed)
l_dbus_property_changed(dbus, p2p_device_get_path(dev),
IWD_P2P_INTERFACE, "Name");
return NULL;
}
static bool p2p_device_get_avail_conns(struct l_dbus *dbus,
struct l_dbus_message *message,
struct l_dbus_message_builder *builder,
@ -285,6 +414,9 @@ static struct l_dbus_message *p2p_device_get_peers(struct l_dbus *dbus,
static void p2p_interface_setup(struct l_dbus_interface *interface)
{
l_dbus_interface_property(interface, "Name", 0, "s",
p2p_device_get_name,
p2p_device_set_name);
l_dbus_interface_property(interface, "AvailableConnections", 0, "q",
p2p_device_get_avail_conns, NULL);
l_dbus_interface_method(interface, "GetPeers", 0,