From patchwork Tue Apr 10 17:48:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: nirav shah X-Patchwork-Id: 151677 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from maxx.maxx.shmoo.com (maxx.shmoo.com [205.134.188.171]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "maxx.shmoo.com", Issuer "CA Cert Signing Authority" (not verified)) by ozlabs.org (Postfix) with ESMTPS id 2CB73B7051 for ; Wed, 11 Apr 2012 03:49:51 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 072049C1BE; Tue, 10 Apr 2012 13:49:49 -0400 (EDT) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8gqU1LaDB6zc; Tue, 10 Apr 2012 13:49:48 -0400 (EDT) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id D71429C1BF; Tue, 10 Apr 2012 13:49:44 -0400 (EDT) X-Original-To: mailman-post+hostap@maxx.shmoo.com Delivered-To: mailman-post+hostap@maxx.shmoo.com Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 001049C1BF for ; Tue, 10 Apr 2012 13:49:42 -0400 (EDT) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Fg3ifaxFn2oF for ; Tue, 10 Apr 2012 13:49:39 -0400 (EDT) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 2AF5C9C1BE for ; Tue, 10 Apr 2012 13:49:39 -0400 (EDT) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 10 Apr 2012 10:49:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.71,315,1320652800"; d="scan'208";a="140063691" Received: from nirav-z68a-d3h-b3.hf.intel.com ([10.10.69.83]) by fmsmga001.fm.intel.com with ESMTP; 10 Apr 2012 10:49:27 -0700 From: nirav shah To: hostap@lists.shmoo.com Subject: [PATCH] P2P/DBUS: Cleanup P2PDevice DBUS interface for hostap-1 release Date: Tue, 10 Apr 2012 10:48:14 -0700 Message-Id: <1334080094-32545-1-git-send-email-nirav.j2.shah@intel.com> X-Mailer: git-send-email 1.7.5.4 X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.9 Precedence: list List-Id: HostAP Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: hostap-bounces@lists.shmoo.com Errors-To: hostap-bounces@lists.shmoo.com 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 Signed-hostap: Angie Chinchilla 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(-) 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);