Patchwork P2P/DBUS: Cleanup P2PDevice DBUS interface for hostap-1 release

login
register
mail settings
Submitter nirav shah
Date April 10, 2012, 5:48 p.m.
Message ID <1334080094-32545-1-git-send-email-nirav.j2.shah@intel.com>
Download mbox | patch
Permalink /patch/151677/
State Accepted
Commit cca0060f1e67a37b6b490ac8689bb9da7c187dec
Headers show

Comments

nirav shah - April 10, 2012, 5:48 p.m.
This patch cleans up the P2PDevice DBUS 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
---
 wpa_supplicant/dbus/dbus_new.c              |    6 +++---
 wpa_supplicant/dbus/dbus_new_handlers_p2p.c |    8 ++++----
 wpa_supplicant/dbus/dbus_new_handlers_p2p.h |    4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)
Jouni Malinen - April 14, 2012, 6 p.m.
On Tue, Apr 10, 2012 at 10:48:14AM -0700, nirav shah wrote:
> This patch cleans up the P2PDevice DBUS 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.

Thanks, applied.

Patch

diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c
index bd75a60..0c89d14 100644
--- a/wpa_supplicant/dbus/dbus_new.c
+++ b/wpa_supplicant/dbus/dbus_new.c
@@ -2677,9 +2677,9 @@  static const struct wpa_dbus_property_desc wpas_dbus_interface_properties[] = {
 	},
 #endif /* CONFIG_WPS */
 #ifdef CONFIG_P2P
-	{ "P2PDeviceProperties", WPAS_DBUS_NEW_IFACE_P2PDEVICE, "a{sv}",
-	  wpas_dbus_getter_p2p_device_properties,
-	  wpas_dbus_setter_p2p_device_properties
+	{ "P2PDeviceConfig", WPAS_DBUS_NEW_IFACE_P2PDEVICE, "a{sv}",
+	  wpas_dbus_getter_p2p_device_config,
+	  wpas_dbus_setter_p2p_device_config
 	},
 	{ "Peers", WPAS_DBUS_NEW_IFACE_P2PDEVICE, "ao",
 	  wpas_dbus_getter_p2p_peers,
diff --git a/wpa_supplicant/dbus/dbus_new_handlers_p2p.c b/wpa_supplicant/dbus/dbus_new_handlers_p2p.c
index fb89de9..13e9b1d 100644
--- a/wpa_supplicant/dbus/dbus_new_handlers_p2p.c
+++ b/wpa_supplicant/dbus/dbus_new_handlers_p2p.c
@@ -704,7 +704,7 @@  DBusMessage * wpas_dbus_handler_p2p_prov_disc_req(DBusMessage *message,
  * 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,
 						   void *user_data)
 {
@@ -782,7 +782,7 @@  dbus_bool_t wpas_dbus_getter_p2p_device_properties(DBusMessageIter *iter,
 		goto err_no_mem;
 
 	/* 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))
 		goto err_no_mem;
 
@@ -839,7 +839,7 @@  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,
 						   void *user_data)
 {
@@ -927,7 +927,7 @@  dbus_bool_t wpas_dbus_setter_p2p_device_properties(DBusMessageIter *iter,
 			   (entry.type == DBUS_TYPE_UINT32) &&
 			   (entry.uint32_value <= 15))
 			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))
 			wpa_s->conf->persistent_reconnect = entry.bool_value;
 		else if ((os_strcmp(entry.key, "ListenRegClass") == 0) &&
diff --git a/wpa_supplicant/dbus/dbus_new_handlers_p2p.h b/wpa_supplicant/dbus/dbus_new_handlers_p2p.h
index 249f55d..d4a0423 100644
--- a/wpa_supplicant/dbus/dbus_new_handlers_p2p.h
+++ b/wpa_supplicant/dbus/dbus_new_handlers_p2p.h
@@ -94,11 +94,11 @@  DBusMessage *wpas_dbus_handler_p2p_serv_disc_external(
 /*
  * 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,
 						   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,
 						   void *user_data);