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

p2p: Add peer WSC device type properties

Browse Source
This commit is contained in:
Andrew Zaborowski 2020-04-23 18:24:30 +02:00 committed by Denis Kenzior
parent 46215a6624
commit 945abadc8a
1 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/p2p.c
View File

@ -68,6 +68,7 @@ struct p2p_peer {
struct scan_bss *bss; struct scan_bss *bss;
struct p2p_device *dev; struct p2p_device *dev;
char *name; char *name;
struct wsc_primary_device_type primary_device_type;
}; };
static struct l_queue *p2p_device_list; static struct l_queue *p2p_device_list;
@ -301,6 +302,46 @@ static bool p2p_peer_get_name(struct l_dbus *dbus,
return true; return true;
} }
static bool p2p_peer_get_category(struct l_dbus *dbus,
struct l_dbus_message *message,
struct l_dbus_message_builder *builder,
void *user_data)
{
struct p2p_peer *peer = user_data;
const char *category;
if (!wsc_device_type_to_dbus_str(&peer->primary_device_type,
&category, NULL) ||
!category)
category = "unknown-device";
l_dbus_message_builder_append_basic(builder, 's', category);
return true;
}
static bool p2p_peer_get_subcategory(struct l_dbus *dbus,
struct l_dbus_message *message,
struct l_dbus_message_builder *builder,
void *user_data)
{
struct p2p_peer *peer = user_data;
const char *subcategory;
/*
* Should we generate subcategory strings with the numerical
* values for the subcategories we don't know, such as
* "Vendor-specific 00:11:22:33 44" ?
*/
if (!wsc_device_type_to_dbus_str(&peer->primary_device_type,
NULL, &subcategory) ||
!subcategory)
return false;
l_dbus_message_builder_append_basic(builder, 's', subcategory);
return true;
}
static bool p2p_peer_get_connected(struct l_dbus *dbus, static bool p2p_peer_get_connected(struct l_dbus *dbus,
struct l_dbus_message *message, struct l_dbus_message *message,
struct l_dbus_message_builder *builder, struct l_dbus_message_builder *builder,
@ -316,6 +357,10 @@ static void p2p_peer_interface_setup(struct l_dbus_interface *interface)
{ {
l_dbus_interface_property(interface, "Name", 0, "s", l_dbus_interface_property(interface, "Name", 0, "s",
p2p_peer_get_name, NULL); p2p_peer_get_name, NULL);
l_dbus_interface_property(interface, "DeviceCategory", 0, "s",
p2p_peer_get_category, NULL);
l_dbus_interface_property(interface, "DeviceSubcategory", 0, "s",
p2p_peer_get_subcategory, NULL);
l_dbus_interface_property(interface, "Connected", 0, "b", l_dbus_interface_property(interface, "Connected", 0, "b",
p2p_peer_get_connected, NULL); p2p_peer_get_connected, NULL);
} }