From patchwork Thu Apr 13 12:09:01 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishant Chaprana X-Patchwork-Id: 750419 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3w3fkC2smCz9sCZ for ; Thu, 13 Apr 2017 22:10:11 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="mRVAg5o1"; dkim-atps=neutral DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-reply-to:Message-id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=gHGUiuZ4yJYy65xigRuuFTkGFx0486bUxDVSNeuFXgE=; b=mRVAg5o1mUaWc3GtDwpHyWnkLg H86enRyXeH0+Ma+Zj1KEUtfSK3sbW9Mrib+Odn5lzKp9c3/BOMbR54BSjpgjJbk2URD4V8uqxoEbI TCrix7fZGqvY4myAidBxJxnh+hruVsD6YaVCVXPhgPbdbaIqOJraFIJxI87nwbVcSVVB0DfDFYf4I dqe/LczMtDBNpi56NdPlZNT9cRQvK9PPKH5Q3SZbJWzsJmJsEL52Lz7jTkJxQmDXmn5tpTHlDqYRw T2hfQOrCRJ8tWxHdc7M4zOhJivDibpM6BX+rno5U0h27FzhCnaUfGOjwuyl0h90JE6lnkgxLpNGIq UL5K8EIg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.87 #1 (Red Hat Linux)) id 1cydZh-0000Sp-Tt; Thu, 13 Apr 2017 12:10:09 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by bombadil.infradead.org with esmtps (Exim 4.87 #1 (Red Hat Linux)) id 1cydZH-0007qG-Jl for hostap@lists.infradead.org; Thu, 13 Apr 2017 12:09:45 +0000 Received: from epcas2p4.samsung.com (unknown [182.195.41.56]) by mailout3.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0OOC00BDRKFLHTC0@mailout3.samsung.com> for hostap@lists.infradead.org; Thu, 13 Apr 2017 21:09:21 +0900 (KST) Received: from epsmges5p2.samsung.com (unknown [182.195.40.75]) by epcas2p2.samsung.com (KnoxPortal) with ESMTP id 20170413120921epcas2p2595334866b6e23d654c471f86c72b3cc~087sG-J6f1243812438epcas2p2E; Thu, 13 Apr 2017 12:09:21 +0000 (GMT) Received: from epcas5p2.samsung.com ( [182.195.41.40]) by epsmges5p2.samsung.com (EPCPMTA) with SMTP id 3C.69.21921.17A6FE85; Thu, 13 Apr 2017 21:09:21 +0900 (KST) Received: from epsmtrp2.samsung.com (unknown [182.195.40.14]) by epcas5p3.samsung.com (KnoxPortal) with ESMTPA id 20170413120920epcas5p36bc9d81dfb70a9730d4347ca674e5cbc~087rlGDb52967329673epcas5p3y; Thu, 13 Apr 2017 12:09:20 +0000 (GMT) Received: from epsmgmsp1.samsung.com (unknown [182.195.42.97]) by epsmtrp2.samsung.com (KnoxPortal) with ESMTP id 20170413120920epsmtrp24d9b034b8ce68bbf78d72df0f9ce8c2f~087rkZQ0u2787327873epsmtrp26; Thu, 13 Apr 2017 12:09:20 +0000 (GMT) X-AuditID: b6c32a2d-f792a6d0000055a1-0e-58ef6a71764a Received: from epsmtip1.samsung.com ( [182.195.34.30]) by epsmgmsp1.samsung.com (Symantec Messaging Gateway) with SMTP id FE.A1.26772.C4A6FE85; Thu, 13 Apr 2017 21:08:44 +0900 (KST) Received: from nishant-ubuntu.sa.corp.samsungelectronics.net (unknown [107.109.228.78]) by epsmtip1.samsung.com (KnoxPortal) with ESMTPA id 20170413120919epsmtip15a5d4902fe6f44e4b79909d99a45b426~087qyY6VF0987609876epsmtip1d; Thu, 13 Apr 2017 12:09:19 +0000 (GMT) From: Nishant Chaprana To: hostap@lists.infradead.org Subject: [PATCH 2/2] TDLS: Added dbus method to disable channel switching with TDLS peer Date: Thu, 13 Apr 2017 17:39:01 +0530 Message-id: <1492085341-7930-2-git-send-email-n.chaprana@samsung.com> X-Mailer: git-send-email 1.9.1 In-reply-to: <1492085341-7930-1-git-send-email-n.chaprana@samsung.com> X-Brightmail-Tracker: H4sIAAAAAAAAA0VSe0hTcRj1d+82r9HkNs2+jGRcispwesem0zKLTIQihECWGuumv5y5V7ub jyC0DNFpqeUfvSQTMzPEHiqlWLbCRwWFRtlLzIyRoj0MH/lPd16l/853vnM4h4+PIhXvpMFU lsWB7RbOxMhWSNqfbtkcdvzYD33EqQlfXfPoUV1b/WNC92GoQrKTTLxfX5B4rrUJJREpeLsR cxnYrsSWdGtGliUzltl7wLDboI2MYMPYaF0Uo7RwZhzLxO9LCkvIMgkRjDKHMzkFKonjeSZ8 x3a71enASqOVd8QyqSyrVrERUSq1Wq3SaA/FqLWC5DA2Fs31Eba/kPdkogIVotlAF/KjgNbA cPcTqYiD4PVwi8yFVlAK+gaCgf5uwrtQ0L8RjHkc4kLAIwOffJfdhc/uEuLiIYKf368tDeUE jDQ0ybwqGR0O31yvJF4cSIdA//fXpBeT9B7onqpZ5APoFHh/8fOiXkJvhKvn3Iu8XNCc7usk xDTB23NB6EpRfnQClFUle7OAnpRCZ3O5TNTEg3umB4k4AMZ7W5eaBsP0VJdMNJQhGGzsReJQ jaDn14ulC8RBcU+nxJtA0lugpSNcpGOh6/q0r5cG2h+GJleJ/f3h7MLYUrcNUPr1ilSUyKGk WCHSiTDdfI0U8S4Yr7tJive5hGBhoZqoRMrL/8NqEWpCQdjGmzMxr7WpVTxn5p2WTFW61XwP LT5VaNgD9Kd2rxvRFGJWyvvWT+kVUi6Hzze7EVAkEyhvwT/0CnkGl38C260Gu9OEeTfSClet IoNXp1uFF7U4DKwmOkKjjdRqolidllkj33TrrV5BZ3IOnI2xDduXfQTlF1yI2mJyQwt94rae in/Zy+hmIfcN4bq1e34wZ/B6g+TOupLnfh9laeZHJtOR+bna86Nffq0tJWo2TJd6hsmO+QnZ WGpce0GaxnCy0ie7KNr4yJNc19etT3H2lx3d5jrjSZ0p3j+WICkZiCo5aAi5fMUWeZtP9jTi RDZ1fe+OvNaZKUbCGzk2lLTz3D+MH35magMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFmpnluLIzCtJLcpLzFFi42LZdlhJTtcn632EwYTHAhZrH6VZbF2yn8ni 1o1+Fgdmj81L6j36tqxiDGCK4rJJSc3JLEst0rdL4Mpo/nGCqeCXRMXB1/2MDYzfRboYOTkk BEwkGo5sZIKwxSQu3FvP1sXIxSEksJ1RYlrXFDaIhJrE9YM3mCFsYYmV/56zQxR1MUnMfH8O rJtNQF/iadd5FhBbREBO4uTLC2ANzALuEr87P4ANEhaIkHg3+QAjiM0ioCoxp+8QWD2vgKtE 04ndUFcA9R6bzNrFyMHBKeAm0T0xDCQsBFSy/ecDpgmM/AsYGVYxiqYWFOem5xYXGOoVJ+YW l+al6yXn525iBAePVuIOxnUzwg8xCnAwKvHwRsx5FyHEmlhWXJl7iFGCg1lJhHd96vsIId6U xMqq1KL8+KLSnNTiQ4zSHCxK4ry3qjdECAmkJ5akZqemFqQWwWSZODilGhjZV3Kt+MToH7DH zXv/l5zL019d8irgyuqbWMQ949naSTMWV3xadeR7eH1cj5Ld+oalItHmk15trMid5LHrc32Y gH0p67NNPlmhQl5VdbaH3u0XCvt5a835z/6ny4WS1/ze+qrR5ZLqsWfiv1b0/8wyuFX/hd/K 110zX9Qycy1TzszGqO1sWppKLMUZiYZazEXFiQCQMWw8GgIAAA== X-CMS-MailID: 20170413120920epcas5p36bc9d81dfb70a9730d4347ca674e5cbc X-Msg-Generator: CA X-Sender-IP: 182.195.40.14 X-Local-Sender: =?UTF-8?B?TmlzaGFudCBDaGFwcmFuYRtTUkktRGVsaGktQWR2YW5jZWQg?= =?UTF-8?B?U1cgVGVhbRvsgrzshLHsoITsnpAbTGVhZCBFbmdpbmVlcg==?= X-Global-Sender: =?UTF-8?B?TmlzaGFudCBDaGFwcmFuYRtTUkktRGVsaGktQWR2YW5jZWQg?= =?UTF-8?B?U1cgVGVhbRtTYW1zdW5nIEVsZWN0cm9uaWNzG0xlYWQgRW5naW5lZXI=?= X-Sender-Code: =?UTF-8?B?QzEwG1NXQUhRG0MxMElEMDJJRDAyODExMQ==?= X-MTR: 20170413120920epcas5p36bc9d81dfb70a9730d4347ca674e5cbc X-EPHeader: CA CMS-TYPE: 105P DLP-Filter: Pass X-CFilter-Loop: Reflected X-Auth-Email: n.chaprana@samsung.com X-HopCount: 7 X-CMS-RootMailID: 20170413120920epcas5p36bc9d81dfb70a9730d4347ca674e5cbc X-RootMTR: 20170413120920epcas5p36bc9d81dfb70a9730d4347ca674e5cbc References: <1492085341-7930-1-git-send-email-n.chaprana@samsung.com> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20170413_050943_800477_D84D058C X-CRM114-Status: UNSURE ( 9.78 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -6.9 (------) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-6.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.33 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.0 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.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Nishant Chaprana , sachin.dev@samsung.com MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Description: This patch adds "TDLSCancelChannelSwitch" dbus method on "fi.w1.wpa_supplicant1.Interface" interface to enable channel switching with TDLS peer. Signed-off-by: Nishant Chaprana --- wpa_supplicant/dbus/dbus_new.c | 7 +++++++ wpa_supplicant/dbus/dbus_new_handlers.c | 29 +++++++++++++++++++++++++++++ wpa_supplicant/dbus/dbus_new_handlers.h | 2 ++ 3 files changed, 38 insertions(+) diff --git a/wpa_supplicant/dbus/dbus_new.c b/wpa_supplicant/dbus/dbus_new.c index 0dce09e..a234a9a 100644 --- a/wpa_supplicant/dbus/dbus_new.c +++ b/wpa_supplicant/dbus/dbus_new.c @@ -3093,6 +3093,13 @@ static const struct wpa_dbus_method_desc wpas_dbus_interface_methods[] = { END_ARGS } }, + { "TDLSCancelChannelSwitch", WPAS_DBUS_NEW_IFACE_INTERFACE, + (WPADBusMethodHandler) wpas_dbus_handler_tdls_cancel_channel_switch, + { + { "peer_address", "s", ARG_IN }, + END_ARGS + } + }, #endif /* CONFIG_TDLS */ { "VendorElemAdd", WPAS_DBUS_NEW_IFACE_INTERFACE, (WPADBusMethodHandler) wpas_dbus_handler_vendor_elem_add, diff --git a/wpa_supplicant/dbus/dbus_new_handlers.c b/wpa_supplicant/dbus/dbus_new_handlers.c index 9092e7a..74f0fbe 100644 --- a/wpa_supplicant/dbus/dbus_new_handlers.c +++ b/wpa_supplicant/dbus/dbus_new_handlers.c @@ -2422,6 +2422,35 @@ DBusMessage * wpas_dbus_handler_tdls_channel_switch(DBusMessage *message, return NULL; } +/* + * wpas_dbus_handler_tdls_cancel_channel_switch - Disable channel switching with TDLS peer + * @message: Pointer to incoming dbus message + * @wpa_s: wpa_supplicant structure for a network interface + * Returns: NULL indicating success or DBus error message on failure + * + * Handler function for "TDLSCancelChannelSwitch" method call of network interface. + */ +DBusMessage * wpas_dbus_handler_tdls_cancel_channel_switch(DBusMessage *message, + struct wpa_supplicant *wpa_s) +{ + u8 peer[ETH_ALEN]; + DBusMessage *error_reply; + int ret; + + if (get_peer_hwaddr_helper(message, __func__, peer, &error_reply) < 0) + return error_reply; + + wpa_printf(MSG_DEBUG, "DBUS TDLS_CANCEL_CHAN_SWITCH " MACSTR, + MAC2STR(peer)); + + ret = wpa_tdls_disable_chan_switch(wpa_s->wpa, peer); + if (ret) + return wpas_dbus_error_unknown_error( + message, "error canceling TDLS channel switch"); + + return NULL; +} + #endif /* CONFIG_TDLS */ diff --git a/wpa_supplicant/dbus/dbus_new_handlers.h b/wpa_supplicant/dbus/dbus_new_handlers.h index 3987c07..cc5f19a 100644 --- a/wpa_supplicant/dbus/dbus_new_handlers.h +++ b/wpa_supplicant/dbus/dbus_new_handlers.h @@ -215,6 +215,8 @@ DBusMessage * wpas_dbus_handler_tdls_teardown(DBusMessage *message, struct wpa_supplicant *wpa_s); DBusMessage * wpas_dbus_handler_tdls_channel_switch(DBusMessage *message, struct wpa_supplicant *wpa_s); +DBusMessage * wpas_dbus_handler_tdls_cancel_channel_switch(DBusMessage *message, + struct wpa_supplicant *wpa_s); DBusMessage * wpas_dbus_handler_vendor_elem_add(DBusMessage *message, struct wpa_supplicant *wpa_s);