jeltz/hostap
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

P2P: Add ModelNumber and SerialNumber info into D-Bus peer interface

Browse source 
Signed-off-by: Amit Khatri <amit.khatri@samsung.com>
Signed-off-by: Rahul Jain <rahul.jain@samsung.com>
This commit is contained in:
Amit Khatri 2015-06-10 10:06:09 +00:00 committed by Jouni Malinen
parent 2899cba622
commit 4f369652da
4 changed files with 98 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
doc/dbus.doxygen
View file

@ -1646,6 +1646,14 @@ Interface implemented by objects representing P2P peer devices.
<h3>ModelName - s - (read)</h3> <h3>ModelName - s - (read)</h3>
</li> </li>
<li>
<h3>ModelNumber - s - (read)</h3>
</li>
<li>
<h3>SerialNumber - s - (read)</h3>
</li>
<li> <li>
<h3>PrimaryDeviceType - ay - (read)</h3> <h3>PrimaryDeviceType - ay - (read)</h3>
</li> </li>

8
wpa_supplicant/dbus/dbus_new.c
View file

@ -3319,6 +3319,14 @@ static const struct wpa_dbus_property_desc wpas_dbus_p2p_peer_properties[] = {
wpas_dbus_getter_p2p_peer_modelname, wpas_dbus_getter_p2p_peer_modelname,
NULL NULL
}, },
{ "ModelNumber", WPAS_DBUS_NEW_IFACE_P2P_PEER, "s",
wpas_dbus_getter_p2p_peer_modelnumber,
NULL
},
{ "SerialNumber", WPAS_DBUS_NEW_IFACE_P2P_PEER, "s",
wpas_dbus_getter_p2p_peer_serialnumber,
NULL
},
{ "PrimaryDeviceType", WPAS_DBUS_NEW_IFACE_P2P_PEER, "ay", { "PrimaryDeviceType", WPAS_DBUS_NEW_IFACE_P2P_PEER, "ay",
wpas_dbus_getter_p2p_peer_primary_device_type, wpas_dbus_getter_p2p_peer_primary_device_type,
NULL NULL

74
wpa_supplicant/dbus/dbus_new_handlers_p2p.c
View file

@ -1325,6 +1325,80 @@ dbus_bool_t wpas_dbus_getter_p2p_peer_modelname(DBusMessageIter *iter,
} }
dbus_bool_t wpas_dbus_getter_p2p_peer_modelnumber(DBusMessageIter *iter,
DBusError *error,
void *user_data)
{
struct peer_handler_args *peer_args = user_data;
const struct p2p_peer_info *info;
char *tmp;
if (!wpa_dbus_p2p_check_enabled(peer_args->wpa_s, NULL, NULL, error))
return FALSE;
/* get the peer info */
info = p2p_get_peer_found(peer_args->wpa_s->global->p2p,
peer_args->p2p_device_addr, 0);
if (info == NULL) {
dbus_set_error(error, DBUS_ERROR_FAILED, "failed to find peer");
return FALSE;
}
tmp = os_strdup(info->model_number);
if (!tmp) {
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
return FALSE;
}
if (!wpas_dbus_simple_property_getter(iter, DBUS_TYPE_STRING, &tmp,
error)) {
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
os_free(tmp);
return FALSE;
}
os_free(tmp);
return TRUE;
}
dbus_bool_t wpas_dbus_getter_p2p_peer_serialnumber(DBusMessageIter *iter,
DBusError *error,
void *user_data)
{
struct peer_handler_args *peer_args = user_data;
const struct p2p_peer_info *info;
char *tmp;
if (!wpa_dbus_p2p_check_enabled(peer_args->wpa_s, NULL, NULL, error))
return FALSE;
/* get the peer info */
info = p2p_get_peer_found(peer_args->wpa_s->global->p2p,
peer_args->p2p_device_addr, 0);
if (info == NULL) {
dbus_set_error(error, DBUS_ERROR_FAILED, "failed to find peer");
return FALSE;
}
tmp = os_strdup(info->serial_number);
if (!tmp) {
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
return FALSE;
}
if (!wpas_dbus_simple_property_getter(iter, DBUS_TYPE_STRING, &tmp,
error)) {
dbus_set_error_const(error, DBUS_ERROR_NO_MEMORY, "no memory");
os_free(tmp);
return FALSE;
}
os_free(tmp);
return TRUE;
}
dbus_bool_t wpas_dbus_getter_p2p_peer_primary_device_type( dbus_bool_t wpas_dbus_getter_p2p_peer_primary_device_type(
DBusMessageIter *iter, DBusError *error, void *user_data) DBusMessageIter *iter, DBusError *error, void *user_data)
{ {

8
wpa_supplicant/dbus/dbus_new_handlers_p2p.h
View file

@ -123,6 +123,14 @@ dbus_bool_t wpas_dbus_getter_p2p_peer_modelname(DBusMessageIter *iter,
DBusError *error, DBusError *error,
void *user_data); void *user_data);
dbus_bool_t wpas_dbus_getter_p2p_peer_modelnumber(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_p2p_peer_serialnumber(DBusMessageIter *iter,
DBusError *error,
void *user_data);
dbus_bool_t wpas_dbus_getter_p2p_peer_primary_device_type( dbus_bool_t wpas_dbus_getter_p2p_peer_primary_device_type(
DBusMessageIter *iter, DBusError *error, void *user_data); DBusMessageIter *iter, DBusError *error, void *user_data);