From patchwork Tue Jul 5 09:41:45 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nishant Chaprana X-Patchwork-Id: 644675 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 3rkJpj2xPGz9sBl for ; Tue, 5 Jul 2016 19:43:09 +1000 (AEST) 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 1bKMsJ-0008Nu-84; Tue, 05 Jul 2016 09:42:39 +0000 Received: from mailout2.samsung.com ([203.254.224.25]) by bombadil.infradead.org with esmtps (Exim 4.85_2 #1 (Red Hat Linux)) id 1bKMsG-0008LR-DU for hostap@lists.infradead.org; Tue, 05 Jul 2016 09:42:37 +0000 Received: from epcpsbgr2.samsung.com (u142.gpu120.samsung.co.kr [203.254.230.142]) by mailout2.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0O9U02LYH5MCKK50@mailout2.samsung.com> for hostap@lists.infradead.org; Tue, 05 Jul 2016 18:42:12 +0900 (KST) Received: from epcpsbgm2new.samsung.com ( [172.20.52.124]) by epcpsbgr2.samsung.com (EPCPMTA) with SMTP id 58.C2.05160.4F08B775; Tue, 5 Jul 2016 18:42:12 +0900 (KST) X-AuditID: cbfee68e-f79266d000001428-76-577b80f444ec Received: from epmmp1.local.host ( [203.254.227.16]) by epcpsbgm2new.samsung.com (EPCPMTA) with SMTP id A3.5D.04429.4F08B775; Tue, 5 Jul 2016 02:42:12 -0700 (MST) Received: from localhost.localdomain ([107.109.228.78]) by mmp1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0O9U0068X5LQNE60@mmp1.samsung.com>; Tue, 05 Jul 2016 18:42:12 +0900 (KST) From: Nishant Chaprana To: hostap@lists.infradead.org Subject: [PATCH] P2Ps: When peer has stopped sending adv_service_instance then we should clear existing dev->info.p2ps_instance. Date: Tue, 05 Jul 2016 15:11:45 +0530 Message-id: <1467711705-30402-1-git-send-email-n.chaprana@samsung.com> X-Mailer: git-send-email 1.9.1 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrILMWRmVeSWpSXmKPExsWyRsSkRvdLQ3W4wbpNohZrH6VZbF2yn8ni 1o1+Fgdmj81L6j36tqxiDGCK4rJJSc3JLEst0rdL4Mo4vH0Pe8F0zoolrRPZGhivsXcxcnJI CJhIbN5ykBnCFpO4cG89WxcjF4eQwApGiXUvX7LBFK2/0cYEkVjKKPH90zIo5yejxIdX38BG sQnoSzztOs8CYosIyEmcfHkBbCyzgKvEgXdzWUAahAWaGCWezrjACpJgEVCVuH7iGBOIzSvg JrGy7yUTxDqg5mOTWUEaJATOsEmcnv2ODaJBQOLb5ENAkziAErISmw5A3S0pcXDFDZYJjIIL GBlWMYqmFiQXFCelFxnpFSfmFpfmpesl5+duYgSG3Ol/z/p2MN48YH2IUYCDUYmH1yGsOlyI NbGsuDL3EKMp0IaJzFKiyfnAwM4riTc0NjOyMDUxNTYytzRTEudNkPoZLCSQnliSmp2aWpBa FF9UmpNafIiRiYNTqoEx0C52b0pAaJHR3DtxXCsCojJfWs47/sbMVbMoLbv9a12r/tu2bMXF tWm+rB+y38y7ntnak5IS/TCSTaTarnPfw/7oT3cNjl64VcL27Mk5yy0n5r24NWeHwTzXOBnL P2fkHjnvZvaUsd5dHCi2KOFiL0vtWoEnTTHSswzeOFw9e3S1XDRbSJ4SS3FGoqEWc1FxIgBQ spRINAIAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrHLMWRmVeSWpSXmKPExsVy+t9jAd0vDdXhBq2fuC3WPkqz2LpkP5PF rRv9LA7MHpuX1Hv0bVnFGMAU1cBok5GamJJapJCal5yfkpmXbqvkHRzvHG9qZmCoa2hpYa6k kJeYm2qr5OIToOuWmQO0Q0mhLDGnFCgUkFhcrKRvh2lCaIibrgVMY4Sub0gQXI+RARpIWMOY cXj7HvaC6ZwVS1onsjUwXmPvYuTkkBAwkVh/o40JwhaTuHBvPVsXIxeHkMBSRonvn5YxQTg/ GSU+vPoG1sEmoC/xtOs8C4gtIiAncfLlBWYQm1nAVeLAu7ksIA3CAk2MEk9nXGAFSbAIqEpc P3EMbAWvgJvEyr6XUOuAmo9NZp3AyL2AkWEVo0RqQXJBcVJ6rlFearlecWJucWleul5yfu4m RnBYP5PewXh4l/shRgEORiUeXoX3VeFCrIllxZW5hxglOJiVRHj1aqvDhXhTEiurUovy44tK c1KLDzGaAh0wkVlKNDkfGHN5JfGGxibmpsamliYWJmaWSuK8j/+vCxMSSE8sSc1OTS1ILYLp Y+LglGpgrGLwyvoRdDbrZqLIn0/pVkz6G6YsfHddfhbXobL/bXf1Zp9Y89y4ZWWPeW5C+Orb BeFHtdmZv8Y9rgvaLnqzTNL+lVG+rrHRyiU8h1d8Kp3W5MycVcF7IX1eaeG677yBHC4fljRc 7uXdWhwysfxOhNWST8+Xi+//q5B05bKeDmOXnlDMjUAfJZbijERDLeai4kQAKWpFroECAAA= DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20160705_024236_613873_AE4152A0 X-CRM114-Status: UNSURE ( 8.56 ) X-CRM114-Notice: Please train this message. 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.25 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3) [203.254.224.25 listed in wl.mailspike.net] -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] -0.0 RCVD_IN_MSPIKE_WL Mailspike good senders 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: Nishant Chaprana , sachin.dev@samsung.com MIME-Version: 1.0 Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org This patch fixes below scenario: When peer device stops sending adv_service_instance, supplicant does not remove old dev->info.p2ps_instance from device's property. This variable should be updated as per peer behaviour and should cleared when peer stops sending this information. Signed-off-by: Nishant Chaprana --- src/p2p/p2p.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index 47abe21..8fa447f 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -788,11 +788,11 @@ int p2p_add_device(struct p2p_data *p2p, const u8 *addr, int freq, dev->oper_ssid_len = msg.ssid[1]; } - if (msg.adv_service_instance && msg.adv_service_instance_len) { - wpabuf_free(dev->info.p2ps_instance); + wpabuf_free(dev->info.p2ps_instance); + dev->info.p2ps_instance = NULL; + if (msg.adv_service_instance && msg.adv_service_instance_len) dev->info.p2ps_instance = wpabuf_alloc_copy( msg.adv_service_instance, msg.adv_service_instance_len); - } if (freq >= 2412 && freq <= 2484 && msg.ds_params && *msg.ds_params >= 1 && *msg.ds_params <= 14) {