From patchwork Fri Feb 21 08:58:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Jain X-Patchwork-Id: 322498 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 ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3EC702C0360 for ; Fri, 21 Feb 2014 19:58:24 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id AAD9E17C014; Fri, 21 Feb 2014 03:58:20 -0500 (EST) 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 IDqA-wRw8ty2; Fri, 21 Feb 2014 03:58:20 -0500 (EST) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 83BDA9C178; Fri, 21 Feb 2014 03:58:14 -0500 (EST) 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 367A39C172 for ; Fri, 21 Feb 2014 03:58:13 -0500 (EST) 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 vTwG7xVazswJ for ; Fri, 21 Feb 2014 03:58:08 -0500 (EST) Received: from mailout2.samsung.com (mailout2.samsung.com [203.254.224.25]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (Client CN "mailout2.samsung.com", Issuer "VeriSign Class 3 Secure Server CA - G3" (not verified)) by maxx.maxx.shmoo.com (Postfix) with ESMTPS id C0D0717C005 for ; Fri, 21 Feb 2014 03:58:07 -0500 (EST) Received: from epcpsbgr1.samsung.com (u141.gpu120.samsung.co.kr [203.254.230.141]) by mailout2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0N1C00AME8WSJW30@mailout2.samsung.com> for hostap@lists.shmoo.com; Fri, 21 Feb 2014 17:58:04 +0900 (KST) Received: from epcpsbgx1.samsung.com ( [172.20.52.124]) by epcpsbgr1.samsung.com (EPCPMTA) with SMTP id 7F.AA.12635.C1517035; Fri, 21 Feb 2014 17:58:04 +0900 (KST) X-AuditID: cbfee68d-b7fcd6d00000315b-33-5307151c01da Received: from epextmailer03 ( [203.254.219.153]) by epcpsbgx1.samsung.com (EPCPMTA) with SMTP id 5D.8C.10103.C1517035; Fri, 21 Feb 2014 17:58:04 +0900 (KST) Message-id: <6D.8C.10103.C1517035@epcpsbgx1.samsung.com> Date: Fri, 21 Feb 2014 08:58:04 +0000 (GMT) From: Rahul Jain Subject: Re: Re: Patch for review To: Jouni Malinen MIME-version: 1.0 X-MTR: 20140221085638166@rahul.jain Msgkey: 20140221085638166@rahul.jain X-EPLocale: en_US.utf-8 X-Priority: 3 X-EPWebmail-Msg-Type: personal X-EPWebmail-Reply-Demand: 0 X-EPApproval-Locale: X-EPHeader: ML X-EPTrCode: X-EPTrName: X-MLAttribute: X-RootMTR: 20140221085638166@rahul.jain X-ParentMTR: X-ArchiveUser: X-CPGSPASS: N Content-type: multipart/mixed; boundary="----=SAMSUNG_mySingle_MIME_MULTIPART_BOUNDARY" X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrJKsWRmVeSWpSXmKPExsWyRsSkRldGlD3Y4PUpY4tFTQ+YHBg9dp/a xxLAGMVlk5Kak1mWWqRvl8CVceXxdqaCxRoV854tZm1g/K3WxcjJISSgKrFn6VJmEFtCwETi x9IHLBC2mMSFe+vZuhi5gGqWMkr8/rydHaZo57J9UIn5jBKr361hAknwClhIPL9zAqibg4MF aOqPVkmQMJuAlsSj261gJcICihLtyxeAzRERkJX4NPE9K4jNLGAqcfjKAmaIgxQkNt//zgYx UlDi5MwnUAcpS+w8dQ5qlYpE74mtUEeLS/xteAR1G6/EjPanUPVyEtO+roGqkZY4P2sDI8xj i78/horzSxy7vYMJ5GSQ3if3g2HG7N78hQ3CFpCYeuYgVKuGxJOHM6BW8UmsWfiWBWbMrlPL mWF672+ZywTxVqTEnRXP2EFBJSFwhkNiy7SXYA0sQEO/TT7EMoFRcRaSN2ch6YGwFSWmdD8E sjmAbE2J9bv00ZXzCjhKXDzZwQRRUiBx5lAaqk4QO1eidV8/+wJGzlWMoqkFyQXFSelFhnrF ibnFpXnpesn5uZsYgeno9L9nvTsYbx+wPsQ4kRHoxInMUqLJ+cCEllcSb2hsZmRhamJqbGRu aUZLYSVx3qSHSUFCAumJJanZqakFqUXxRaU5qcWHGJk4OKUaGF3TbPJYupYKqZfvvpLE+HLD +5qP59d/Xfy7Ncjt/2qfo37+Kn6WO49PufQmeZbBocNS0afuq6et8GG3jlJ+8k3XdCX35zR2 k9smSzuXvwu8YrjVze1/da5gk8EtsSSJz/x1N/55iiqGez2KPDJ//uMZAYs6Z6ipyfht2PRN lG3x7/VTF7tcu6jEUpyRaKjFXFScCAB7J0hdjAMAAA== X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrPJsWRmVeSWpSXmKPExsVy+t/tmboyouzBBldvalksanrA5MDosfvU PpYAxqg0m4zUxJTUIoXUvOT8lMy8dFsl7+B453hTMwNDXUNLC3MlhbzE3FRbJRefAF23zByg qUoKZYk5pUChgMTiYiV9O5ui/NKSVIWM/OISW6VoQ3MjPSMDPVMjPUPTWCtDAwMjU6CahLSM K4+3MxUs1qiY92wxawPjb7UuRk4OIQFViT1LlzKD2BICJhI7l+1jg7DFJC7cWw9kcwHVzGeU WP1uDVMXIwcHC1DDj1ZJkBo2AS2JR7dbmUBsYQFFifblC9hBbBEBWYlPE9+zgtjMAqYSh68s YIbYpSCx+f53sPm8AoISJ2c+YYHYpSyx89Q5Joi4ikTvia1Q94hL/G14xA5h80rMaH8KVS8n Me3rGqgaaYnzszYwwty8+PtjqDi/xLHbO8BOBul9cj8YZszuzV+gXhSQmHrmIFSrhsSThzOg VvFJrFn4lgVmzK5Ty5lheu9vmcsE8VakxJ0Vz9gnMErPQvLNLCQpCFtRYkr3QyCbA8jWlFi/ Sx9dOa+Ao8TFkx1MECUFEmcOpaHqBLFzJVr39bMvYORcxSiaWpBcUJyUXmGoV5yYW1yal66X nJ+7iRGcyp4t3MH45bz1IUYBDkYlHt4TUmzBQqyJZcWVuYcYVYDmPNqw+gKjFEtefl6qkghv 5EOgNG9KYmVValF+fFFpTmrxIcb9jMAonsgsJZqcD0zAeSXxhsYm5qbGphYGhubmZoNHWEmc 9+7NpCAhgfTEktTs1NSC1CKYF5g4OKUaGK9eDT3/z+KFD+uyX55B6w4u86hdKPKG0eLYvfI+ LYXqU3yWbR5Hg2MOPGj1e+Uub2WZeiBS49mThX9Ed+00OzVr0jGWgL7QSev7lKVbNphenn99 1omTeuf/FX66nMktpKJ3O1603VXB590UA847e5VW2nzSj9w8WY1RY61r0Lf3n2ra34UIRymx FGckGmoxFxUnAgDMY2zcEgQAAA== DLP-Filter: Pass X-CFilter-Loop: Reflected Cc: "hostap@lists.shmoo.com" X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.11 Precedence: list Reply-To: rahul.jain@samsung.com List-Id: HostAP Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: hostap-bounces@lists.shmoo.com Errors-To: hostap-bounces@lists.shmoo.com hello Jouni, As requested, I am attaching patch with signed off. == rom 2d330d4b823a8aee9a509af4ea9a696baa8fad57 Mon Sep 17 00:00:00 2001 From: Rahul Jain Date: Thu, 20 Feb 2014 16:34:09 +0530 Subject: [PATCH] Fix for missing eloop_cancel_timeout when p2p invitation is received Signed-off-by: Rahul Jain --- src/p2p/p2p.c | 1 + 1 file changed, 1 insertion(+) The actual change itself looks reasonable, but I would need to receive a patch with Signed-off-by line in the commit message to be able to apply this. Could you please read the CONTRIBUTIONS file(*) and re-send this with the Signed-off-by added as described in that file? Please also note that HTML-only email is discouraged on this mailing list and it would be highly preferred to get a plaintext version. As you can see from the quoted version of the change above, this didn't look very clear in my email reader... :) (*) http://w1.fi/cgit/hostap/tree/CONTRIBUTIONS -- Jouni Malinen PGP id EFC895FA Thanks -Rahul Jain diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index 2ecc547..1e9699e 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -2145,6 +2145,7 @@ p2p_probe_req_rx(struct p2p_data *p2p, const u8 *addr, const u8 *dst, == 0) { /* Received a Probe Request from Invite peer */ p2p_dbg(p2p, "Found Invite peer - try to start Invite from timeout"); + eloop_cancel_timeout(p2p_invite_start, p2p, NULL); eloop_register_timeout(0, 0, p2p_invite_start, p2p, NULL); return P2P_PREQ_PROCESSED; } -- 1.7.9.5 == Thanks -Rahul ------- Original Message ------- Sender : Jouni Malinen Date : Feb 21, 2014 14:12 (GMT+05:30) Title : Re: Patch for review On Fri, Feb 21, 2014 at 03:40:01AM +0000, Rahul Jain wrote: > [PATCH] Fix for missing eloop_cancel_timeout when p2p invitation is received > diff --git a/src/p2p/p2p.c b/src/p2p/p2p.c index 2ecc547..1e9699e 100644 --- a/src/p2p/p2p.c +++ b/src/p2p/p2p.c @@ -2145,6 +2145,7 @@ p2p_probe_req_rx(struct p2p_data *p2p, const u8 *addr, const u8 *dst, == 0) { /* Received a Probe Request from Invite peer */ p2p_dbg(p2p, "Found Invite peer - try to start Invite from timeout"); + eloop_cancel_timeout(p2p_invite_start, p2p, NULL); eloop_register_timeout(0, 0, p2p_invite_start, p2p, NULL); return P2P_PREQ_PROCESSED; }