From patchwork Tue Sep 3 14:20:28 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bilal Hatipoglu X-Patchwork-Id: 1157037 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=airties.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="OiZo1PVK"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=airties.onmicrosoft.com header.i=@airties.onmicrosoft.com header.b="iava+Rnm"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46N8Hs1GLQz9s7T for ; Wed, 4 Sep 2019 00:20:41 +1000 (AEST) 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:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:Date:Subject:To :From:Reply-To:Cc:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=rV9GlBpvrh5ePIFKeUIlL7o/djLt8rj8VAEz6xJuGc4=; b=OiZo1PVKRPH/4P NtVLI285iFW3673oPPAD9CSowuYNFufc/fWZ95jo84XCFkmngEaAwrJC6EZEBt5O9lfej+pcdKYpC vw4K8LU+OoRvMs4iw7A+tFlDgq0wNQIzRjisPMEfxrSfJBmcuHxZwjwouAbQ92c2MUrztITU+eNBb /iULAXUiHQiV5YbHx/OSvYQPLJVpgzeNxo0Und/zcmCSdmJ+Yau5QsX1lYAMBM/6iF0ECUgcE5JQW 4pW2KU2rEmFBlR2q6vv7g5NGB37UcxZsmVT/i1497KDohtDIK8p4w9XvqOEAZ8coNdcfyrgf41AiA co0o6KSgZ/s3mblnf+Og==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux)) id 1i59fi-00030O-Je; Tue, 03 Sep 2019 14:20:38 +0000 Received: from cluster-e.mailcontrol.com ([85.115.58.190]) by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux)) id 1i59ff-0002zB-3q for hostap@lists.infradead.org; Tue, 03 Sep 2019 14:20:36 +0000 Received: from airtiesesg.westeurope.cloudapp.azure.com (esg.airties.com [13.94.148.158]) by rly61e.srv.mailcontrol.com (MailControl) with ESMTPS id x83EKULf036317 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Tue, 3 Sep 2019 15:20:30 +0100 Received: from EUR02-VE1-obe.outbound.protection.outlook.com (unknown [104.47.6.59]) by Forcepoint Email with ESMTPS id 984A1AE044C76 for ; Tue, 3 Sep 2019 16:48:56 +0300 (AST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=cfOVV8oCc41ThCMYAOZfHZusy9aFxRXrp/1o87d0NYRUszOir/s5ytv9ZG/URVYbt59fINB/sJVks0gUSbKc0+cMeeNK57uhQE3B6X2qONkNuDBAXVt9W26qALiWT10v1h/XQDoU65+G5g6UMq++iFcdYct1n0WML6dDeNQNeR8FMgicfsBv/nFwKej+jp4ezlBGYKcjSv5zu6WMoDM1xiqz70XIr1bcq4CmHvyNjZbDBZlAQvYIPOJSWHBI3z21WZtTWVZ1XTMu3t//sXD1nNV5CDPOrBqcRWJHMsM9efdMkGZQ/MVXP9Nq7Psj72wDgwWMK5aTmeIIY/iDL36qng== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2F23ScSa78IS/MbGH1v1P/IbjWdLQ6apEbNYfTFvWdU=; b=Xx1jEddG4D2SqbVzHUDerCQpAKaQQgYiDeJKCzVts1tGv7mO7ROFTReAZK+anpSz5LqJ/+cOPmbJJZGZMIfeKDPgtR7DtOXNp2wYaaUgZ9q0qetAMPulOc64tB2A6bsUmflTGHJBN/+bJSZzMh6IEhLl/5TJobd3p4LLzwvcJy4RMtNuKTixNguzfPgK6lVXodYclK79a/pn3sL5VOFVwjDCrJYgrDKTAtwzXBQmITC6tsh/QbDfxOfi/1URqzCbep2vW1XSgnrI/2FzPj2x7BBuDhv5SFJ+y2ZZ76igDmq1Kpz6t8IQMfssz6dSorY6i0GRGzwZORqrNGNqR04bzA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=airties.com; dmarc=pass action=none header.from=airties.com; dkim=pass header.d=airties.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=airties.onmicrosoft.com; s=selector2-airties-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=2F23ScSa78IS/MbGH1v1P/IbjWdLQ6apEbNYfTFvWdU=; b=iava+RnmNh/2YrZLADzCR1jazeJtkHqr6SSNoJTLHCqClKJcKpN6bQ9/YenGv7Mj9eAhNoJmC+shOGtMxznph6RjM87NdP/KTpXf6RhoAE+prB6zOboAbyb+SYcSIAkdRH/mU9gsYZJBbO3PQT+mkYSMgXAejb9a8IPt784nVik= Received: from AM6PR10MB2310.EURPRD10.PROD.OUTLOOK.COM (20.177.113.75) by AM6PR10MB2741.EURPRD10.PROD.OUTLOOK.COM (20.179.0.147) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2220.19; Tue, 3 Sep 2019 14:20:28 +0000 Received: from AM6PR10MB2310.EURPRD10.PROD.OUTLOOK.COM ([fe80::1cb:7112:7cf9:539d]) by AM6PR10MB2310.EURPRD10.PROD.OUTLOOK.COM ([fe80::1cb:7112:7cf9:539d%6]) with mapi id 15.20.2220.021; Tue, 3 Sep 2019 14:20:28 +0000 From: Bilal Hatipoglu To: "hostap@lists.infradead.org" Subject: [PATCH v2] Implement wps-pin-active and wps-cancel events Thread-Topic: [PATCH v2] Implement wps-pin-active and wps-cancel events Thread-Index: AQHVYmK8CX8hnLRmsUKr9IJk0+YTPw== Date: Tue, 3 Sep 2019 14:20:28 +0000 Message-ID: <1567520411-24933-1-git-send-email-bilal.hatipoglu@airties.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-mailer: git-send-email 2.7.4 x-clientproxiedby: PR0P264CA0163.FRAP264.PROD.OUTLOOK.COM (2603:10a6:100:1b::31) To AM6PR10MB2310.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:20b:45::11) authentication-results: spf=none (sender IP is ) smtp.mailfrom=bilal.hatipoglu@airties.com; x-ms-exchange-messagesentrepresentingtype: 1 x-originating-ip: [91.220.65.2] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 94db0c5a-bf79-4768-cd5d-08d73079ded3 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600166)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:AM6PR10MB2741; x-ms-traffictypediagnostic: AM6PR10MB2741: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:2043; x-forefront-prvs: 01494FA7F7 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(136003)(376002)(366004)(396003)(346002)(39850400004)(199004)(189003)(2351001)(2616005)(486006)(6436002)(44832011)(8676002)(53936002)(102836004)(478600001)(36756003)(81166006)(81156014)(476003)(1730700003)(71190400001)(71200400001)(14454004)(25786009)(2501003)(6512007)(86362001)(386003)(66556008)(64756008)(66946007)(66066001)(186003)(26005)(50226002)(6486002)(66446008)(7736002)(5640700003)(6306002)(3846002)(6506007)(99286004)(52116002)(8936002)(2906002)(6916009)(316002)(14444005)(305945005)(5660300002)(6116002)(256004)(66476007); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR10MB2741; H:AM6PR10MB2310.EURPRD10.PROD.OUTLOOK.COM; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; received-spf: None (protection.outlook.com: airties.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: NwERg4aVfmVIpwsTeIKqi24QMqoU6j/wrfiqOlTvo9xJhlORCsrgsKrPsfDAeCR9tYHRpT3plmky5NiDR2RxIECAkR0QiSW6+94eDEdKiyLNvcWnB34yxWrW1S4yurmnlwiRF2+nHbz59XVi/3IW1DJ/sp403NjmA/J/4lpRxPmaHN3ap3C4YpDfHSrgt5cTbipJ5eOOAVIo9wxLZ3BnCTX6CFuLT7BY5hSV8mJvZey4M9I2En2IeyhlM1OkvVlFhyDRuPof5iOg/+xHDCm9C98hc1NYf7LKC8vbYZ0FMFq8XG3oAnhTSqRFXUaf27XbpU5sLKAwG4hJ6ObySkZRoXcdQ9ei+qhj0eSLL/LOSlE7toak+eo3+LYqacNt2PeaL5nVNfHodjUENCX16N+1gI6R4OMGghwiUXnmeqlT5RQ= x-ms-exchange-transport-forked: True MIME-Version: 1.0 X-OriginatorOrg: airties.com X-MS-Exchange-CrossTenant-Network-Message-Id: 94db0c5a-bf79-4768-cd5d-08d73079ded3 X-MS-Exchange-CrossTenant-originalarrivaltime: 03 Sep 2019 14:20:28.6441 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 316fd558-a5a6-42fd-9da7-d0f38e0864f6 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: ZynG1jx2JtfsaJkYZg6uVNCyFlHD8aeVyRizBkrLv1vsWjAaAP8ZshfoVZFg73MAUFd/lv/1UBXWoqLmbnscWtVKsn/e4L2wr9jw4msFFis= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR10MB2741 X-MailControl-OutInfo: MTU2NzUyMDQzMjpGUEtleTEucHJpdjpDrk63RX7L2YrM++3Y51hYstSK/Azpdb7JzXGhhJBytbzldUqqBy/A8LjO0OUYLeSNyynjpi55mBh1xssOE6UwIQsOZZXIGM/ZC7j5y6zzlWbWVku4c03NvQpPwUYSglma73v2z+FFaQlxNgnEb0FQiQHOyWXmXBIx/+CP3jfkCDu7dzxCa1w5ioX7kh8LgdbWStlxzzNWW0xs9z0/d4S2XWsg5NrToNK6K/co6mjYcU2e1NzlCI7bH+vnyySbcoXXi0HjXiUAZliCAz+vk9ji6BsDS7q0sB+u7cabGlaXyPwQ5rUEIJ6kjF3qHIlqGjMKPMK2euLXDmqgr4xXPRTs X-Scanned-By: MailControl 44278.2072 (www.mailcontrol.com) on 10.69.0.171 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190903_072035_448881_55BE9132 X-CRM114-Status: GOOD ( 11.10 ) X-Spam-Score: -0.5 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.5 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [85.115.58.190 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid 0.1 DKIM_INVALID DKIM or DK signature exists, but is not valid X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "Hostap" Errors-To: hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Bilal Hatipoglu WPS_EVENT_CANCEL is added to indicate cancellation of WPS operation for any reason in hostapd/wpa_supplicant. WPS_EVENT_PIN_ACTIVE is added to indicate when a PIN operation is triggered in supplicant. --- src/ap/wps_hostapd.c | 1 + src/common/wpa_ctrl.h | 2 ++ wpa_supplicant/wps_supplicant.c | 4 ++++ 3 files changed, 7 insertions(+) -- 2.7.4 [http://www.airties.com.tr/images/internal/IMZA_ALT_BANNER.jpg] This message has been scanned for malware by Websense. www.websense.com diff --git a/src/ap/wps_hostapd.c b/src/ap/wps_hostapd.c index 6161cdb..2f1af11 100644 --- a/src/ap/wps_hostapd.c +++ b/src/ap/wps_hostapd.c @@ -1425,6 +1425,7 @@ static int wps_cancel(struct hostapd_data *hapd, void *ctx) data->count++; wps_registrar_wps_cancel(hapd->wps->registrar); ap_for_each_sta(hapd, ap_sta_wps_cancel, NULL); +wpa_msg(hapd->msg_ctx, MSG_INFO, WPS_EVENT_CANCEL); } return 0; diff --git a/src/common/wpa_ctrl.h b/src/common/wpa_ctrl.h index b24ae63..3a3e69b 100644 --- a/src/common/wpa_ctrl.h +++ b/src/common/wpa_ctrl.h @@ -299,6 +299,8 @@ extern "C" { #define WPS_EVENT_AP_SETUP_UNLOCKED "WPS-AP-SETUP-UNLOCKED " #define WPS_EVENT_AP_PIN_ENABLED "WPS-AP-PIN-ENABLED " #define WPS_EVENT_AP_PIN_DISABLED "WPS-AP-PIN-DISABLED " +#define WPS_EVENT_PIN_ACTIVE "WPS-PIN-ACTIVE " +#define WPS_EVENT_CANCEL "WPS-CANCEL " #define AP_STA_CONNECTED "AP-STA-CONNECTED " #define AP_STA_DISCONNECTED "AP-STA-DISCONNECTED " #define AP_STA_POSSIBLE_PSK_MISMATCH "AP-STA-POSSIBLE-PSK-MISMATCH " diff --git a/wpa_supplicant/wps_supplicant.c b/wpa_supplicant/wps_supplicant.c index 0579274..f953218 100644 --- a/wpa_supplicant/wps_supplicant.c +++ b/wpa_supplicant/wps_supplicant.c @@ -1286,6 +1286,9 @@ static int wpas_wps_start_dev_pw(struct wpa_supplicant *wpa_s, wpa_printf(MSG_DEBUG, "WPS: Failed to set phase1 '%s'", val); return -1; } + +wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_PIN_ACTIVE); + if (wpa_s->wps_fragment_size) ssid->eap.fragment_size = wpa_s->wps_fragment_size; eloop_register_timeout(WPS_PBC_WALK_TIME, 0, wpas_wps_timeout, @@ -1351,6 +1354,7 @@ int wpas_wps_cancel(struct wpa_supplicant *wpa_s) wpas_clear_wps(wpa_s); } +wpa_msg(wpa_s, MSG_INFO, WPS_EVENT_CANCEL); wpa_s->after_wps = 0; return 0;