From patchwork Tue Mar 25 18:00:32 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 14029335 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 377B8212B3F for ; Tue, 25 Mar 2025 18:00:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742925656; cv=none; b=WY8eOcO+HYUws5g94hkm+XVAofT3y27VJgzeHcoc7O+dKo4qKhWHFlMLfoOVequed1EcutsxWI1VJLKN6PT8oPRM08YNIOZVLdHOJjjDQzM7EehYdS8KlFfc3Gz0BLnFOJnyJh7mB53W6ZQ/z25dGDmJy4OWidqK4nP9Nklqcxg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742925656; c=relaxed/simple; bh=vDMF1T7eOH6GKRhUt+QPWTp09g7OL2BHBiDtBRsFApw=; h=From:To:Cc:Subject:Date:Message-Id:MIME-Version; b=Hnc+aNmGs88nOcXbi77wmYjgEaaCy8okLb4goxmtzqQIx1g+eSfToAIJIuwERd82/+DaiyZ3uZsp95GTqVXo9fIFtzsmDli8A6vdIq/q7P6vouiYeaqw7HLvFD6iNkD6FFmLe64HMB4S2pYOHsDQGa1OX2hWnEL2KB+/WeukPrQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=jixqFrlV; arc=none smtp.client-ip=209.85.214.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="jixqFrlV" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-2260c91576aso101064715ad.3 for ; Tue, 25 Mar 2025 11:00:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742925654; x=1743530454; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=Fo6eEo8vd4Ttv2jHt80DI0ch0RyPh6KEYVVJ7ym4bGI=; b=jixqFrlVpHp4PWi5RxaELTP5wyU1SlpBcOHaI0UrP5RVpb3Ow2MIgzcwN0MZAV8f65 kdNMeyXjYxd67HXvibXR2mMU4Xqbj/WtIEN+qN9azHouv9Bw6uPrXQ4fjReof+Ck+X9o q2wJHc1FvjVix8m0+KZOFJWsvt0csl1lFqcQsSHfHc5/bxNM1/rIJRIgqsv+6BseCQaJ YCIFSe9pRAeZo/XHZR0aY7rmvE7Lst/9do7MI7oZvr08jxBHRKzzBDnyHv0Px4O7wFdJ tXs07w07FgBJfbqjZFJeXewjmaTt2wDFaw4mupif/Jm1Yr3TD0EpCbVLF13vJFO0dCln psJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742925654; x=1743530454; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Fo6eEo8vd4Ttv2jHt80DI0ch0RyPh6KEYVVJ7ym4bGI=; b=ihdBMaoKpMRnHnf8rniSceJeEDSNdPJPMSFv/Q4nMxsBrE4usESsxklnVeBHCLcqvn E+ew8BuSVLMyPpDArcu36ynpxDC6lxRV+JB5FMt5+HzJcnkG980TpnWHHQ3T4G4SW9Ro VAc1sIA9lah4z4mvm+y4th71jd4i1QrZEpJ+XCNdwZ5UvWPay045yKhonmpA4KjpPRSQ rZs7AVZ9rJE8YCNlWbO6vmYBfrFezoOl+5wJJP7BJTI1cpAnXZX/rloEkT4Ss+ZFYrsL cpCyO7ffF9qevwFHYfQy9P+4p2JF9CEfEdmyzApZjCfs7D6YYdMFnIR4UaWnWgCrVBpq Znhg== X-Gm-Message-State: AOJu0YyiWxgyyRCbTB821NglIjaPKXug6zTiBvZh5tHVrTaPgI8dQSBQ GZOFVshdHsKxIxHQk+d9/G5pEYs+MMnJU/5h+mkdHr1e1xJL5aL87HImEA== X-Gm-Gg: ASbGncu272yEuSYpI/MKsorScEp0APRgizaG+okj5DbnkpKXXo13JOilEErF2lAYbfi cHqveWsSN4VuzRZ9Ohu54wdQeZnu5OfT/hHFety9R7G5hhRaOn8x15XfgEIMNdbYLbW/km0rEP0 elR3a+o0J9gREj1czZ3X2lqk30FhwR2Abnu2VvCX6P3XWh11Hi725aJRqZ3cTgmnJAa6J6Yxpvd S5qcLUUK++DyZx705nGL0JnPJNlduFo5vHa9+E4A6h+JVzZoM4+FEs7xhdulDY/lEfy08xGk8JW OI4g+d9xNKyr+084t0BLdXTp75SttI2l5zfn+SkNlG0IeOM78Jd2tchl3vvlrwORwy8+Fj7E4dQ 0eB8= X-Google-Smtp-Source: AGHT+IGxvDX4Fu3FA01VSxeBLNuunP9ri6gcupA6UFsuq9gxcHHVG6lZMp/O8/T8csWXcRIS9ftS4g== X-Received: by 2002:a17:902:f649:b0:224:1157:6d26 with SMTP id d9443c01a7336-22780c544admr311231915ad.4.1742925653926; Tue, 25 Mar 2025 11:00:53 -0700 (PDT) Received: from LOCLAP699.locus-rst-dev-locuspark.locus ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-227811bae9asm93770515ad.138.2025.03.25.11.00.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Mar 2025 11:00:53 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v3 01/10] station: always add BSS to network blacklist on failure Date: Tue, 25 Mar 2025 11:00:32 -0700 Message-Id: <20250325180041.238676-1-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Allowing the timeout blacklist to be disabled has introduced a bug where a failed connection will not result in the BSS list to be traversed. This causes IWD to retry the same BSS over and over which be either a) have some issue preventing a connection or b) may simply be unreachable/out of range. This is because IWD was inherently relying on the timeout blacklist to flag BSS's on failures. With it disabled there was nothing to tell network_bss_select that we should skip the BSS and it would return the same BSS indefinitely. To fix this some of the blacklisting logic was re-worked in station. Now, a BSS will always get network blacklisted upon a failure. This allows network.c to traverse to the next BSS upon failure. For auth/assoc failures we will then only timeout blacklist under certain conditions, i.e. the status code was not in the temporary list. Fixes: 77639d2d452e ("blacklist: allow configuration to disable the blacklist") --- src/station.c | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/src/station.c b/src/station.c index 5403c332..0b20e785 100644 --- a/src/station.c +++ b/src/station.c @@ -3402,6 +3402,13 @@ static bool station_retry_with_reason(struct station *station, blacklist_add_bss(station->connected_bss->addr); + /* + * Network blacklist the BSS as well, since the timeout blacklist could + * be disabled + */ + network_blacklist_add(station->connected_network, + station->connected_bss); + try_next: return station_try_next_bss(station); } @@ -3449,6 +3456,10 @@ static bool station_pmksa_fallback(struct station *station, uint16_t status) static bool station_retry_with_status(struct station *station, uint16_t status_code) { + /* If PMKSA failed don't blacklist so we can retry this BSS */ + if (station_pmksa_fallback(station, status_code)) + goto try_next; + /* * Certain Auth/Assoc failures should not cause a timeout blacklist. * In these cases we want to only temporarily blacklist the BSS until @@ -3459,12 +3470,18 @@ static bool station_retry_with_status(struct station *station, * specific BSS on our next attempt. There is currently no way to * obtain that IE, but this should be done in the future. */ - if (IS_TEMPORARY_STATUS(status_code)) - network_blacklist_add(station->connected_network, - station->connected_bss); - else if (!station_pmksa_fallback(station, status_code)) + if (!IS_TEMPORARY_STATUS(status_code)) blacklist_add_bss(station->connected_bss->addr); + /* + * Unconditionally network blacklist the BSS if we are retrying. This + * will allow network_bss_select to traverse the BSS list and ignore + * BSS's which have previously failed + */ + network_blacklist_add(station->connected_network, + station->connected_bss); + +try_next: iwd_notice(IWD_NOTICE_CONNECT_FAILED, "status: %u", status_code); return station_try_next_bss(station); From patchwork Tue Mar 25 18:00:33 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 14029336 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9E5EC25FA1B for ; Tue, 25 Mar 2025 18:00:56 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742925658; cv=none; b=qNwvEKQ5ZhB2HcHgDW2yZVjHjqKWS4clvSN1khFrOcub8+qwEC9Jqylddh0WeHXi8Us7KRyyoFVRfIbNJsigFHfcUqq9TmQNU/LsoaPxQFbDrRsAs1yV8z/VZwiwdm7Jkr1p8oq3ww/CEW7Y2jWSDCR3ZSD7hdRZ8yoxCVeVX2o= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742925658; c=relaxed/simple; bh=RuQY+rH5cxO4piN6+5wH8ICIX8e/hooGS/Quj3DEKgs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=izONFNe3S6q83iu8JsI2IZ3pJ2PYqjy1MDFgbQ9sAeCBXYKPxG3LTBEONGl/OrOjEnfV048gCG/UKaBpxAVyKuRijhnurVULM80eoMQq0HFgDnBAPJjdiz7evq3Zt5DmjacNqJTpkxeTxF0zKem8hAlEk5b8ExOJVqmgATfubvQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=b0sN7mCN; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="b0sN7mCN" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-227c7e57da2so44088565ad.0 for ; Tue, 25 Mar 2025 11:00:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742925656; x=1743530456; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/Y8J2vmE79n+rammSb68Vx/t2JXWMbDjn+1OH9GUK8w=; b=b0sN7mCNiSXRFvmpQS0rY3VPftKhbDdPh9bN7IcW9ruui7sMQjzsHvb6Dkw91RlZtv bWjDpKwIxMFDOSHL3hJ8q1jEk0v+kWYTvay/JYtKiBmdzIwMAbReM5BrHXHucugO1ddS sti6GZxXy2lLtUlC9Co1Es6tO59iHXoybGdGxOhkCVchwXRtMSoUv/BXVt/evvZKYr3t VDnvknIlWp/7FXau2oCZ3S11Xgz3bjWQU7y+hR6WumhT7RzeCsurg2LHr5WaD8qPOgtz 9RLBvDThhAYwhAJaTpKa1gjV58VOLJJ2801JSScS4vPrLbuAd8ajvNKP+/KJFSU8cLUb LSmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742925656; x=1743530456; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/Y8J2vmE79n+rammSb68Vx/t2JXWMbDjn+1OH9GUK8w=; b=ba6mvFglyXsMdgoP03CKFvRTnwlEO2/B7TWGmay8BR5nrk9vyaAJJbZ2JU2E55LdIy y0uMqFgwNqf5YmaVZF2bQs07NjB0pLtx3ERZtWPSyWHRgrnrWn/vj+oL/iVd3HCJvIE+ zcaQrnTOPMa1DM9l+RvAJwoB/S+780CE7G66ozlHJxRyme4z9FdTEaMf/RK9rUKU6Rks JpyiMdmFu1mjDDzTz1VE4fJy2sW6p1tT62FX2jh1uGR6X5etuQ35F5fHwYTMHigNm3+R UTj+T0R23sXwv6R6MkcEceQTn2AdzIE7ArwM4yEsW7Dy+prKwbhhL74VtVQMxo7t9G3j E4xg== X-Gm-Message-State: AOJu0YzPenJpRIhIiKKfkhZXKcci0IKSk+T9J8Bm/Z7YZtpUUITwqnhI r1yrklRsk+MYg505R3ohtrMiU8ughb41vNqDZtNThjmdzWPy/FRBBKmdBg== X-Gm-Gg: ASbGnctt6uex6sBh9MqwrjqrxFAdL7DaFErz/hcQ7dmVBu4KjUn/Hor+A4ZZxxcUdXt uR3W/ZKk4fWSMktAwxRnKtOf0XJi8lne5A54LvDG2vK0a+6k8xEVeLia8eR808ydkihqFsYGwYd 2jM8mu4SjaKk2I59C5myRnmkVK6aiIKQ+cvP07mNv6hwhVWasRTriIw6pcTAMkYZ4+7AMOpCqgd OYIjrGdFg6HdTVzrw0D5VIFLvfqXZRWtVZRpjp21UANIGOE68KJDmcs6P2tghTwfTutXSMaTSZK xqbLWxcP3ATn+YAmNxAyHMYbUQBhdqYhlELONogwNgb+lNATCosC1F6X6GYngUQdWqgcu0XghCQ cdts= X-Google-Smtp-Source: AGHT+IGcrY3iwnbMfNxpvoyJiSD8hOaWT4Mb5tGJn+rFmzFJjrKO19p2UCumeE9pRMnfsq/FDTUwVA== X-Received: by 2002:a17:902:da86:b0:223:4341:a994 with SMTP id d9443c01a7336-22780c7ec73mr248722285ad.9.1742925655487; Tue, 25 Mar 2025 11:00:55 -0700 (PDT) Received: from LOCLAP699.locus-rst-dev-locuspark.locus ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-227811bae9asm93770515ad.138.2025.03.25.11.00.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Mar 2025 11:00:55 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v3 02/10] auto-t: add test for disabling the timeout blacklist Date: Tue, 25 Mar 2025 11:00:33 -0700 Message-Id: <20250325180041.238676-2-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250325180041.238676-1-prestwoj@gmail.com> References: <20250325180041.238676-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 --- autotests/testBSSBlacklist/TestBlacklist.psk | 2 + autotests/testBSSBlacklist/connection_test.py | 57 +++++++++++++++++++ .../{main.conf => main.conf.default} | 0 autotests/testBSSBlacklist/main.conf.disabled | 2 + 4 files changed, 61 insertions(+) create mode 100644 autotests/testBSSBlacklist/TestBlacklist.psk rename autotests/testBSSBlacklist/{main.conf => main.conf.default} (100%) create mode 100644 autotests/testBSSBlacklist/main.conf.disabled diff --git a/autotests/testBSSBlacklist/TestBlacklist.psk b/autotests/testBSSBlacklist/TestBlacklist.psk new file mode 100644 index 00000000..abafdb66 --- /dev/null +++ b/autotests/testBSSBlacklist/TestBlacklist.psk @@ -0,0 +1,2 @@ +[Security] +Passphrase=secret123 diff --git a/autotests/testBSSBlacklist/connection_test.py b/autotests/testBSSBlacklist/connection_test.py index 9631a322..ac1cb86d 100644 --- a/autotests/testBSSBlacklist/connection_test.py +++ b/autotests/testBSSBlacklist/connection_test.py @@ -260,12 +260,69 @@ class Test(unittest.TestCase): self.wd.unregister_psk_agent(psk_agent) + def test_blacklist_disabled(self): + wd = self.wd + bss_hostapd = self.bss_hostapd + + rule0 = self.rule0 + rule1 = self.rule1 + rule2 = self.rule2 + + psk_agent = PSKAgent(["secret123", 'secret123']) + wd.register_psk_agent(psk_agent) + + devices = wd.list_devices(1) + device = devices[0] + + rule0.drop = True + rule0.enabled = True + + device.autoconnect = True + + condition = 'obj.state == DeviceState.connected' + wd.wait_for_object_condition(device, condition) + + ordered_network = device.get_ordered_network("TestBlacklist", full_scan=True) + + self.assertEqual(ordered_network.type, NetworkType.psk) + + # The first BSS should fail, and we should connect to the second. This + # should not result in a connection blacklist though since its disabled. + bss_hostapd[1].wait_for_event('AP-STA-CONNECTED %s' % device.address) + + device.disconnect() + + rule0.drop = False + device.autoconnect = True + + # Verify the first BSS wasn't blacklisted. + bss_hostapd[0].wait_for_event('AP-STA-CONNECTED %s' % device.address) + def setUp(self): + _, _, name = self.id().split(".") + + # TODO: If we have this pattern elsewhere it might be nice to turn this + # into a decorator e.g. + # + # @config("main.conf.disabled") + # @profile("TestBlacklist.psk") + # def test_blacklist_disabled(self) + # ... + # + if name == "test_blacklist_disabled": + IWD.copy_to_storage("main.conf.disabled", IWD_CONFIG_DIR, "main.conf") + IWD.copy_to_storage("TestBlacklist.psk") + else: + IWD.copy_to_storage("main.conf.default", IWD_CONFIG_DIR, "main.conf") + self.wd = IWD(True) def tearDown(self): IWD.clear_storage() self.wd = None + self.rule0.drop = False + self.rule1.drop = False + self.rule2.drop = False @classmethod def setUpClass(cls): diff --git a/autotests/testBSSBlacklist/main.conf b/autotests/testBSSBlacklist/main.conf.default similarity index 100% rename from autotests/testBSSBlacklist/main.conf rename to autotests/testBSSBlacklist/main.conf.default diff --git a/autotests/testBSSBlacklist/main.conf.disabled b/autotests/testBSSBlacklist/main.conf.disabled new file mode 100644 index 00000000..aae6bc12 --- /dev/null +++ b/autotests/testBSSBlacklist/main.conf.disabled @@ -0,0 +1,2 @@ +[Blacklist] +InitialTimeout=0 From patchwork Tue Mar 25 18:00:34 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 14029337 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7CA4C1F3D3E for ; Tue, 25 Mar 2025 18:00:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742925660; cv=none; b=vCJu9M5qPRKWaT1OAcB66zihZA5bXGz8kW7GTyYiZ0CqoP65ED/o5/J2GwnxOgE45Y7y72osYBZx8uSKggtWR6SbQ2ZnXkPHkyRk/uLjIOii15tId/0sVRkFR/UhObu8kcg9yEzH/MvOU7fF9Fhe87q03kTU1p/T1J2R5gBr23U= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742925660; c=relaxed/simple; bh=fVTWIZPaaHu947Xhsj0ojlm+/XG9rhpAQqYDHWn6L/c=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=nki35eZAZR0udrcCxUcV2lhsmFPAzoItG4zRllBEZYOAldrJGRBGlDTS7TbIg6RWkDdyqk8OC9GLG7tEqD7jU3vPnsS6lx3qYFgXXu7mV7LPaxH4YQ7sp3YSEIRVf0SeMDw2fz7+zMGIS0gCihTa+EicguH1Zp2Bd0RMSQROZDY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=GMmz3sVg; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="GMmz3sVg" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-223f4c06e9fso1780535ad.1 for ; Tue, 25 Mar 2025 11:00:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742925657; x=1743530457; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jLmAOMujx9S2nEt/UoUO/0Kjcqf7j3KvU1htbAmnPr8=; b=GMmz3sVgq1PZF2cpNkigMCVxk9bch6PdqtK3eXLpUSla7T4VNF+QhcYFY5olnRx8wF SZDAkyL8QQ8nNb/L/7CdAAmfQwIBJgLJHTpFDCOEQQHH8wH7aBIxbUBbcM/3Mr5zY4GV fw9TIwTnywN0tiSy+IYly4xrEVjEtyP5+IwRVu+7uO8XqyXm0ZbPxNQRwHBotSdYvmC2 6o6WTh5mUFH2zVTqvXKlbWCRAGDJ7aOimIAH4GXtkljB0ft6GzY1EYpsw0Z2D+w8Y6DX tefwIundfMBjv1XgAfysKCDAerZjSTXKv/xaSc9dLejuoXA0VerdQ9lemFSDN+N0NkJR FFmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742925657; x=1743530457; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jLmAOMujx9S2nEt/UoUO/0Kjcqf7j3KvU1htbAmnPr8=; b=OP9bkrTmK9hXbibT6HVDa/0C/9hnRCHPV+/z3kfgRRqPSEIpg8fpP/fCpxhSlvsPXG 8PVwmwVvLYJMNbu5WwiZK6ft9NiKf6IW5qTx0i5Dk0hLSvZ7D+8hAFCWnWVHHmr2VoyN 5nniH8UzNEkDwM/7Ck/lGWqk1bojJfczIkxNvCIbr+Dgv6i4IOfkUIzJRHDDGTcHDI+k x0DqSUww1pIt0oRxpxiK4QHMzWyfKNZw5/cDX/isxSWVMtBdlMUCb3RFbbwgT3GX1oPM luhHOBPDZ8IgsgrSKXn3QqIw+qw6mKpDDvkpy4fYV/4cIjnaQcgGR1ULrEzNSaKCf49u PNyw== X-Gm-Message-State: AOJu0Yyxfizht68/IlCi+kV3kQhlBzDEDDafYVq0bHsDn/Ujl3EIVf6v iuDQjtFooQsvWk+5vP1NJdZOg8iDn5QVAmOh0D3vtkgJwWbGj5asQUM5/w== X-Gm-Gg: ASbGncuXCbppNhm9tw3IUm4XiIj5yjWh+74WTRd1GRhMwHrlM+DpiTnuCZ0tkn4i43R s5LtPnjkVUmnkjmeLjtNUxaRNTEpfJjM2DwQbkcC26rm/pv9OiaFPXt3NP3bpjwLjMLC3i9eBbI naXdDz9vc8IOVl//yfIGtYlAlvGrc+z9O414A7ZkahvJ60praWW41gQ293PSYVIXJlxjRSRmSsf jwyTduofMk2NQdXkqqKeaOO8argQbkws09X1j+V1X9UrGruIAir0y6Nt6mu/2FVUbDVAt4n47mw gKpWDFdjH6FvlxXNEnjaoJInfTBwrD4sNKsbpt0UkDrdQ+Kl7eVMQYMVcJbdqZv24XpzRkjZ+AM tong= X-Google-Smtp-Source: AGHT+IFdJBQ4KdGnRu42Zuc3r923c/ifkFIk7PlCeuhutCRlu9HRw9ALfr5zN/xxoiIjBTXHe/edFQ== X-Received: by 2002:a17:902:9683:b0:224:7a4:b31 with SMTP id d9443c01a7336-227efafc884mr8557765ad.6.1742925657170; Tue, 25 Mar 2025 11:00:57 -0700 (PDT) Received: from LOCLAP699.locus-rst-dev-locuspark.locus ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-227811bae9asm93770515ad.138.2025.03.25.11.00.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Mar 2025 11:00:56 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v3 03/10] blacklist: include a blacklist reason when adding/finding Date: Tue, 25 Mar 2025 11:00:34 -0700 Message-Id: <20250325180041.238676-3-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250325180041.238676-1-prestwoj@gmail.com> References: <20250325180041.238676-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 To both prepare for some new blacklisting behavior and allow for easier consolidation of the network-specific blacklist include a reason enum for each entry. This allows IWD to differentiate between multiple blacklist types. For now only the existing "permanent" type is being added which prevents connections to that BSS via autoconnect until it expires. By including a type into each entry we now have additional search criteria and can have multiple entires of the same BSS with different reasons. This was done versus a bitmask because each blacklist reason may have a different expiration time. We want to maintain individual expirations to have the best "memory" of past events rather than overwriting them. Future patches will lump in the temporary network blacklist as well as a new roaming blacklist type. --- src/blacklist.c | 61 +++++++++++++++++++++++++++++++++++++++++-------- src/blacklist.h | 14 +++++++++--- src/network.c | 3 ++- src/station.c | 12 ++++++---- 4 files changed, 72 insertions(+), 18 deletions(-) diff --git a/src/blacklist.c b/src/blacklist.c index 21f85a75..8ae474b3 100644 --- a/src/blacklist.c +++ b/src/blacklist.c @@ -51,10 +51,27 @@ struct blacklist_entry { uint8_t addr[6]; uint64_t added_time; uint64_t expire_time; + enum blacklist_reason reason; +}; + +struct blacklist_search { + const uint8_t *addr; + enum blacklist_reason reason; }; static struct l_queue *blacklist; +static uint64_t get_reason_timeout(enum blacklist_reason reason) +{ + switch (reason) { + case BLACKLIST_REASON_CONNECT_FAILED: + return blacklist_initial_timeout; + default: + l_warn("Unhandled blacklist reason: %u", reason); + return 0; + } +} + static bool check_if_expired(void *data, void *user_data) { struct blacklist_entry *entry = data; @@ -87,15 +104,31 @@ static bool match_addr(const void *a, const void *b) return false; } -void blacklist_add_bss(const uint8_t *addr) +static bool match_addr_and_reason(const void *a, const void *b) { - struct blacklist_entry *entry; + const struct blacklist_entry *entry = a; + const struct blacklist_search *search = b; - if (!blacklist_initial_timeout) - return; + if (entry->reason != search->reason) + return false; + + if (!memcmp(entry->addr, search->addr, 6)) + return true; + + return false; +} + +void blacklist_add_bss(const uint8_t *addr, enum blacklist_reason reason) +{ + struct blacklist_entry *entry; + uint64_t timeout; blacklist_prune(); + timeout = get_reason_timeout(reason); + if (!timeout) + return; + entry = l_queue_find(blacklist, match_addr, addr); if (entry) { @@ -115,22 +148,26 @@ void blacklist_add_bss(const uint8_t *addr) entry = l_new(struct blacklist_entry, 1); entry->added_time = l_time_now(); - entry->expire_time = l_time_offset(entry->added_time, - blacklist_initial_timeout); + entry->expire_time = l_time_offset(entry->added_time, timeout); + entry->reason = reason; memcpy(entry->addr, addr, 6); l_queue_push_tail(blacklist, entry); } -bool blacklist_contains_bss(const uint8_t *addr) +bool blacklist_contains_bss(const uint8_t *addr, enum blacklist_reason reason) { bool ret; uint64_t time_now; struct blacklist_entry *entry; + struct blacklist_search search = { + .addr = addr, + .reason = reason + }; blacklist_prune(); - entry = l_queue_find(blacklist, match_addr, addr); + entry = l_queue_find(blacklist, match_addr_and_reason, &search); if (!entry) return false; @@ -142,13 +179,17 @@ bool blacklist_contains_bss(const uint8_t *addr) return ret; } -void blacklist_remove_bss(const uint8_t *addr) +void blacklist_remove_bss(const uint8_t *addr, enum blacklist_reason reason) { struct blacklist_entry *entry; + struct blacklist_search search = { + .addr = addr, + .reason = reason + }; blacklist_prune(); - entry = l_queue_remove_if(blacklist, match_addr, addr); + entry = l_queue_remove_if(blacklist, match_addr_and_reason, &search); if (!entry) return; diff --git a/src/blacklist.h b/src/blacklist.h index 56260e20..a87e5eca 100644 --- a/src/blacklist.h +++ b/src/blacklist.h @@ -20,6 +20,14 @@ * */ -void blacklist_add_bss(const uint8_t *addr); -bool blacklist_contains_bss(const uint8_t *addr); -void blacklist_remove_bss(const uint8_t *addr); +enum blacklist_reason { + /* + * When a BSS is blacklisted using this reason IWD will refuse to + * connect to it via autoconnect + */ + BLACKLIST_REASON_CONNECT_FAILED, +}; + +void blacklist_add_bss(const uint8_t *addr, enum blacklist_reason reason); +bool blacklist_contains_bss(const uint8_t *addr, enum blacklist_reason reason); +void blacklist_remove_bss(const uint8_t *addr, enum blacklist_reason reason); diff --git a/src/network.c b/src/network.c index 0a40a6c5..4602a110 100644 --- a/src/network.c +++ b/src/network.c @@ -1280,7 +1280,8 @@ struct scan_bss *network_bss_select(struct network *network, if (l_queue_find(network->blacklist, match_bss, bss)) continue; - if (blacklist_contains_bss(bss->addr)) + if (blacklist_contains_bss(bss->addr, + BLACKLIST_REASON_CONNECT_FAILED)) continue; /* OWE Transition BSS */ diff --git a/src/station.c b/src/station.c index 0b20e785..e2ed78f3 100644 --- a/src/station.c +++ b/src/station.c @@ -2880,7 +2880,8 @@ static bool station_roam_scan_notify(int err, struct l_queue *bss_list, if (network_can_connect_bss(network, bss) < 0) goto next; - if (blacklist_contains_bss(bss->addr)) + if (blacklist_contains_bss(bss->addr, + BLACKLIST_REASON_CONNECT_FAILED)) goto next; rank = bss->rank; @@ -3400,7 +3401,8 @@ static bool station_retry_with_reason(struct station *station, break; } - blacklist_add_bss(station->connected_bss->addr); + blacklist_add_bss(station->connected_bss->addr, + BLACKLIST_REASON_CONNECT_FAILED); /* * Network blacklist the BSS as well, since the timeout blacklist could @@ -3471,7 +3473,8 @@ static bool station_retry_with_status(struct station *station, * obtain that IE, but this should be done in the future. */ if (!IS_TEMPORARY_STATUS(status_code)) - blacklist_add_bss(station->connected_bss->addr); + blacklist_add_bss(station->connected_bss->addr, + BLACKLIST_REASON_CONNECT_FAILED); /* * Unconditionally network blacklist the BSS if we are retrying. This @@ -3566,7 +3569,8 @@ static void station_connect_cb(struct netdev *netdev, enum netdev_result result, switch (result) { case NETDEV_RESULT_OK: - blacklist_remove_bss(station->connected_bss->addr); + blacklist_remove_bss(station->connected_bss->addr, + BLACKLIST_REASON_CONNECT_FAILED); station_connect_ok(station); return; case NETDEV_RESULT_DISCONNECTED: From patchwork Tue Mar 25 18:00:35 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 14029338 Received: from mail-pl1-f172.google.com (mail-pl1-f172.google.com [209.85.214.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F198C2641F3 for ; Tue, 25 Mar 2025 18:00:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742925661; cv=none; b=HWkAm4YzBYJr9KIOZFfSmVG7510r9lwHI6SiyCy/5eVgaJflM+JsGG9OXA/zOHjpRkmyVCkR9cQUJ2QEmD1Ids7bnfDeRP+ilhOx2V7yIv2RwxoWNyldLHU1U5TEPIKBt6X7IAhjQn4ftFdEeAFa/raPK+DrwlBM5Jb7gZJDboc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742925661; c=relaxed/simple; bh=BrH42WKhmJVPhC61fzD+MeGaw6W5h1QEuAcVG1DiBfs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=W9SW/DQHfzNygy8suMBSZXgOlyAer+8EpgoMHFMhiAdHTCXVVz6e5MuYRcWu39g1trkmKMjWwKgUDejLPIljO2dEvBQ2Du9tNHqr0ZVL8xh48RUVgy6hwlQXGA8OS84xhRus3zkblcgw6IPG8uKopGz2aqLge5skohPbYCIC4ss= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Us8yTHnX; arc=none smtp.client-ip=209.85.214.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Us8yTHnX" Received: by mail-pl1-f172.google.com with SMTP id d9443c01a7336-2255003f4c6so116114065ad.0 for ; Tue, 25 Mar 2025 11:00:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742925659; x=1743530459; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/Rhzxq5SVNXIf8bmVNjN9u9uNej23p4Q0pgvf0hbCvY=; b=Us8yTHnXUjFtN3v8I/rSoKn0/NDubG6TIEbETLpEh4o/H43A1kjoDOw6cag/Cy/Qx5 XW0HZHItEoTRmEbIYakbPNHhjyTGu0PwWmzVNc3noVmRI5R0P2WY5wNVD+vJqWl/uT9m w0BdrzoRuhbzTYdeyo18wC9lzoKovO/Uc/KsHqrzp+Yu3v0h9XCUj73a3BuIrm6EC6HT vjf4GxkhhA5t7Oa8pEPhHovL7XWgPuNp2D4soMbKNY91sUZJ/m5zkCvFl1jTm3bz3B7g +/TKiPUKUELnkB//qA3k8ZKoQWW0hVfC4qoUgDklgo1CJxYD2/kxVwRtrKZk13/lNaIn 839g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742925659; x=1743530459; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/Rhzxq5SVNXIf8bmVNjN9u9uNej23p4Q0pgvf0hbCvY=; b=FwgquUeHO76qUGwx19wZAUOwpAo+1i9nR/lNiDahR+vue6nn5zpgwUII2TEHzQUVvq z30Ext2/NQCQWXVzo9CJgoOUCoyDEGKx8HzI2Cov9vFAq7vJxl+iAC0tU7r5IuTWws3J yVPTl9HTjcmzpOEB86wySMcbQ96TzH0Xl3KAxM4U/7dK/njb0mGuUvGgczMKRdYb+4aV AxJ5LtF402DOMeFBJ3RQH8h71INiARjGiLE8F6+WCWM4X/o2EZybKGO6XF1Vdk0K3qXE pKKdDgpcoSaDn7MmfFd38rK6wbNx1F6ywNuL09j5HJRpowg3OtOgvN5Of7DcpAh2rK+3 Z3UQ== X-Gm-Message-State: AOJu0YyY6ToCerhzOObUo6TIkMIJ6SNZadMKrkEUCOeurVVNtX/m1SmG Zr+ELRoLWVKmNH6uXzTiL0Cse8oxi5v4qrWE8Uztmyw1rSui87y891XLBg== X-Gm-Gg: ASbGncvQ88u2swLwdKwyWD9qL9spyvC1CJc65sHbCKsgPWfwCMopD6SAOzmLQkgN/rf P7PBViaiTxC1Y88AnqxwGiqaJ3E8ZnepVD9hyADSdE7G4TBG2RiZvapbjxe3MX5Fwju1nll/vTr r8YN6xP24qK8QewSh4bLV/nrBQfXj2EKFR0A4G5lla6eaaDAwvPxuXeEjm4jUa9ebMVtVHNtlzJ YIkAs4p03jeS+JJOgLgYn/tIWWp/h6NjGQqXsgdBzLrMP4H5zs0P6+hQ71/KHczgW0vHd2j/m5w TOEr7eo4MEVXcbdsQCP6vwE8B8tx3qm1bP2Qj8zDqPGZlcQIFvr7wMT88cvp7vvHXUlGhRhHdTH 0Hy7oj7n3BrO0bA== X-Google-Smtp-Source: AGHT+IFzKIt9T2aFq5Xa3Bj6J/yL327uRfCl/FyK95yaooJXgy9SlRqzFahZBAmCwfGolZaDTv1tFQ== X-Received: by 2002:a17:902:f64e:b0:224:1c41:a4c0 with SMTP id d9443c01a7336-22780c50cecmr294774025ad.9.1742925658732; Tue, 25 Mar 2025 11:00:58 -0700 (PDT) Received: from LOCLAP699.locus-rst-dev-locuspark.locus ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-227811bae9asm93770515ad.138.2025.03.25.11.00.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Mar 2025 11:00:58 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v3 04/10] blacklist: fix pruning to remove the entry if its expired Date: Tue, 25 Mar 2025 11:00:35 -0700 Message-Id: <20250325180041.238676-4-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250325180041.238676-1-prestwoj@gmail.com> References: <20250325180041.238676-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 When pruning the list check_if_expired was comparing to the maximum amount of time a BSS can be blacklisted, not if the current time had exceeded the expirationt time. This results in blacklist entries hanging around longer than they should, which would result in them poentially being blacklisted even longer if there was another reason to blacklist in the future. Instead on prune check the actual expiration and remove the entry if its expired. Doing this removes the need to check any of the times in blacklist_contains_bss since prune will remove any expired entries correctly. --- src/blacklist.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/src/blacklist.c b/src/blacklist.c index 8ae474b3..2539c5e0 100644 --- a/src/blacklist.c +++ b/src/blacklist.c @@ -77,7 +77,7 @@ static bool check_if_expired(void *data, void *user_data) struct blacklist_entry *entry = data; uint64_t now = l_get_u64(user_data); - if (l_time_diff(now, entry->added_time) > blacklist_max_timeout) { + if (l_time_after(now, entry->expire_time)) { l_debug("Removing entry "MAC" on prune", MAC_STR(entry->addr)); l_free(entry); return true; @@ -157,9 +157,6 @@ void blacklist_add_bss(const uint8_t *addr, enum blacklist_reason reason) bool blacklist_contains_bss(const uint8_t *addr, enum blacklist_reason reason) { - bool ret; - uint64_t time_now; - struct blacklist_entry *entry; struct blacklist_search search = { .addr = addr, .reason = reason @@ -167,16 +164,7 @@ bool blacklist_contains_bss(const uint8_t *addr, enum blacklist_reason reason) blacklist_prune(); - entry = l_queue_find(blacklist, match_addr_and_reason, &search); - - if (!entry) - return false; - - time_now = l_time_now(); - - ret = l_time_after(time_now, entry->expire_time) ? false : true; - - return ret; + return l_queue_find(blacklist, match_addr_and_reason, &search) != NULL; } void blacklist_remove_bss(const uint8_t *addr, enum blacklist_reason reason) From patchwork Tue Mar 25 18:00:36 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 14029339 Received: from mail-pl1-f179.google.com (mail-pl1-f179.google.com [209.85.214.179]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 81228263F4E for ; Tue, 25 Mar 2025 18:01:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.179 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742925663; cv=none; b=TnUNbj80xjBrBvyaAP/kStnF4W+K2Hsk21uakjHQzr7pW2bX7BYSlbJ5ppe0UIUhDqhp6taVksdpUHKK0v2ICWAjKKxqFHgD+fwKSP4h4r96PpP1ZQkMtw4J2pJgStpcTDMQLYOi8f90BaVCX2BveJr1ejiyOh4Jw2CZh/ngu9g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742925663; c=relaxed/simple; bh=UTWSdGV7N/nqbDQ89jLPU5TtZCOHjphPYWtLZIOGDZs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=sFtayc9ex/9N0PFVbDBhJMO1bqVAliedcv5aGLdKe6/mox7LxTlmoAyumP4571HWnCoHd+/yHbNQmaKXEMhuguLwKAXUmsLqhqwFORZqhqs+6oRpaFKy/31tKsxTX2FGWPeCZX6EuiMCmVQmCZlj2Zx1Vqd7llKt1Enbccw/Wqw= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=LhKo16nU; arc=none smtp.client-ip=209.85.214.179 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="LhKo16nU" Received: by mail-pl1-f179.google.com with SMTP id d9443c01a7336-223fd89d036so123028445ad.1 for ; Tue, 25 Mar 2025 11:01:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742925660; x=1743530460; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=6WgcEy3egH4EODY2iMZiNLVsCjOejr9DCG+RV+YGYTs=; b=LhKo16nU/7dku5jdA5ncyxJPY5aI1f+PmShMMldNhEP3l0b5hCyS3v8ajZu84nQvs7 faIpG9WZxve9a+obZsWu6oFTtOtSFdVdbxCBVZ9VWuyLUHbwmanIA4oHc0KiBuuYKyLU bvko+oJC6MGhUVuYFhj/Or7WuR1V3CHiFFUOf5EOhfo9mT1Js3dbgaCP+Sf1aRkkb6/B Jbg71EODEcEv2VkTeTzysAtR0ahUATkPqoy7V6U69a5A9qqT3tx1FqtFasccAImX1q2E rJgWwtTpUvnehzOYovYbaO/tsnqQTjUB8x0lxDRteJaTaGPWmFgkt1w92Bll95fp5ZTE Ekeg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742925660; x=1743530460; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=6WgcEy3egH4EODY2iMZiNLVsCjOejr9DCG+RV+YGYTs=; b=J630trDulvo7XnBy3pNcMlRH3KnxSy/Iux6j0xE4+nK/5ig+SkIUBddKUIi/4U8H+Q MCc1JR8OVqbtl7Xw7T/Us8gEyYVD2eMJA7k/7byRr+fdNTq/y8bbaMyepuvNPgbkLJ25 64FLWE10qIkwlasUfarqZHrJyt6d7fUG6b2PTnFN6PBtNTVHAPWpuuA9G3aHO3jV9JSE oSpfi+kztW6DqV8GORa7G83bAWx/Crxu6ujIMLAga2EgGPQ1m1NfR2l3x11Sp3a71sLf cGQV5Grk5QxwfRgahX0Gkpq+eejgPFZuDuNSJ75sxHhEkoJKAx4Nfiz7w3WtEPDiQG86 Yelw== X-Gm-Message-State: AOJu0Yz18FSIne7rm7fwLE7V3yzve92qRS8iybeSWGXEgfeEM081mTw6 9iLTXOumzwHSENA/jpOdfr4/szF2lLo53ku8JZ+y0xfk4BiveN+aIdRkXw== X-Gm-Gg: ASbGncvXno/WW7ukSLhMPF1pctca5tJzqGwqy9Mo2bdHRXYTB/KxY/CjezM5Onbhkvq UwIZpzGqEabRPUApFISnXvSk4GB8mT1IOEtS5MiQDjYtHKp4dHB+u+b++pKGkIoOf/DWoMi30BI FPhVijcrUEKLWLAKW8fN+ShKkuY127k96WpL6MRaM8ycMMj1JSxC6E05RSYgS8IOldT6m6afV/x XdEWenKCmcsVZF+JTNQwfrjJICfzSXk9ZW+VovM7QChXskQQVqY9W3POsZgtsH/yw1MxLL3b3J/ k9xeGkaGG0h2NZqX8eAfTU7angGeVuqVO/oJycNU03iGE7MAJxdpUcZS20Wn0opfUgEpENN6EJ4 LM9Q= X-Google-Smtp-Source: AGHT+IF/JYJwLGusBZE6ZQiCZUMiBd7LpwUI0ywF3NdwmlzQTjlPM3x1BEfexTaKkK0dDsPT9DRjQQ== X-Received: by 2002:a17:902:e886:b0:227:eb61:34b8 with SMTP id d9443c01a7336-227eb615177mr24791115ad.25.1742925660247; Tue, 25 Mar 2025 11:01:00 -0700 (PDT) Received: from LOCLAP699.locus-rst-dev-locuspark.locus ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-227811bae9asm93770515ad.138.2025.03.25.11.00.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Mar 2025 11:00:59 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v3 05/10] blacklist: add new blacklist reason, ROAM_REQUESTED Date: Tue, 25 Mar 2025 11:00:36 -0700 Message-Id: <20250325180041.238676-5-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250325180041.238676-1-prestwoj@gmail.com> References: <20250325180041.238676-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 This adds a new (less severe) blacklist reason as well as an option to configure the timeout. This blacklist reason will be used in cases where a BSS has requested IWD roam elsewhere. At that time a new blacklist entry will be added which will be used along with some other criteria to determine if IWD should connect/roam to that BSS again. Now that we have multiple blacklist reasons there may be situations where a blacklist entry already exists but with a different reason. This is going to be handled by the reason severity. Since we have just two reasons we will treat a connection failure as most severe and a roam requested as less severe. This leaves us with two possible situations: 1. BSS is roam blacklisted, then gets connection blacklisted: The reason will be "promoted" to connection blacklisted. 2. BSS is connection blacklisted, then gets roam blacklisted: The blacklist request will be ignored --- src/blacklist.c | 27 +++++++++++++++++++++++++-- src/blacklist.h | 7 +++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/src/blacklist.c b/src/blacklist.c index 2539c5e0..98713095 100644 --- a/src/blacklist.c +++ b/src/blacklist.c @@ -45,6 +45,7 @@ static uint64_t blacklist_multiplier; static uint64_t blacklist_initial_timeout; +static uint64_t blacklist_roam_initial_timeout; static uint64_t blacklist_max_timeout; struct blacklist_entry { @@ -66,6 +67,8 @@ static uint64_t get_reason_timeout(enum blacklist_reason reason) switch (reason) { case BLACKLIST_REASON_CONNECT_FAILED: return blacklist_initial_timeout; + case BLACKLIST_REASON_ROAM_REQUESTED: + return blacklist_roam_initial_timeout; default: l_warn("Unhandled blacklist reason: %u", reason); return 0; @@ -132,8 +135,20 @@ void blacklist_add_bss(const uint8_t *addr, enum blacklist_reason reason) entry = l_queue_find(blacklist, match_addr, addr); if (entry) { - uint64_t offset = l_time_diff(entry->added_time, - entry->expire_time); + uint64_t offset; + + if (reason < entry->reason) { + l_debug("Promoting "MAC" blacklist to reason %u", + MAC_STR(addr), reason); + entry->reason = reason; + } else if (reason > entry->reason) { + l_debug("Ignoring blacklist extension of "MAC", " + "current blacklist status is more severe!", + MAC_STR(addr)); + return; + } + + offset = l_time_diff(entry->added_time, entry->expire_time); offset *= blacklist_multiplier; @@ -196,6 +211,14 @@ static int blacklist_init(void) /* For easier user configuration the timeout values are in seconds */ blacklist_initial_timeout *= L_USEC_PER_SEC; + if (!l_settings_get_uint64(config, "Blacklist", + "InitialRoamRequestedTimeout", + &blacklist_roam_initial_timeout)) + blacklist_roam_initial_timeout = BLACKLIST_DEFAULT_TIMEOUT; + + /* For easier user configuration the timeout values are in seconds */ + blacklist_roam_initial_timeout *= L_USEC_PER_SEC; + if (!l_settings_get_uint64(config, "Blacklist", "Multiplier", &blacklist_multiplier)) diff --git a/src/blacklist.h b/src/blacklist.h index a87e5eca..f5c899e0 100644 --- a/src/blacklist.h +++ b/src/blacklist.h @@ -26,6 +26,13 @@ enum blacklist_reason { * connect to it via autoconnect */ BLACKLIST_REASON_CONNECT_FAILED, + /* + * This type of blacklist is added when a BSS requests IWD roams + * elsewhere. This is to aid in preventing IWD from roaming/connecting + * back to that BSS in the future unless there are no other "good" + * candidates to connect to. + */ + BLACKLIST_REASON_ROAM_REQUESTED, }; void blacklist_add_bss(const uint8_t *addr, enum blacklist_reason reason); From patchwork Tue Mar 25 18:00:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 14029340 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0C4592641DB for ; Tue, 25 Mar 2025 18:01:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742925664; cv=none; b=Hsbi2e/7FHIZFzJQyB/C7QbtPd+kyvA4ZjDyvisDaK9ku0JbECXkhGcw6rELWS9s3VVazZhZCucR++cgcNcFLZX7EULQTDCKFFWssTr0PLp3fP+mp2/14DZWmOp2OSMmitWEtWPegI1TsAl16FIphzY7qbnVku45afh2rWTMoTg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742925664; c=relaxed/simple; bh=xJw8fzLY1QOp9k4C09DNl1nVXAxf2RpfpK3Wm+/TKvs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=CJxSzhzIpYqdwQDImk8BxN4MlSrnTj7X+f43PTmEGUBNr0I8x+PrwoDUCdh7m+KXMoo50fvufLZm3SHh2od+nmQBxfhIl9Jp65/Cp46De5CL1xP996+d+MlED5Li8jKOXfE0hY7W1sOIg9Z717ezImmpMSYmRydRC4TYebLGrJo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=j++fH1je; arc=none smtp.client-ip=209.85.214.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="j++fH1je" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-22580c9ee0aso122622195ad.2 for ; Tue, 25 Mar 2025 11:01:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742925662; x=1743530462; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=7afZSfqph7WYiyk1RsbI0lhF++mY2dDXwnL/R2D56yA=; b=j++fH1je0oAj2f3gADBsCvq1R6q/yRSGJSg3wyrQpJk/eax8LtStkrSPBkN6iOO33a lVXJTJY3lT4eakzjmCjKxZRd52wOsGyFCVBKN8IFD0kZ6AJjJIIdKAh0xc4CZgo1PNio FnLLPxH9uyXbR04jLdxeG17Pl9s54zpYuMg1tsuD4hX+vqs7BhhdVxjp4fPivrg+rR6t BENQunEJ2+Qm+a5LcCGnUjgClWfw/HitDxe+5DLMdlwX6K9k/waF565Nk9IlXMV6jYqt yBx/hBKsRqkvnpTD3U84nnrQZPiLSYSBDRymDhcGfR7b085EsHMmmbiHkJAMk0I00ofy nQcw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742925662; x=1743530462; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=7afZSfqph7WYiyk1RsbI0lhF++mY2dDXwnL/R2D56yA=; b=jx1wbjaAvFvjtETcweJsOQMhsQ7mgIXooD3UeGePSRPEyL6+osUOQyr8cE0KntWiS+ GAgolF7Bl/egy/xnsd87jW+NtkjXU7Jh+4tT/6Foh0jEsCww8mBNrp00sXXyXGUJEZqJ xE1wPVxwZ5WMs7fE+7R3RgCpGqwht0gehm6lIiNEjceLmumYcQVP6uvF5S7cF5dfrPH7 qNB45ndEGJsLpOhRNKT8OmiSBS1K+VNGTqvJY1fbe2sHarWswnWcOfnX+CZib5PdMd7S h1C8wx9erMlIv+LfSj6vnoQ67wGyfOSP4kzjuy/oPtj7tdVwan5NTTyK5ylTkCWrr8/U ul5w== X-Gm-Message-State: AOJu0Ywxz+g7Vnniq8I/y6JOmjvftZ0j/l6deXyCzaiASMtUtrX693Os SFAAkLNePG2bc21/NKH8/FVJKPZvJ+XnXRozabfpfDFlGy4cpx3UiPa9lg== X-Gm-Gg: ASbGncsgzEs/7v8ky14QsZ4vy3VFJ5su9amlN2y1x+Cfs3Yq2/V6u7rLAjHulurJ5au +q5mKIkuy8PvrUPPZXmeek7IDTgL57PrwZBgLWx2wXc+OsP6+YBSRjAl5qlMtwC/GXVOiQf1Pp2 JPJmKBzisHwit7HIeEQbdaokuA1+4EaY82Cxt1vjxO1nkUGkecAWR3EWle7irK8TUSvEms25Dj2 g8lpxPGWKeA41qmIX5jjcVmwCOfQQvu3KoT+RXKGM1eB5B2XycqYIwrVJ98I/ZhXMVK+ucynMhs qg4zAgKwuSuQWFfwFec/6NptSSOFhrPm0ocXLwSrCb44LKD9DqbRLKB4cU6h6H1WvUi8Bgg4br7 qrOo= X-Google-Smtp-Source: AGHT+IFzcdfUVX7yG8sQdtn0tAkRziPDdyaflB6NQmX7PLI+YrC3QvAmp0Z0Ulo/zZHVY18ELdZUUg== X-Received: by 2002:a17:902:ce0f:b0:216:2bd7:1c2f with SMTP id d9443c01a7336-22780c7ba39mr218941445ad.18.1742925661789; Tue, 25 Mar 2025 11:01:01 -0700 (PDT) Received: from LOCLAP699.locus-rst-dev-locuspark.locus ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-227811bae9asm93770515ad.138.2025.03.25.11.01.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Mar 2025 11:01:01 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v3 06/10] netdev: add netdev_get_low_signal_thresholds Date: Tue, 25 Mar 2025 11:00:37 -0700 Message-Id: <20250325180041.238676-6-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250325180041.238676-1-prestwoj@gmail.com> References: <20250325180041.238676-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 --- src/netdev.c | 9 +++++++++ src/netdev.h | 1 + 2 files changed, 10 insertions(+) diff --git a/src/netdev.c b/src/netdev.c index 2a6d94fc..31ccf9ab 100644 --- a/src/netdev.c +++ b/src/netdev.c @@ -463,6 +463,15 @@ uint8_t netdev_get_rssi_level_idx(struct netdev *netdev) return netdev->cur_rssi_level_idx; } +void netdev_get_low_signal_thresholds(int *threshold, int *threshold_5g) +{ + if (threshold) + *threshold = LOW_SIGNAL_THRESHOLD; + + if (threshold_5g) + *threshold_5g = LOW_SIGNAL_THRESHOLD_5GHZ; +} + static void netdev_set_powered_result(int error, uint16_t type, const void *data, uint32_t len, void *user_data) diff --git a/src/netdev.h b/src/netdev.h index 6299934e..3962dc93 100644 --- a/src/netdev.h +++ b/src/netdev.h @@ -158,6 +158,7 @@ const char *netdev_get_name(struct netdev *netdev); bool netdev_get_is_up(struct netdev *netdev); const char *netdev_get_path(struct netdev *netdev); uint8_t netdev_get_rssi_level_idx(struct netdev *netdev); +void netdev_get_low_signal_thresholds(int *threshold, int *threshold_5g); struct handshake_state *netdev_handshake_state_new(struct netdev *netdev); struct handshake_state *netdev_get_handshake(struct netdev *netdev); From patchwork Tue Mar 25 18:00:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 14029341 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A2E46263F4E for ; Tue, 25 Mar 2025 18:01:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742925666; cv=none; b=K6Ft4UYh6DN0IB5i77z/J66iWxzj8fgQP8KOECi0lNFOwVsFPM3lwnba2XOtMc98r7ufO0LC967F2xqtV1o8UU7McBTkKl2DBaeL9yGbj75JPpjpdxxIF/hXwJLS3WraWpcUaPG4+UV3OflTmx/iFQq7FWvKHurSfC85IrC2280= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742925666; c=relaxed/simple; bh=9GdPPeyK/2h26/o+1gsaDBW3+lf82h40D8GWVHdUOQ4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=uiIAm9F6YmOq0m7gskl3LusqLvSkc/4tv2SgqzJSh1ErQh1cIAAFzNw/1Rr+iq1f7niLzNT3it/bwgAh4XhAyRvQm8Tjb3MSRsMA+sevtUIcB8I1t+t5OCLNg6JAobIHiO2evUnS2bnTZVG6jdnLBhGwpnPZqouXD8dcF2yBi3U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=KHhVM2TU; arc=none smtp.client-ip=209.85.214.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="KHhVM2TU" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-2255003f4c6so116114905ad.0 for ; Tue, 25 Mar 2025 11:01:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742925664; x=1743530464; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=E5geqpT6JYJy07SCLDyr6LqDtVr7GPALCmJXy/zzVbI=; b=KHhVM2TU0GHgjBmMlOyFDrw6FU6CxDtsVCWKQMN0mAE7+6QK0i+yzjPnj2ZIttqXNy 5MFn0C3GYlaw1jyigzDA7YCeES1pXno3gBdj+Llm82WO/OtrxmBhDdqgcAcRDZAz3Xkj a3pJRVTVfSCDkpPCifG0JtSbgkTifaIIiIt025VK+KdmMuwUzKjblzQx+Z5i2vDEw5Yy kUcikAmgj2UYLuoH/yCOC4I2Q+dgmLSkbJymCnGlZSVp1iMstqUVf3NX95858hTG2NWv 8RYuRYDxOMVetPFnREVFQrzUqAbXzSepXcsmazVUSaeGdzAyG3TADO+xWDnNLPtb2CF2 t9+g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742925664; x=1743530464; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=E5geqpT6JYJy07SCLDyr6LqDtVr7GPALCmJXy/zzVbI=; b=WWNXGWTmyaQtxAzsQO+PLq9cG1FPIYAyP5RKGbfqeSIXWaaUWsQ7kfD2Z3EoTLlkS3 swjFgJoG9c3yh2OOGDo482U8vavcXhoUMA8K5e/RHahwlTs4xuGxRNDeDHgYbpml3mOb qe67rlvn4sJYSbTKji1/ihChQi4nI5+ajNE35r/GfXvbYaKTaNCZuDMXRN/Ma0WNHBIf TpN+IYzvykXv+ndJ1HHhU+gjTqTkEGxuRh38NFR+fEwcC+4OMs7VeNUVS2eThPpXg4il rY4mlR9zFsMLfbT50csoOP8dcGWPqhsnL9VtFlZf1+mVDFUrEu4ODhhG6QPN1RBf1Vwr vlUg== X-Gm-Message-State: AOJu0YyVdEJ8AKyl65EJa5zWmPd2rVbkXY/C4MLlI9LCnAwfajVw9LAj QIMGGpb8AE+l08JffId+Ys+henhSVloTmvXIJL+rD8UHXkKIaThafreHBA== X-Gm-Gg: ASbGncud76EyrkOQASEFkWusVogibzdIfF3MnwpkuBVDrzU1KdOS+txi+hpV6RQGfaB 7GHXczat8VSyQxhBPp+3yfeAHRJ+hQ55hebx+FF21a3tZnyFRw1k8D5c8aIAuADff3sctFrx3Ym uWbKaQH7p6TcF6KHLXLME9YXdnp+/ARghIrKDfwEjyxkqEY5Tef/hx7kP+oxzw8YA+77iMmUn6t gM26YRQZFUKSUv6T0dTNEAJSZ0Pa0AdFvs4giq8Hgnqps2t1EZaZjnUqP64aw5akTxAZWqEGwOT 5wU7W8HkSrehHF4W3iNkHserJg8dy6Z27/2ZP4dJMk0KHdtDCjpAwGR12RGnMNDxgYQWoi0tk8I kUzI= X-Google-Smtp-Source: AGHT+IFP9l4hkFQ+rPok5Rd39KBmlyQDfXPwiZEGQYKId9LDbwDNU5B88lET7ssQ38rXNtxvDGDlEg== X-Received: by 2002:a17:902:db0a:b0:224:de2:7fd0 with SMTP id d9443c01a7336-22780da5a37mr275623235ad.25.1742925663413; Tue, 25 Mar 2025 11:01:03 -0700 (PDT) Received: from LOCLAP699.locus-rst-dev-locuspark.locus ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-227811bae9asm93770515ad.138.2025.03.25.11.01.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Mar 2025 11:01:03 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v3 07/10] station: roam blacklist BSS's, and consider when roaming Date: Tue, 25 Mar 2025 11:00:38 -0700 Message-Id: <20250325180041.238676-7-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250325180041.238676-1-prestwoj@gmail.com> References: <20250325180041.238676-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 If the BSS is requesting IWD roam elsewhere add this BSS to the blacklist using BLACKLIST_REASON_ROAM_REQUESTED. This will lower the chances of IWD roaming/connecting back to this BSS in the future. This then allows IWD to consider this blacklist state when picking a roam candidate. Its undesireable to fully ban a roam blacklisted BSS, so some additional sorting logic has been added. Prior to comparing based on rank, BSS's will be sorted into 3 groups: Optimal - Not roam blacklisted, and above the roaming threshold Above Threshold - May be blacklisted, and above the roaming threshold Below Threshold - BSS is below the roaming threshold --- src/station.c | 88 ++++++++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 84 insertions(+), 4 deletions(-) diff --git a/src/station.c b/src/station.c index e2ed78f3..e3c7c189 100644 --- a/src/station.c +++ b/src/station.c @@ -155,6 +155,57 @@ struct anqp_entry { uint32_t pending; }; +/* + * Rather than sorting BSS's purely based on ranking a higher level grouping + * is used. The purpose of this higher order grouping is the consider the BSS's + * roam blacklist status. The roam blacklist is a "soft" blacklist in that we + * still should connect to these BSS's if they are the only "good" option. + * The question here is: what makes a BSS "good" vs "bad". + * + * For an initial (probably nieve) approach here we can use the RoamThreshod[5G] + * and sort BSS's into "above" or "below" this threshold. Within each of these + * groups a BSS may be blacklisted, meaning it should get sorted lower on the + * list compared to others within the same group. + * + * Since we have several call sites needing to check/compare these groupings + * a bitmask can be used to describe the grouping: + * + * Each group will have 2 bits. The lower order bit signifies the BSS is in the + * group, but also blacklisted. The higher order bit signifies the BSS is in + * the group, but not blacklisted. The bitmask between two BSS's can then be + * compared directly similar to rank. + */ + +#define UNDER_THRESHOLD_BIT 1 +#define ABOVE_THRESHOLD_BIT 3 + +static uint32_t evaluate_bss_group(const uint8_t *addr, uint32_t freq, + int16_t signal_strength) +{ + int threshold; + int signal = signal_strength / 100; + bool roam_blacklist; + uint32_t mask = 0; + + if (blacklist_contains_bss(addr, BLACKLIST_REASON_CONNECT_FAILED)) + return mask; + + roam_blacklist = blacklist_contains_bss(addr, + BLACKLIST_REASON_ROAM_REQUESTED); + + if (freq > 4000) + netdev_get_low_signal_thresholds(NULL, &threshold); + else + netdev_get_low_signal_thresholds(&threshold, NULL); + + if (signal >= threshold) + set_bit(&mask, ABOVE_THRESHOLD_BIT - roam_blacklist); + else + set_bit(&mask, UNDER_THRESHOLD_BIT - roam_blacklist); + + return mask; +} + /* * Used as entries for the roam list since holding scan_bss pointers directly * from station->bss_list is not 100% safe due to the possibility of the @@ -164,11 +215,13 @@ struct roam_bss { uint8_t addr[6]; uint16_t rank; int32_t signal_strength; + uint32_t group; bool ft_failed: 1; }; static struct roam_bss *roam_bss_from_scan_bss(const struct scan_bss *bss, - uint16_t rank) + uint16_t rank, + uint32_t group) { struct roam_bss *rbss = l_new(struct roam_bss, 1); @@ -176,6 +229,7 @@ static struct roam_bss *roam_bss_from_scan_bss(const struct scan_bss *bss, rbss->rank = rank; rbss->signal_strength = bss->signal_strength; rbss->ft_failed = false; + rbss->group = group; return rbss; } @@ -184,6 +238,12 @@ static int roam_bss_rank_compare(const void *a, const void *b, void *user_data) { const struct roam_bss *new_bss = a, *bss = b; + if (bss->group > new_bss->group) + return 1; + else if (bss->group < new_bss->group) + return -1; + + /* BSS's both have the same group, sort by rank */ if (bss->rank == new_bss->rank) return (bss->signal_strength > new_bss->signal_strength) ? 1 : -1; @@ -2805,6 +2865,7 @@ static bool station_roam_scan_notify(int err, struct l_queue *bss_list, struct handshake_state *hs = netdev_get_handshake(station->netdev); struct scan_bss *current_bss = station->connected_bss; struct scan_bss *bss; + uint32_t cur_bss_group = 0; double cur_bss_rank = 0.0; static const double RANK_FT_FACTOR = 1.3; uint16_t mdid; @@ -2835,6 +2896,9 @@ static bool station_roam_scan_notify(int err, struct l_queue *bss_list, bss = l_queue_find(bss_list, bss_match_bssid, current_bss->addr); if (bss && !station->ap_directed_roaming) { cur_bss_rank = bss->rank; + cur_bss_group = evaluate_bss_group(current_bss->addr, + current_bss->frequency, + current_bss->signal_strength); if (hs->mde && bss->mde_present && l_get_le16(bss->mde) == mdid) cur_bss_rank *= RANK_FT_FACTOR; @@ -2859,6 +2923,9 @@ static bool station_roam_scan_notify(int err, struct l_queue *bss_list, while ((bss = l_queue_pop_head(bss_list))) { double rank; struct roam_bss *rbss; + uint32_t group = evaluate_bss_group(bss->addr, + bss->frequency, + bss->signal_strength); station_print_scan_bss(bss); @@ -2889,7 +2956,15 @@ static bool station_roam_scan_notify(int err, struct l_queue *bss_list, if (hs->mde && bss->mde_present && l_get_le16(bss->mde) == mdid) rank *= RANK_FT_FACTOR; - if (rank <= cur_bss_rank) + /* + * First check the group: + * - If worse, disregard BSS candidate + * - If better, keep BSS candidate + * - If equal, compare based on rank + */ + if (group < cur_bss_group) + goto next; + else if (group == cur_bss_group && rank <= cur_bss_rank) goto next; /* @@ -2898,7 +2973,7 @@ static bool station_roam_scan_notify(int err, struct l_queue *bss_list, */ station_update_roam_bss(station, bss); - rbss = roam_bss_from_scan_bss(bss, rank); + rbss = roam_bss_from_scan_bss(bss, rank, group); l_queue_insert(station->roam_bss_list, rbss, roam_bss_rank_compare, NULL); @@ -3268,6 +3343,10 @@ static void station_ap_directed_roam(struct station *station, l_timeout_remove(station->roam_trigger_timeout); station->roam_trigger_timeout = NULL; + blacklist_add_bss(station->connected_bss->addr, + BLACKLIST_REASON_ROAM_REQUESTED); + station_debug_event(station, "ap-roam-blacklist-added"); + if (req_mode & WNM_REQUEST_MODE_PREFERRED_CANDIDATE_LIST) { l_debug("roam: AP sent a preferred candidate list"); station_neighbor_report_cb(station->netdev, 0, body + pos, @@ -5344,7 +5423,8 @@ static bool station_force_roam_scan_notify(int err, struct l_queue *bss_list, /* The various roam routines expect this to be set from scanning */ station->preparing_roam = true; l_queue_push_tail(station->roam_bss_list, - roam_bss_from_scan_bss(target, target->rank)); + roam_bss_from_scan_bss(target, target->rank, + 0xffff)); station_update_roam_bss(station, target); From patchwork Tue Mar 25 18:00:39 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 14029342 Received: from mail-pj1-f49.google.com (mail-pj1-f49.google.com [209.85.216.49]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 76F90264600 for ; Tue, 25 Mar 2025 18:01:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.49 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742925667; cv=none; b=D1IKLDwPjOT7JmP9zkvXUzj4Hr19gUTw20emGvnTH/eTYO6zr3FOjfrmeDe67kF8qvBCiuqXCsOeLQr+KnS9ptlTEVg/PmcTnkSz7XDbTsP5LXjMuvoLV+QuJm3iT7Q+vORtkAmQlNLKscSn9Wb379BEss8TVGPNKMNDYJzaVRk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742925667; c=relaxed/simple; bh=nELu9OFTEa6XsAiLRXtpzRqBbfDJQGEgP2eLgbBhwz4=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=j3xwNSDxiSj9hOrCBIaJ8D7FreOWhav7Uty2gZm7qEby/oFVM7tuTATftNK0l2ykREo92PvOXkjr+q8npppa4rRHNNVYppkwddwv/YlQCvzPx5qs8uWHKco/2rjsvU9XFUOU7GSlgn4F+oDZP9D5nhxQYJPEcELgQ9k3134e5W8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=dH6G9sim; arc=none smtp.client-ip=209.85.216.49 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dH6G9sim" Received: by mail-pj1-f49.google.com with SMTP id 98e67ed59e1d1-3035858c687so3295252a91.2 for ; Tue, 25 Mar 2025 11:01:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742925665; x=1743530465; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=JN3iebsV26wS0QMcVWCeeCferANC3ioEY1u+4hwA2SQ=; b=dH6G9simvnBBbRmCASH7ehkJUqc6kt24Wkj1gzX7Fuf+5X0tCv07R6CySSwSd4GIw3 9wDL6MnY0sHlb22eXUgBoUZNZm/6dlw4rvSzLPFQnjIw4X8/UC7/YlAeWWVbFoMCRrA/ x7eyDxmZq1LZrSbtWo4+qxztvbxUwhQPvtjTjSqbmmB0XWzX/o3QaQsDmhoMxkgYtbxh FmqjNxj7XPG+E4UiAb+G4SPDtPgsuqTdR6WQfSwA7uug0hYYkNE+Y67yHZnPkRJNe9VF +PnTMvuhpm4Qv1iVNLB17WObIFN7NK+w+XV6VCa6+qwk7o9en3UL9p14wIX8EyGJuF/x 9S/A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742925665; x=1743530465; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=JN3iebsV26wS0QMcVWCeeCferANC3ioEY1u+4hwA2SQ=; b=AM0vWfBahcxF6YhcAoL5uRcXxH5UE4Fg6uMy1ltiHyTTr8ZSO02TyXQVQksUphjt6C Ud854TMevdM9x5nwpGm+UT+f2rfCeNYEbBnrpslJvcJo4mT4vXgLOYw3RW9ObFDJRQNv pYyRh5GTFwlXJYsFD9dxZ5T7nhjEkkhFDDQD+MulW9UTkLW6/tn9GHb1OEJMw8s8YM6q 1TnUeFRmzepv2JLCbzXVIRR+kFLvHe8IozHVw/Ev6QbSVD3SQhjCJO9pABaRpmmW/Y5C bYVKInlkBtO1k3lTmaVuTlNhXFS7gA6/1ydqo/XLxpxRvqrELdE16lKhdZWwxIlD7wXg Wp1w== X-Gm-Message-State: AOJu0YwUtuuuRmpYb1wdOzCZuGmOgwvrk5O3PnQjOduLRfMrUTZ8HB9v e0eLGpJ275eYTdpJZc1ICthBOnBHX8mvlt0zT0qFrR+RKbeQ2d3kLEqEWQ== X-Gm-Gg: ASbGncuH5J0pzJnPjcwTbb8/iXNRgEKshnGWrZho4wJnPimdxl8Y3n5am9r1JbI85Kj poBY+UBkdh6cU1NsgMn2hpKkA8TCNuTj2pxRUK/v+t4nfYckJGhlC0GA3wIki+gDanx0loQU7qz cNFuBB1XcNFf1QCyA/L/svihZieeNgWDCCDuIAXivj7BQA4ZbLrv+S8geBZAAYyniAfambFWZmJ /MXQ8sO6V0rLbDV8UgIlW9tx3/IYSx53aDqni6hVjzh3HSfos8zdNcdce9+mgEHzYyz33IM7yVO EtHJAQP87p8sfc+vCvoYmHmaVqrM8EiqVmm8FF/L/qPzDwkOKCHOzcx6QhOc3aDhsJevIR8SfSA 3WAk= X-Google-Smtp-Source: AGHT+IEy0TE+tzsdchfUduwz8/wOI9M+wcQM+xVaTTOTaGuY965XKe+VUGCCU6mNgCG89WMzMZ7Wug== X-Received: by 2002:a17:90b:510e:b0:301:1bce:c255 with SMTP id 98e67ed59e1d1-3030fee56bdmr26827798a91.27.1742925664995; Tue, 25 Mar 2025 11:01:04 -0700 (PDT) Received: from LOCLAP699.locus-rst-dev-locuspark.locus ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-227811bae9asm93770515ad.138.2025.03.25.11.01.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Mar 2025 11:01:04 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v3 08/10] station: roam blacklist AP even mid-roam Date: Tue, 25 Mar 2025 11:00:39 -0700 Message-Id: <20250325180041.238676-8-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250325180041.238676-1-prestwoj@gmail.com> References: <20250325180041.238676-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 If an AP directed roam frame comes in while IWD is roaming its still valuable to parse that frame and blacklist the BSS that sent it. This can happen most frequently during a roam scan while connected to an overloaded BSS that is requesting IWD roams elsewhere. --- src/station.c | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/src/station.c b/src/station.c index e3c7c189..c84b777a 100644 --- a/src/station.c +++ b/src/station.c @@ -3241,12 +3241,10 @@ static void station_ap_directed_roam(struct station *station, uint8_t req_mode; uint16_t dtimer; uint8_t valid_interval; + bool can_roam = !station_cannot_roam(station); l_debug("ifindex: %u", netdev_get_ifindex(station->netdev)); - if (station_cannot_roam(station)) - return; - if (station->state != STATION_STATE_CONNECTED) { l_debug("roam: unexpected AP directed roam -- ignore"); return; @@ -3310,8 +3308,13 @@ static void station_ap_directed_roam(struct station *station, * disassociating us. If either of these bits are set, set the * ap_directed_roaming flag. Otherwise still try roaming but don't * treat it any different than a normal roam. + * + * The only exception here is if we are in the middle of roaming + * (can_roam == false) since we cannot reliably know if the roam scan + * included frequencies from potential candidates in this request, + * forcing a roam in this case might result in unintended behavior. */ - if (req_mode & (WNM_REQUEST_MODE_DISASSOCIATION_IMMINENT | + if (can_roam && req_mode & (WNM_REQUEST_MODE_DISASSOCIATION_IMMINENT | WNM_REQUEST_MODE_TERMINATION_IMMINENT | WNM_REQUEST_MODE_ESS_DISASSOCIATION_IMMINENT)) station->ap_directed_roaming = true; @@ -3338,15 +3341,24 @@ static void station_ap_directed_roam(struct station *station, pos += url_len; } + blacklist_add_bss(station->connected_bss->addr, + BLACKLIST_REASON_ROAM_REQUESTED); + station_debug_event(station, "ap-roam-blacklist-added"); + + /* + * Validating the frame and blacklisting should still be done even if + * we are mid-roam. Its important to track the BSS requesting the + * transition so when the current roam completes IWD will be less likely + * to roam back to the current BSS. + */ + if (!can_roam) + return; + station->preparing_roam = true; l_timeout_remove(station->roam_trigger_timeout); station->roam_trigger_timeout = NULL; - blacklist_add_bss(station->connected_bss->addr, - BLACKLIST_REASON_ROAM_REQUESTED); - station_debug_event(station, "ap-roam-blacklist-added"); - if (req_mode & WNM_REQUEST_MODE_PREFERRED_CANDIDATE_LIST) { l_debug("roam: AP sent a preferred candidate list"); station_neighbor_report_cb(station->netdev, 0, body + pos, From patchwork Tue Mar 25 18:00:40 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 14029343 Received: from mail-pj1-f47.google.com (mail-pj1-f47.google.com [209.85.216.47]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 33DD1264600 for ; Tue, 25 Mar 2025 18:01:07 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.47 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742925669; cv=none; b=JGjENW6tyVW/T7RcnVFUUCMYBo9ZVRI65efChd2xZZ0b0A4t39onwftwREf5UIWimycVoQ4LKw5nQKNzMP4cGFPK3PlICH2U9w7ixzTt5T6CRPoBxp+MKRkuvZItJJDBkm+GsP4dHnwXYBNZlh/qwK/DEHfc81j6ikbgcQ6St0M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742925669; c=relaxed/simple; bh=pnbQrt4PtMvHv60jJ0ylzrQ+Yt/DtcEWqPzvwExtjNo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=SvB2mMsck66aWA+T0AHi1sc18aca8ZvFIz+mKJ45iT8g2ntzB+yJ33xkdIQROSEXK2/svh0W0xB22vKwfSqWHm0g6/gt1k6R2hJPqrVZr0/NXF+4cvIFFhItMkjWb8tHvy6xQCjM2J5QRERDt0EeF7H10OiXtXZpLVfNDMKLGyU= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=MDktzRh+; arc=none smtp.client-ip=209.85.216.47 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="MDktzRh+" Received: by mail-pj1-f47.google.com with SMTP id 98e67ed59e1d1-301493f45aeso9712932a91.1 for ; Tue, 25 Mar 2025 11:01:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742925667; x=1743530467; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=1Up2jn2cYXg1gvQUCSkIn+PUWJS2DLpMVIl2iP9SCqc=; b=MDktzRh+zJ/ndaqwfJKd7r08T2CEo5TJJwy5uzqeSEY0hxTFlt7gFYkA+hQRzNcZIw rmhd/6FQtQF27DpDvPTOEGMfiZeqQ6t6d8I8DE8jKr3v1jjhoE5/3kycyU1J0hydiJ4M v06WK9Kd8eMkDmz5XwC9up00yu2/RC0+sSPWTSP6u2nO2oTipFoM42aO2hgPnG2C2F01 lCyOPbaTab+GOj7hFMqGjfuzuG3WPxiK1wHEBQK2WH67X1Sm6aCdeQl3gi0HFhqbKNSv JudWY2de33Kb8rMv5onh8YwQOJFgpdZzHn+FXJcTbJ6I8ViijAdTku3eoxnpKbBWyc5d ihoA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742925667; x=1743530467; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=1Up2jn2cYXg1gvQUCSkIn+PUWJS2DLpMVIl2iP9SCqc=; b=cQ7izeBzmfCR+33nxHNfYFIHguW/GertcwxXlkBYvCbyVWQjZRJLcRIDrhJ9aD6GLP MN4wnXgzakUB8XzH98Sb/Cq+BYSXLlNh/urMizNoJ2sfrhY8rEa8VzPuoOfqB69Xzcqt 1UVLLfgLu+wxNgDmvdYe6+hYKTyv5hkeBoOwI/R2Ec6aBfpkkebb83SQ/57fix84DliR f24FjALEdRFcaeEm1WrWkvwiga7On9l4t20t00pCYh6M+xPG8cnpb6K2bATkSfR1A9Yt DguEWX5VOXbw1diOlmziKfVIAUqIQp8Det7rXeHhEInhvqRR7hRm6ZJ1J9eiWnnsGNNF 7sIQ== X-Gm-Message-State: AOJu0Yy07pN7uc4s+zcT4PN52X0rxlqfRoKYIhr696wuCVA0A21VcY8i uEjzEor79Vejo5ts94SdV2SSlWr0nE8yAOtUTwH2IpHxcZ90m4+q4y53KA== X-Gm-Gg: ASbGncvL4JucygO/sBCZw3MjfQqVDHovBPVdzgHGkSpjHFBrqKwBh8abwYq6CQsRXdj s6HA06FioN8rdp4vBC0av3GToRAiAAW1gun1RhHzzQLVpxPerTazuZLS26EEMjJcFHNE9vX5Gdr L3wyDMafu31CFf7mSYkO190W156CKW57wyX7ELVu/9rjwKYHwIt/8RyzPDr2jmmjrnAMPg6ItTZ eYORkTTDg8Ca4hEM7hMKNS1AuYEA3ot17zr5+2Hl4pUu6GmIZixbFD2QSh8Z2tJwQwxsJ4G8v26 WK0ugq8SOgMXH3+to3C1QjqM5zDu1F5Oq9MU4ccO662R5pz6N+7dnf/NNPoy7ka6PnTn1moTTXZ sO9ju+/5yC+q+0Q== X-Google-Smtp-Source: AGHT+IET4rDJce4huZeQDvORcrX/Z4fWH0dDWU44IMU1MQEF/xX+JEyzCk4RZ6r7mO1+cOurK7ePJg== X-Received: by 2002:a17:90b:134c:b0:2f2:a664:df20 with SMTP id 98e67ed59e1d1-3030fe6df8amr29970373a91.7.1742925666673; Tue, 25 Mar 2025 11:01:06 -0700 (PDT) Received: from LOCLAP699.locus-rst-dev-locuspark.locus ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-227811bae9asm93770515ad.138.2025.03.25.11.01.05 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Mar 2025 11:01:06 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v3 09/10] auto-t: add tests for AP roam blacklisting Date: Tue, 25 Mar 2025 11:00:40 -0700 Message-Id: <20250325180041.238676-9-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250325180041.238676-1-prestwoj@gmail.com> References: <20250325180041.238676-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 --- autotests/testAPRoam/connection_test.py | 56 +++--- autotests/testAPRoam/hw.conf | 2 + autotests/testAPRoam/main.conf.roaming | 5 + autotests/testAPRoam/roam_blacklist_test.py | 183 ++++++++++++++++++++ 4 files changed, 223 insertions(+), 23 deletions(-) create mode 100644 autotests/testAPRoam/main.conf.roaming create mode 100644 autotests/testAPRoam/roam_blacklist_test.py diff --git a/autotests/testAPRoam/connection_test.py b/autotests/testAPRoam/connection_test.py index a419f4aa..1f95fb96 100644 --- a/autotests/testAPRoam/connection_test.py +++ b/autotests/testAPRoam/connection_test.py @@ -11,52 +11,58 @@ from iwd import NetworkType from hostapd import HostapdCLI class Test(unittest.TestCase): - - def validate(self, expect_roam=True): - wd = IWD() - - devices = wd.list_devices(1) - device = devices[0] - - ordered_network = device.get_ordered_network('TestAPRoam') + def initial_connection(self): + ordered_network = self.device.get_ordered_network('TestAPRoam') self.assertEqual(ordered_network.type, NetworkType.psk) condition = 'not obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + self.wd.wait_for_object_condition(ordered_network.network_object, condition) - device.connect_bssid(self.bss_hostapd[0].bssid) + self.device.connect_bssid(self.bss_hostapd[0].bssid) condition = 'obj.state == DeviceState.connected' - wd.wait_for_object_condition(device, condition) + self.wd.wait_for_object_condition(self.device, condition) self.bss_hostapd[0].wait_for_event('AP-STA-CONNECTED') self.assertFalse(self.bss_hostapd[1].list_sta()) - self.bss_hostapd[0].send_bss_transition(device.address, - [(self.bss_hostapd[1].bssid, '8f0000005102060603000000')], + def validate_roam(self, from_bss, to_bss, expect_roam=True): + from_bss.send_bss_transition(self.device.address, + self.neighbor_list, disassoc_imminent=expect_roam) if expect_roam: from_condition = 'obj.state == DeviceState.roaming' to_condition = 'obj.state == DeviceState.connected' - wd.wait_for_object_change(device, from_condition, to_condition) + self.wd.wait_for_object_change(self.device, from_condition, to_condition) - self.bss_hostapd[1].wait_for_event('AP-STA-CONNECTED %s' % device.address) + to_bss.wait_for_event('AP-STA-CONNECTED %s' % self.device.address) else: - device.wait_for_event("no-roam-candidates") - - device.disconnect() - - condition = 'not obj.connected' - wd.wait_for_object_condition(ordered_network.network_object, condition) + self.device.wait_for_event("no-roam-candidates") def test_disassoc_imminent(self): - self.validate(expect_roam=True) + self.initial_connection() + self.validate_roam(self.bss_hostapd[0], self.bss_hostapd[1]) def test_no_candidates(self): - self.validate(expect_roam=False) + self.initial_connection() + # We now have BSS0 roam blacklisted + self.validate_roam(self.bss_hostapd[0], self.bss_hostapd[1]) + # Try and trigger another roam back, which shouldn't happen since now + # both BSS's are roam blacklisted + self.validate_roam(self.bss_hostapd[1], self.bss_hostapd[0], expect_roam=False) + + def setUp(self): + self.wd = IWD(True) + + devices = self.wd.list_devices(1) + self.device = devices[0] + + def tearDown(self): + self.wd = None + self.device = None @classmethod def setUpClass(cls): @@ -65,6 +71,10 @@ class Test(unittest.TestCase): cls.bss_hostapd = [ HostapdCLI(config='ssid1.conf'), HostapdCLI(config='ssid2.conf'), HostapdCLI(config='ssid3.conf') ] + cls.neighbor_list = [ + (cls.bss_hostapd[0].bssid, "8f0000005101060603000000"), + (cls.bss_hostapd[1].bssid, "8f0000005102060603000000"), + ] @classmethod def tearDownClass(cls): diff --git a/autotests/testAPRoam/hw.conf b/autotests/testAPRoam/hw.conf index 00a31063..46b1d4a8 100644 --- a/autotests/testAPRoam/hw.conf +++ b/autotests/testAPRoam/hw.conf @@ -1,5 +1,7 @@ [SETUP] num_radios=4 +hwsim_medium=true +start_iwd=false [HOSTAPD] rad0=ssid1.conf diff --git a/autotests/testAPRoam/main.conf.roaming b/autotests/testAPRoam/main.conf.roaming new file mode 100644 index 00000000..e19adbf3 --- /dev/null +++ b/autotests/testAPRoam/main.conf.roaming @@ -0,0 +1,5 @@ +[General] +RoamThreshold=-72 + +[Blacklist] +InitialRoamRequestedTimeout=20 diff --git a/autotests/testAPRoam/roam_blacklist_test.py b/autotests/testAPRoam/roam_blacklist_test.py new file mode 100644 index 00000000..883deea5 --- /dev/null +++ b/autotests/testAPRoam/roam_blacklist_test.py @@ -0,0 +1,183 @@ +#!/usr/bin/python3 + +import unittest +import sys + +sys.path.append('../util') +import iwd +from iwd import IWD, IWD_CONFIG_DIR +from iwd import NetworkType + +from hostapd import HostapdCLI +from hwsim import Hwsim + +class Test(unittest.TestCase): + def validate_connected(self, hostapd): + ordered_network = self.device.get_ordered_network('TestAPRoam') + + self.assertEqual(ordered_network.type, NetworkType.psk) + + condition = 'not obj.connected' + self.wd.wait_for_object_condition(ordered_network.network_object, condition) + + self.device.connect_bssid(hostapd.bssid) + + condition = 'obj.state == DeviceState.connected' + self.wd.wait_for_object_condition(self.device, condition) + + hostapd.wait_for_event('AP-STA-CONNECTED') + + def validate_ap_roamed(self, from_hostapd, to_hostapd): + from_hostapd.send_bss_transition( + self.device.address, self.neighbor_list, disassoc_imminent=True + ) + + from_condition = 'obj.state == DeviceState.roaming' + to_condition = 'obj.state == DeviceState.connected' + self.wd.wait_for_object_change(self.device, from_condition, to_condition) + + to_hostapd.wait_for_event('AP-STA-CONNECTED %s' % self.device.address) + + self.device.wait_for_event("ap-roam-blacklist-added") + + def test_roam_to_optimal_candidates(self): + # In this test IWD will naturally transition down the list after each + # BSS gets roam blacklisted. All BSS's are above the RSSI thresholds. + self.rule_ssid1.signal = -5000 + self.rule_ssid2.signal = -6500 + self.rule_ssid3.signal = -6900 + + # Connect to BSS0 + self.validate_connected(self.bss_hostapd[0]) + + # AP directed roam to BSS1 + self.validate_ap_roamed(self.bss_hostapd[0], self.bss_hostapd[1]) + + # AP directed roam to BSS2 + self.validate_ap_roamed(self.bss_hostapd[1], self.bss_hostapd[2]) + + def test_avoiding_under_threshold_bss(self): + # In this test IWD will blacklist BSS0, then roam the BSS1. BSS1 will + # then tell IWD to roam, but it should go back to BSS0 since the only + # non-blacklisted BSS is under the roam threshold. + self.rule_ssid1.signal = -5000 + self.rule_ssid2.signal = -6500 + self.rule_ssid3.signal = -7300 + + # Connect to BSS0 + self.validate_connected(self.bss_hostapd[0]) + + # AP directed roam to BSS1 + self.validate_ap_roamed(self.bss_hostapd[0], self.bss_hostapd[1]) + + # AP directed roam, but IWD should choose BSS0 since BSS2 is -73dB + self.validate_ap_roamed(self.bss_hostapd[1], self.bss_hostapd[0]) + + def test_connect_to_roam_blacklisted_bss(self): + # In this test a BSS will be roam blacklisted, but all other options are + # below the RSSI threshold so IWD should roam back to the blacklisted + # BSS. + self.rule_ssid1.signal = -5000 + self.rule_ssid2.signal = -8000 + self.rule_ssid3.signal = -8500 + + # Connect to BSS0 + self.validate_connected(self.bss_hostapd[0]) + + # AP directed roam, should connect to BSS1 as its the next best + self.validate_ap_roamed(self.bss_hostapd[0], self.bss_hostapd[1]) + + # Connected to BSS1, but the signal is bad, so IWD should try to roam + # again. BSS0 is still blacklisted, but its the only reasonable option + # since both BSS1 and BSS2 are below the set RSSI threshold (-72dB) + + from_condition = 'obj.state == DeviceState.roaming' + to_condition = 'obj.state == DeviceState.connected' + self.wd.wait_for_object_change(self.device, from_condition, to_condition) + + # IWD should have connected to BSS0, even though its roam blacklisted + self.bss_hostapd[0].wait_for_event('AP-STA-CONNECTED %s' % self.device.address) + + def test_blacklist_during_roam_scan(self): + # Tests that an AP roam request mid-roam results in the AP still being + # blacklisted even though the request itself doesn't directly trigger + # a roam. + self.rule_ssid1.signal = -7300 + self.rule_ssid2.signal = -7500 + self.rule_ssid3.signal = -8500 + + # Connect to BSS0 under the roam threshold so IWD will immediately try + # roaming elsewhere + self.validate_connected(self.bss_hostapd[0]) + + self.device.wait_for_event("roam-scan-triggered") + + self.bss_hostapd[0].send_bss_transition( + self.device.address, self.neighbor_list, disassoc_imminent=True + ) + self.device.wait_for_event("ap-roam-blacklist-added") + + # BSS0 should have gotten blacklisted even though IWD was mid-roam, + # causing IWD to choose BSS1 when it gets is results. + + from_condition = 'obj.state == DeviceState.roaming' + to_condition = 'obj.state == DeviceState.connected' + self.wd.wait_for_object_change(self.device, from_condition, to_condition) + + self.bss_hostapd[1].wait_for_event('AP-STA-CONNECTED %s' % self.device.address) + + def setUp(self): + self.wd = IWD(True) + + devices = self.wd.list_devices(1) + self.device = devices[0] + + + def tearDown(self): + self.wd = None + self.device = None + + + @classmethod + def setUpClass(cls): + IWD.copy_to_storage("main.conf.roaming", IWD_CONFIG_DIR, "main.conf") + IWD.copy_to_storage('TestAPRoam.psk') + hwsim = Hwsim() + + cls.bss_hostapd = [ HostapdCLI(config='ssid1.conf'), + HostapdCLI(config='ssid2.conf'), + HostapdCLI(config='ssid3.conf') ] + HostapdCLI.group_neighbors(*cls.bss_hostapd) + + rad0 = hwsim.get_radio('rad0') + rad1 = hwsim.get_radio('rad1') + rad2 = hwsim.get_radio('rad2') + + cls.neighbor_list = [ + (cls.bss_hostapd[0].bssid, "8f0000005101060603000000"), + (cls.bss_hostapd[1].bssid, "8f0000005102060603000000"), + (cls.bss_hostapd[2].bssid, "8f0000005103060603000000"), + ] + + + cls.rule_ssid1 = hwsim.rules.create() + cls.rule_ssid1.source = rad0.addresses[0] + cls.rule_ssid1.bidirectional = True + cls.rule_ssid1.enabled = True + + cls.rule_ssid2 = hwsim.rules.create() + cls.rule_ssid2.source = rad1.addresses[0] + cls.rule_ssid2.bidirectional = True + cls.rule_ssid2.enabled = True + + cls.rule_ssid3 = hwsim.rules.create() + cls.rule_ssid3.source = rad2.addresses[0] + cls.rule_ssid3.bidirectional = True + cls.rule_ssid3.enabled = True + + @classmethod + def tearDownClass(cls): + IWD.clear_storage() + +if __name__ == '__main__': + unittest.main(exit=True) From patchwork Tue Mar 25 18:00:41 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Prestwood X-Patchwork-Id: 14029344 Received: from mail-pj1-f44.google.com (mail-pj1-f44.google.com [209.85.216.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6CE7E2641DB for ; Tue, 25 Mar 2025 18:01:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.44 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742925670; cv=none; b=CnRBx3dNWl8StoOWsUj0Nhr3TSEG04NMVqDYW7iJuldbVHi00lmv5GdSxZlq35RxYk35/h9icfZdh6lo4LwQMC2QaZgfkjXDyeNBrdfGw/cQXjFtfZ4E7MkVeTHvuHqU4LE2ly3f31JlGVPmV3mDDqdV81Ol5XZV8AfWtNS+sGc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742925670; c=relaxed/simple; bh=MyM83L1eBpowQ6pWl7EN/W4VKQ1GrBqt0uY75TwPUAs=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=WLn843Ti3YErigbDM4gJ42CGWFIA8Xi04rVSA924vE2j/nxQ8PD8fYZzM5gAoUrffqEslrPwjxUQwQnlGJJQBcSQd6kAg8u9PhgMS0+rqJZLDtNztrDkO6op7FHc2GNmDJK/rbX2cJR9KPeR+BPlZfsUFtj7D/wKOGugui/BkIg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=cf/cCZlZ; arc=none smtp.client-ip=209.85.216.44 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="cf/cCZlZ" Received: by mail-pj1-f44.google.com with SMTP id 98e67ed59e1d1-301d6cbbd5bso10125703a91.3 for ; Tue, 25 Mar 2025 11:01:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1742925668; x=1743530468; darn=lists.linux.dev; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=ccTKIiVTHaYhZLj8hvKA0e5OsXRQ+klutkUMg9gJHMU=; b=cf/cCZlZsNeT/bmJhgUZNLZIUri2E10q911zODQHKniLGkmK9996mkFTnrUdJ0B9Jc ehCX2lJPdsuhqi9MXs8IAM0oaqOytDrWm28ulBHHZRT4m7hDJCGv8UH+Al2vRDRIZUjV R0MU6zy9olfyKV1l4ZMAk/xskGTq6WK5VjSZejmdlmh/ObpoGGerlrpTZsC/YBgcQNk1 06lne3B70C5nuWCnIGah4XHZlDwzPl/qQqiyyhvUcl7ob5bBDmu9PGI9l3P3gRGA7F81 qIuV25u/kHmLOqVD4fJrwB9qrT9oLib4508uKmb1FT8dmx2+Zg9vY3IoN8gkBP8RmajH BYRA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1742925668; x=1743530468; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ccTKIiVTHaYhZLj8hvKA0e5OsXRQ+klutkUMg9gJHMU=; b=Ld/MzwODdS2nMa+mw2OXvNyMd3MCs5fCxfoZ70/d4kZJBAIW/s3O8L6EfqAmoJrSgy E3JSTsvUht2xwwoOKDteMHlCdAu+b3fOptoeVxwSJWzGe4X6oeBAOopKU7Sj2IDiac2A Qv0za7IMI0YuwTrMJvrE20MQUjQhgm8E2h9F+YNq2AWz+tH2FozecGqlWspuqcbfyZNS dxTSmS5QB083wi5DQ1a1Ynxbr4ZUsf8Ga5lUYX9jZIuHBq2UVl3ulbfgoYvuePHwe1iD 5DYlRXVfhsibV59qydqaCjgS+EfAcBk4/qWpAvHNUNJ554A0IdXaPkQGMU39jqAfXvwA tleQ== X-Gm-Message-State: AOJu0Yxyp1QOmGyygpumDKD9irafHU+T2j6OkBuQO7GIkHI5RivbKdTm gvhnw+0S04jhDfuvPYakfi8i4NFg9vS/MYG9jMble5np6tIYb6XLWaHPmg== X-Gm-Gg: ASbGncugVDrCUGq0VBVgJrDG1h7wt79wB8vv617flTIyJVSmR2aIQpjICTs6EJl1by0 SdhOmKczWMkQA1o+qkmeKjtjFXnzQ7QPVvSeMdjT+NJn4TATRSisCd2IXsetrCarv/+FXt2mG6/ y+EGNdvSIbOj+SVd7gfOOS2gqVxs0fqyxqmdUadV4V45AgCgqmp8vtBq5CKJx6u+d0JrwVPXe7s RSnmUZUhRzb6m/FpOzqrImGufF5LOB9ZeCcDAtSdFhFnZondnWO82S0ts09VWG5qSsxKt2Xz2mQ tvzuJTGbwPeL1Pgp5IstNoGqX68HH2gzBpK1iNBIbeJzBTznzU+QT4RH0ziT1OuKF+fqJlcTEuL UjKw= X-Google-Smtp-Source: AGHT+IFhOEOs6yee9NaaTwg4pJy/Ch6kp6qeUKtz5fvSCt5oy3CQc9I2Ppui5rqI3pbAWYnQaWe8UA== X-Received: by 2002:a17:90b:540b:b0:2ff:52e1:c49f with SMTP id 98e67ed59e1d1-3030fef7845mr23844282a91.26.1742925668255; Tue, 25 Mar 2025 11:01:08 -0700 (PDT) Received: from LOCLAP699.locus-rst-dev-locuspark.locus ([152.193.78.90]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-227811bae9asm93770515ad.138.2025.03.25.11.01.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 25 Mar 2025 11:01:07 -0700 (PDT) From: James Prestwood To: iwd@lists.linux.dev Cc: James Prestwood Subject: [PATCH v3 10/10] doc: document InitialRoamRequestedTimeout Date: Tue, 25 Mar 2025 11:00:41 -0700 Message-Id: <20250325180041.238676-10-prestwoj@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250325180041.238676-1-prestwoj@gmail.com> References: <20250325180041.238676-1-prestwoj@gmail.com> Precedence: bulk X-Mailing-List: iwd@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 --- src/iwd.config.rst | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/iwd.config.rst b/src/iwd.config.rst index 895a1012..9761e8fd 100644 --- a/src/iwd.config.rst +++ b/src/iwd.config.rst @@ -292,6 +292,12 @@ control how long a misbehaved BSS spends on the blacklist. The initial time that a BSS spends on the blacklist. Setting this to zero will disable blacklisting functionality in IWD. + * - InitialRoamRequestedTimeout + - Values: uint64 value in seconds (default: **30**) + + The initial time that a BSS will be marked after a BSS requests a roam. + This is to aid in avoiding roaming back to BSS's which are likely + overloaded. Setting this to zero will disabled this form of blacklisting. * - Multiplier - Values: unsigned int value greater than zero, in seconds (default: **30**)