From patchwork Tue Sep 6 16:14:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexander Savchenko X-Patchwork-Id: 1674966 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.infradead.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=hostap-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org; receiver=) Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=a+rodwuj; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=celeno.com header.i=@celeno.com header.a=rsa-sha256 header.s=selector2 header.b=q8KDM/P+; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4MMWHS0cF3z1yhP for ; Wed, 7 Sep 2022 02:36:36 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=XYEO2mtqubZ3Z4YmJczcY8kDGR5Uf65BF/n8zrRElyY=; b=a+rodwujM2n56F azUqrQ1wiAecjiv9Sx8JVptiVO+77b1pQFPz6vaMUIoPpVFflmLyTXOeCHm7oMjkjsR1+gSKJybtK jSiJWPV4YwigGuhbL+UZkqX6T71JkUxGyLBLzm89DuN7yXsTCOsm0Y6z8WJowNI8s3ZGiwy++bihh N1aTLRCZxSMlXJactmyAtY9wP9oGrAb5xUNdccwjtKUoI5y4CACWkAAo85re0qiBpJICGuIEu3+SR kk1oGhwrdQnJchkpDWQjPYGmu7aF6IZ8gc6ajwx0G6e7LPWEm2XkiZSiW36Ab4WYxRVA8ZhCOSahH aRc6AmzR/p6ucENdv/JQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1oVbY1-00FTWL-Da; Tue, 06 Sep 2022 16:35:38 +0000 Received: from mail-eopbgr150055.outbound.protection.outlook.com ([40.107.15.55] helo=EUR01-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1oVbDs-00FGvO-Vl for hostap@lists.infradead.org; Tue, 06 Sep 2022 16:14:50 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LoHRd1Aw+VRmlxLRkooKj4TJ7lKTMmIcOkm8vFyiE7UKrb+NJX3TBQDQC9hJwBNlf1j/3OM2SwAQR9ap8LQBa7GSSgHcMFEe6gvxcMyBbP/zSnIqKiXr3btzgj0dRpjVd8ziRGM2uptq9FLAQzmSTK2+dWEOFAA8EAitQh2+9kUHa9bXzq1d+N4YgvHwL2gY2QkqRq4KIb8ejm2ZQH/xKrmDKRgYuRWZI+ZpdLYfN40jf8PfKaaLeEMSG92pSfh0VFPV+2Nh9V/SEEGWstw21/vEN9jLlLqGESY3MI7d2VVrxek0q6aoLRj/HPwF1KZirtArfIREg2BUaLQyPyM7Lw== 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-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=hUeI0n5fsalN+p/H8x7Pi1XF04ZvsFlCrXFMd822WjU=; b=bqgFbHoHEBivngt7HIHMWgL0d2UCkCTLWVG8TOx/pMXsM4fytZdnEJEPPaWXTNbAk0vY3pi1UKjyKnWhPcvDim0ROxqI8ymc22FeCieXxOHD6tEv9vOXMrXzztb2URMUZvRDpYLsT2pzDItHczeU70aJLj2Pckih4J5Xoj3LCkViMAPmAfTcVyOUZxY8UU135n3T8pdsqQ+UA3pxrUwWw63xaT2ANqu2EaAWqSoQGy5CM44spCTzmLkCWavlGS8ytQHjIxg6xiKfCXlKImeSWamXdUA4vQCvNQFKiigU9H+5lbu8N+TGBnYZGSB/0+tidDEjbBd4dYadS4O9tSSxEg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=celeno.com; dmarc=pass action=none header.from=celeno.com; dkim=pass header.d=celeno.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=celeno.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=hUeI0n5fsalN+p/H8x7Pi1XF04ZvsFlCrXFMd822WjU=; b=q8KDM/P+yZT4VhGQGFdJlTorDD8VLZeGhjtmCBts7eeDSTxfpCKymkorRxOBYIiCHW8qCFnminimmklQKlbyE3nH4tmo7AZl1BMNhU2PLVLRxv/L27BT+is89yMAJaNeB98YxQbe+MnyYw5ZqcVI41TpXPjA+1wyzfX6sTKdq6o= Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=celeno.com; Received: from AS4P192MB1552.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:4b7::6) by AS8P192MB1918.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:523::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5588.10; Tue, 6 Sep 2022 16:14:43 +0000 Received: from AS4P192MB1552.EURP192.PROD.OUTLOOK.COM ([fe80::e972:bb7a:8407:3a0f]) by AS4P192MB1552.EURP192.PROD.OUTLOOK.COM ([fe80::e972:bb7a:8407:3a0f%5]) with mapi id 15.20.5588.017; Tue, 6 Sep 2022 16:14:43 +0000 From: Alexander Savchenko To: hostap@lists.infradead.org Cc: Jouni Malinen , Johannes Berg , Viktor Barna , Sergiy Petrov , Alexander Savchenko Subject: [PATCH v2 3/6] nl80211: Restored usage of the resolved ifname Date: Tue, 6 Sep 2022 19:14:07 +0300 Message-Id: <20220906161410.2106782-4-oleksandr.savchenko@celeno.com> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20220906161410.2106782-1-oleksandr.savchenko@celeno.com> References: <20220906161410.2106782-1-oleksandr.savchenko@celeno.com> X-ClientProxiedBy: AS9PR06CA0511.eurprd06.prod.outlook.com (2603:10a6:20b:49d::6) To AS4P192MB1552.EURP192.PROD.OUTLOOK.COM (2603:10a6:20b:4b7::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 551b6cb3-192a-4a79-9336-08da9022e860 X-MS-TrafficTypeDiagnostic: AS8P192MB1918:EE_ X-LD-Processed: f313103b-4c9f-4fd3-b5cf-b97f91c4afa8,ExtFwd X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: os/ryaK1yFhdq4kPaAdy4qccAbGhI60tcLf+HMPuUEzzUEP/6kIItQ3EmbEUhkYVaidhnRQAHrt2fq+xur615fkdLhWJmivczWXS0gF221yLWz1JmyVucHNukENi244+1lgI57TUMUQQgiLQhHZg+x/fy6PDCS/f+QNlSrjtqx4pMrplPBeLACYwTpxJ2v4SD9mARsIr8JHq4us4CUtLSOuHL7e/Nr1HbBUQVR2hg5VQYawBtwUBZWC6OzMn7c1brx/3gY1viLH6eDIAE6bnDtg2VsmqmwS6KRmVfk8tms+08j+wOPR07hbTBy4Eu0lh0rfwa+0uWcwy//0m+xEnbFfmj7jFvLzSKfl8nBKlh8M/7PJglbFQB3e0R3/9lIDZNbv78UJnhF/Gv4ajM+cde5ibvNc4zWFKczUIaH4cvGiujP6wNVNL+x5QGetGesSXnqNBOvGMZQ2KWJHL/72LCt3DAZ11RIh1rsacp6MaDsW73aCmmNaCUCiMOurtd6RazJcyjdlD9imrns9TF7g/ZoLtDKUOItQ4Wlw2So0PF+AWkQjPbIXGUmLS8EGOBz4d4nfbtGvBlD/rto1pupie4yH5sZxagcL5AyxFgkyAklV3dx+5vUBY9zvUD27cuTWsbk+psyz/KDr6lgr9wuTacdf5CvLCMbBVzCN2LkcFYceiaKXYXAr58hbhE/4tUONzClACWmlK/XtPAdMciHS+wrn3YIub9zaMBslzkbETu4Kgj/KcqQQt3LiptaEHRwyAVsgAW02d+2CGJels3plplQ== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:AS4P192MB1552.EURP192.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230016)(136003)(39850400004)(366004)(346002)(396003)(376002)(38350700002)(66556008)(52116002)(66476007)(86362001)(8676002)(107886003)(6512007)(4326008)(26005)(6666004)(316002)(8936002)(6506007)(6486002)(478600001)(6916009)(38100700002)(41300700001)(54906003)(2906002)(1076003)(66946007)(186003)(83380400001)(36756003)(5660300002)(2616005);DIR:OUT;SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: oDlqORMr5+ScIyVvDnAw9UlDJ21h1Mz5mO4sSIgEodmudN0zSvp4AmlwOZC3EzV5WztGqiMS8fIkrKfHpnI3qc5xTAy245upe2P/m46ZAA0Ll7ESbwpibfEzXYUE0UdPhYrTUzbXksCdLEeVTUVtwc1ZGKcK90P26ykQ58SRyltYPD+8+DW+RoF5e6xU76E7FzuEU/Mn2+4rgpa/y5G+AYXsfTwB/pAx+R/by9F+3o6zzmkSnHGQLIYKCTB1cZCCAC3oqYsE6gq6WZkHe6K9O6E4yFDP79agdOZV2RB0YWXanO8X0JJljQJTNCK6olEmNXPAcNBIsXurSu/qgXnjL/gr514T1UPMGsr1nYPhmlsVnDNg7fKTLdJ8EK7Id/OPR+29NBFkLQfzi0CUuc7k5eUseb26KdM8hgCBkR0zKoICi6r8v3C7z/anN1AEnbXUTI2k3hvTPRrRS+J/2FVYvxQY3vsw02StWD27FP1eFRc0sQQD87SCCbmcGQOZEaGln1rqw3CADztuUcdU1sn6glAXrnUAHwjevHBVAdHOReiuXJJi0K9iH2RhqUiBvl+ntM4UtCYuHCgyob4CBSutUsXXxiwBCrAy+jWX9kiVY0J7O4YxauL++WNWChZcNqKvCuI0K/ctLHL3ihEKdLkm8w0H9ZQLzRLukltgDgWan6ONg6AU4hghkAs+FNkh1CR4BQQhnE6X264TiHbZsS4JZ3Kd6Lxb5EJWjkkj8mbXU4/O3LEvXifqh9T+U0T399U3WIgCzvtAAZhwnNf68pc0ldP8IG9auZAdCYY6u1OqR8/o0tSejC/N27hBdllvmzv6Hkt04ocS2UVOek+3Mm+j78RQUsROUxH24kfXEBEYQzkrVr4AcDOj7udfLAMV/CmAGCNSZcOIKAD3zNGlJvUZMLDHi2S9QgwmluOziv34m6JssJ//74ZmvP5LzQ4Mx+vFHAUWesG4n6bhlAJ8HarxXxunmFKFnoZ0lBvymOUMEuEFpKf1gk1OMjlFZK8UzLDtG/buDE5VkXJrI2BCynPVm2LJ+5offuHgvyje05qOiadJsOJ+V4UlgZxUhRoqcxyBley9/x8xkcJbnv/Z/ecHR1qT75BsJ9a9zsQ/VC56ZqPLrMxDOslpFlE24wt9dyDfKTFUEZvOWUrl63aFK38qWhWW+ynw4CBbuia4dYpAc06FEZfgU1vlLi2OHTvexBfoltYOM1mvEuXJtDUV7AlvC1Anfdf9Us0E/45p7UXYtGivLg+GizP2eAihXCweP+yQnSJYYlPFOEAs1zK89+7G3ELWFaPTRkRXDuz5/fzC8tF5NCYhXqYFDgvqn4XLj42AYyDL7vabIaQvpTEY069Lbdy3v8ougNP1Q9Smna9uLTi5TwCqv5B3Ejngq18uwviN9KOV4FBl9u9E57CIy0oke043+1ENrCFj7E6+1puEXTSQy6dH56bZfdV9ymiFaqVfTWzvBLaU4IwVykEp4ALfxBcOAtyx2NE24Q7aGKwRk9x2gP7mjRjrU/RHMIKHEfcm7RHQ8V7w4iyNNYuHBTSJtkMlSXDIWNgJA4hnm2ognh+v3ME97ks11++B+dKeofFd1YTuACpgXvjH2Oxw55D73Bh8xnC23b586bUhElBX/E0= X-OriginatorOrg: celeno.com X-MS-Exchange-CrossTenant-Network-Message-Id: 551b6cb3-192a-4a79-9336-08da9022e860 X-MS-Exchange-CrossTenant-AuthSource: AS4P192MB1552.EURP192.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Sep 2022 16:14:42.9742 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: f313103b-4c9f-4fd3-b5cf-b97f91c4afa8 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: xP+PcCa3XRt2FlwwseQUfNAOYufG7Xjxbr0NN23Wu4FKjK7UjO0nj/TTVP9ArD2OjMjZ+FSi/X3281TLUKDuGDIH5AQvBrmoXO+nwSTRiqM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AS8P192MB1918 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220906_091449_075812_405073C8 X-CRM114-Status: GOOD ( 11.06 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: Due to reverted commits 8a9950f7b, 106fa1e97 included merged functionality (UP/DOWN RTM events processing and namebuf) namebuf is restored in this commit. Signed-off-by: Alexander Savchenko --- src/drivers/driver_nl80211.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [40.107.15.55 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [40.107.15.55 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_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain X-BeenThere: hostap@lists.infradead.org X-Mailman-Version: 2.1.34 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 Due to reverted commits 8a9950f7b, 106fa1e97 included merged functionality (UP/DOWN RTM events processing and namebuf) namebuf is restored in this commit. Signed-off-by: Alexander Savchenko --- src/drivers/driver_nl80211.c | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c index 2812d36a4..38bdbe4f0 100644 --- a/src/drivers/driver_nl80211.c +++ b/src/drivers/driver_nl80211.c @@ -1245,9 +1245,9 @@ static void wpa_driver_nl80211_event_rtm_newlink(void *ctx, return; /* do not update interface state */ if (!drv->if_disabled && !(ifi->ifi_flags & IFF_UP)) { + namebuf[0] = '\0'; if (if_indextoname(ifi->ifi_index, namebuf) && - linux_iface_up(drv->global->ioctl_sock, - drv->first_bss->ifname) > 0) { + linux_iface_up(drv->global->ioctl_sock, namebuf) > 0) { wpa_printf(MSG_DEBUG, "nl80211: Ignore interface down " "event since interface %s is up", namebuf); drv->ignore_if_down_event = 0; @@ -1255,7 +1255,8 @@ static void wpa_driver_nl80211_event_rtm_newlink(void *ctx, nl80211_refresh_mac(drv, ifi->ifi_index, 1); return; } - wpa_printf(MSG_DEBUG, "nl80211: Interface down"); + wpa_printf(MSG_DEBUG, "nl80211: Interface down (%s/%s)", + namebuf, ifname); if (drv->ignore_if_down_event) { wpa_printf(MSG_DEBUG, "nl80211: Ignore interface down " "event generated by mode change"); @@ -1278,13 +1279,18 @@ static void wpa_driver_nl80211_event_rtm_newlink(void *ctx, } if (drv->if_disabled && (ifi->ifi_flags & IFF_UP)) { + namebuf[0] = '\0'; if (if_indextoname(ifi->ifi_index, namebuf) && - linux_iface_up(drv->global->ioctl_sock, - drv->first_bss->ifname) == 0) { + linux_iface_up(drv->global->ioctl_sock, namebuf) == 0) { wpa_printf(MSG_DEBUG, "nl80211: Ignore interface up " "event since interface %s is down", namebuf); - } else if (if_nametoindex(drv->first_bss->ifname) == 0) { + return; + } + wpa_printf(MSG_DEBUG, "nl80211: Interface up (%s/%s)", + namebuf, ifname); + + if (if_nametoindex(drv->first_bss->ifname) == 0) { wpa_printf(MSG_DEBUG, "nl80211: Ignore interface up " "event since interface %s does not exist", drv->first_bss->ifname); @@ -1296,7 +1302,6 @@ static void wpa_driver_nl80211_event_rtm_newlink(void *ctx, /* Re-read MAC address as it may have changed */ nl80211_refresh_mac(drv, ifi->ifi_index, 0); - wpa_printf(MSG_DEBUG, "nl80211: Interface up"); drv->if_disabled = 0; wpa_supplicant_event(drv->ctx, EVENT_INTERFACE_ENABLED, NULL);