From patchwork Wed Dec 21 12:24:21 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Avichal Agarwal X-Patchwork-Id: 707789 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2001:1868:205::9]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tkDPq5qxRz9sxS for ; Wed, 21 Dec 2016 23:25:19 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.85_2 #1 (Red Hat Linux)) id 1cJfxD-0003G0-A0; Wed, 21 Dec 2016 12:25:07 +0000 Received: from mailout1.samsung.com ([203.254.224.24]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1cJfx9-0002yX-Tg for hostap@lists.infradead.org; Wed, 21 Dec 2016 12:25:05 +0000 Received: from epcpsbgm2new.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OIJ0298OBT3U5D0@mailout1.samsung.com> for hostap@lists.infradead.org; Wed, 21 Dec 2016 21:24:41 +0900 (KST) X-AuditID: cbfee61b-f79d86d00000197e-8d-585a74890e2f Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id 3B.27.06526.9847A585; Wed, 21 Dec 2016 21:24:41 +0900 (KST) Received: from localhost.localdomain ([107.109.228.191]) by mmp2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0OIJ0063DBSUEQ20@mmp2.samsung.com>; Wed, 21 Dec 2016 21:24:41 +0900 (KST) From: Avichal Agarwal To: hostap@lists.infradead.org Subject: [PATCH 2/6] adding wps manufacturer as property in dbus Date: Wed, 21 Dec 2016 17:54:21 +0530 Message-id: <1482323065-2193-2-git-send-email-avichal.a@samsung.com> X-Mailer: git-send-email 2.7.4 In-reply-to: <1482323065-2193-1-git-send-email-avichal.a@samsung.com> References: <1482323065-2193-1-git-send-email-avichal.a@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrCLMWRmVeSWpSXmKPExsVy+t9jQd3OkqgIg7nbNSzm/NvHbLH2UZrF qqM/WC0OTfjDbHHrRj+LA6vH5iX1Hn1bVjEGMEW52WSkJqakFimk5iXnp2TmpdsqhYa46Voo KeQl5qbaKkXo+oYEKSmUJeaUAnlGBmjAwTnAPVhJ3y7BLWPZ7ma2gnlKFXN/dzM2MP6X6WLk 5JAQMJH4PncmO4QtJnHh3nq2LkYuDiGBWYwS62cuYYFwfjFK3P//lBGkik1AV6LhVxcriC0i ICdx8uUFZpAiZoHJjBIr1j4HKxIWcJD4s3Y9WBGLgKrEtfNzmEBsXgEXiU9Lehkh1slJ3DzX yQxicwq4Sjy70MACYgsB1UxcOJ99AiPvAkaGVYwSqQXJBcVJ6blGeanlesWJucWleel6yfm5 mxjBIfpMegfj4V3uhxgFOBiVeHgdMiIjhFgTy4orcw8xSnAwK4nwRudGRQjxpiRWVqUW5ccX leakFh9iNAU6bCKzlGhyPjB+8kriDU3MTcyNDSzMLS1NjJTEeRtnPwsXEkhPLEnNTk0tSC2C 6WPi4JRqABr8efYXLp8cp9f5Mgx5xukiCvqTI9o/+OSq9ao9nzu5qjd1bTFT5IMvljUvlrcz 63L2bsw4+cexX09YuP3+a0923aAbt3meLBfRso3+ulCrPEnhvPsTZb9fS5viPFbpJxatLpjx ZUXXiYVr7a73p4vsZjuvp/XOQNzMNWGNhNFqS+OJR/SUWIozEg21mIuKEwEMNPvIZwIAAA== X-MTR: 20000000000000000@CPGS X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20161221_042504_160135_E38D8373 X-CRM114-Status: GOOD ( 12.28 ) X-Spam-Score: -8.3 (--------) X-Spam-Report: SpamAssassin version 3.4.0 on bombadil.infradead.org summary: Content analysis details: (-8.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.24 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -1.4 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Mayank Haarit , Avichal Agarwal , sachin.dev@samsung.com, Kyeong-Chae Lim MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Signed-off-by: Avichal Agarwal Signed-off-by: Kyeong-Chae Lim Signed-off-by: Mayank Haarit --- wpa_supplicant/dbus/dbus_new.c | 6 +++ wpa_supplicant/dbus/dbus_new_handlers.h | 2 + wpa_supplicant/dbus/dbus_new_handlers_wps.c | 61 ++++++++++++++++++++++++++++- 3 files changed, 68 insertions(+), 1 deletion(-) diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c index 9113dd4..055a86d 100644 --- a/wpa_supplicant/dbus/dbus_new.c +++ b/wpa_supplicant/dbus/dbus_new.c @@ -3240,6 +3240,12 @@ static const struct wpa_dbus_property_desc wpas_dbus_interface_properties[] = { wpas_dbus_setter_wps_device_name, NULL }, + { + "Manufacturer" ,WPAS_DBUS_NEW_IFACE_WPS, "s" , + wpas_dbus_getter_wps_manufacturer, + wpas_dbus_setter_wps_manufacturer, + NULL + }, #endif /* CONFIG_WPS */ #ifdef CONFIG_P2P { "P2PDeviceConfig", WPAS_DBUS_NEW_IFACE_P2PDEVICE, "a{sv}", diff --git a/wpa_supplicant/dbus/dbus_new_handlers.h b/wpa_supplicant/dbus/dbus_new_handlers.h index 935cd8c..a12f483 100644 --- a/wpa_supplicant/dbus/dbus_new_handlers.h +++ b/wpa_supplicant/dbus/dbus_new_handlers.h @@ -188,6 +188,8 @@ DECLARE_ACCESSOR(wpas_dbus_getter_config_methods); DECLARE_ACCESSOR(wpas_dbus_setter_config_methods); DECLARE_ACCESSOR(wpas_dbus_getter_wps_device_name); DECLARE_ACCESSOR(wpas_dbus_setter_wps_device_name); +DECLARE_ACCESSOR(wpas_dbus_getter_wps_manufacturer); +DECLARE_ACCESSOR(wpas_dbus_setter_wps_manufacturer); DBusMessage * wpas_dbus_handler_tdls_discover(DBusMessage *message, struct wpa_supplicant *wpa_s); diff --git a/wpa_supplicant/dbus/dbus_new_handlers_wps.c b/wpa_supplicant/dbus/dbus_new_handlers_wps.c index ff36788..1fe176e 100644 --- a/wpa_supplicant/dbus/dbus_new_handlers_wps.c +++ b/wpa_supplicant/dbus/dbus_new_handlers_wps.c @@ -457,6 +457,66 @@ dbus_bool_t wpas_dbus_getter_wps_device_name( } /** + * wpas_dbus_setter_wps_manufacturer - Get current manufacturer name + * @iter: Pointer to incoming dbus message iter + * @error: Location to store error on failure + * @user_data: Function specific data + * Returns: TRUE on success, FALSE on failure + * + * Setter for "Manufacturer" property. Returned boolean will be true if + * providing the relevant string worked, or false otherwise. + */ +dbus_bool_t wpas_dbus_setter_wps_manufacturer( + const struct wpa_dbus_property_desc *property_desc, + DBusMessageIter *iter, DBusError *error, void *user_data) +{ + struct wpa_supplicant *wpa_s = user_data; + char *methods; + char *devname; + + if (!wpas_dbus_simple_property_setter(iter, error, DBUS_TYPE_STRING, + &methods)) + return FALSE; + + if(os_strlen(methods) > 64) + return FALSE; + + devname = os_strdup(methods); + if (!devname) + return FALSE; + + os_free(wpa_s->conf->manufacturer); + wpa_s->conf->manufacturer = devname; + wpa_s->conf->changed_parameters |= CFG_CHANGED_WPS_STRING; + wpa_supplicant_update_config(wpa_s); + + return TRUE; +} + +/** + * wpas_dbus_getter_wps_manufacturer - Get current manufacturer name + * @iter: Pointer to incoming dbus message iter + * @error: Location to store error on failure + * @user_data: Function specific data + * Returns: TRUE on success, FALSE on failure + * + * Getter for "Manufacturer" property. Returned boolean will be true if + * providing the relevant string worked, or false otherwise. + */ +dbus_bool_t wpas_dbus_getter_wps_manufacturer( + const struct wpa_dbus_property_desc *property_desc, + DBusMessageIter *iter, DBusError *error, void *user_data) +{ + struct wpa_supplicant *wpa_s = user_data; + char *manufacturer = wpa_s->conf->manufacturer; + + if (manufacturer == NULL) + manufacturer = ""; + return wpas_dbus_simple_property_getter(iter, DBUS_TYPE_STRING, + &manufacturer, error); +} + +/** * wpas_dbus_getter_config_methods - Get current WPS configuration methods * @iter: Pointer to incoming dbus message iter * @error: Location to store error on failure @@ -479,7 +539,6 @@ dbus_bool_t wpas_dbus_getter_config_methods( &methods, error); } - /** * wpas_dbus_setter_config_methods - Set WPS configuration methods * @iter: Pointer to incoming dbus message iter