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

P2P: Cleanup P2PDevice D-Bus interface for hostap-1 release

Browse source 
This patch cleans up the P2PDevice D-Bus interface for the hostap-1
release. A spelling error is corrected and P2PDeviceProperties is
renamed to clarify that this data is configuration data and not the
total collection of Properties for the P2PDevice interface.

Signed-hostap: Nirav Shah <nirav.j2.shah@intel.com>
Signed-hostap: Angie Chinchilla <angie.v.chinchilla@intel.com>
intended-for: hostap-1
This commit is contained in:
Nirav Shah 2012-04-14 20:52:59 +03:00 committed by Jouni Malinen
parent 445335fd86
commit cca0060f1e
3 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
wpa_supplicant/dbus/dbus_new.c
View file

@ -2677,9 +2677,9 @@ static const struct wpa_dbus_property_desc wpas_dbus_interface_properties[] = {
}, },
#endif /* CONFIG_WPS */ #endif /* CONFIG_WPS */
#ifdef CONFIG_P2P #ifdef CONFIG_P2P
{ "P2PDeviceProperties", WPAS_DBUS_NEW_IFACE_P2PDEVICE, "a{sv}", { "P2PDeviceConfig", WPAS_DBUS_NEW_IFACE_P2PDEVICE, "a{sv}",
wpas_dbus_getter_p2p_device_properties, wpas_dbus_getter_p2p_device_config,
wpas_dbus_setter_p2p_device_properties wpas_dbus_setter_p2p_device_config
}, },
{ "Peers", WPAS_DBUS_NEW_IFACE_P2PDEVICE, "ao", { "Peers", WPAS_DBUS_NEW_IFACE_P2PDEVICE, "ao",
wpas_dbus_getter_p2p_peers, wpas_dbus_getter_p2p_peers,

16
wpa_supplicant/dbus/dbus_new_handlers_p2p.c
View file

@ -704,9 +704,9 @@ DBusMessage * wpas_dbus_handler_p2p_prov_disc_req(DBusMessage *message,
* P2P Device property accessor methods. * P2P Device property accessor methods.
*/ */
dbus_bool_t wpas_dbus_getter_p2p_device_properties(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_p2p_device_config(DBusMessageIter *iter,
DBusError *error, DBusError *error,
void *user_data) void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
DBusMessageIter variant_iter, dict_iter; DBusMessageIter variant_iter, dict_iter;
@ -782,7 +782,7 @@ dbus_bool_t wpas_dbus_getter_p2p_device_properties(DBusMessageIter *iter,
goto err_no_mem; goto err_no_mem;
/* Persistent Reconnect */ /* Persistent Reconnect */
if (!wpa_dbus_dict_append_bool(&dict_iter, "PersistantReconnect", if (!wpa_dbus_dict_append_bool(&dict_iter, "PersistentReconnect",
wpa_s->conf->persistent_reconnect)) wpa_s->conf->persistent_reconnect))
goto err_no_mem; goto err_no_mem;
@ -839,9 +839,9 @@ err_no_mem:
} }
dbus_bool_t wpas_dbus_setter_p2p_device_properties(DBusMessageIter *iter, dbus_bool_t wpas_dbus_setter_p2p_device_config(DBusMessageIter *iter,
DBusError *error, DBusError *error,
void *user_data) void *user_data)
{ {
struct wpa_supplicant *wpa_s = user_data; struct wpa_supplicant *wpa_s = user_data;
DBusMessageIter variant_iter, iter_dict; DBusMessageIter variant_iter, iter_dict;
@ -927,7 +927,7 @@ dbus_bool_t wpas_dbus_setter_p2p_device_properties(DBusMessageIter *iter,
(entry.type == DBUS_TYPE_UINT32) && (entry.type == DBUS_TYPE_UINT32) &&
(entry.uint32_value <= 15)) (entry.uint32_value <= 15))
wpa_s->conf->p2p_go_intent = entry.uint32_value; wpa_s->conf->p2p_go_intent = entry.uint32_value;
else if ((os_strcmp(entry.key, "PersistantReconnect") == 0) && else if ((os_strcmp(entry.key, "PersistentReconnect") == 0) &&
(entry.type == DBUS_TYPE_BOOLEAN)) (entry.type == DBUS_TYPE_BOOLEAN))
wpa_s->conf->persistent_reconnect = entry.bool_value; wpa_s->conf->persistent_reconnect = entry.bool_value;
else if ((os_strcmp(entry.key, "ListenRegClass") == 0) && else if ((os_strcmp(entry.key, "ListenRegClass") == 0) &&

12
wpa_supplicant/dbus/dbus_new_handlers_p2p.h
View file

@ -94,13 +94,13 @@ DBusMessage *wpas_dbus_handler_p2p_serv_disc_external(
/* /*
* P2P Device property accessor methods. * P2P Device property accessor methods.
*/ */
dbus_bool_t wpas_dbus_setter_p2p_device_properties(DBusMessageIter *iter, dbus_bool_t wpas_dbus_setter_p2p_device_config(DBusMessageIter *iter,
DBusError *error, DBusError *error,
void *user_data); void *user_data);
dbus_bool_t wpas_dbus_getter_p2p_device_properties(DBusMessageIter *iter, dbus_bool_t wpas_dbus_getter_p2p_device_config(DBusMessageIter *iter,
DBusError *error, DBusError *error,
void *user_data); void *user_data);
dbus_bool_t wpas_dbus_getter_p2p_peers(DBusMessageIter *iter, DBusError *error, dbus_bool_t wpas_dbus_getter_p2p_peers(DBusMessageIter *iter, DBusError *error,
void *user_data); void *user_data);