Received: by 2002:a05:6358:45e:b0:b5:b6eb:e1f9 with SMTP id 30csp385406rwe; Wed, 31 Aug 2022 04:41:21 -0700 (PDT) X-Google-Smtp-Source: AA6agR5RJiA4YmOmVzWnC2N4mxtgqxmYvpjYRBS0PSvk0wcxVfi37e7aa7mh4GoY7qaI4+AKip16 X-Received: by 2002:a17:90b:3c8f:b0:1fd:e29c:d8d8 with SMTP id pv15-20020a17090b3c8f00b001fde29cd8d8mr2923698pjb.5.1661946081739; Wed, 31 Aug 2022 04:41:21 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661946081; cv=none; d=google.com; s=arc-20160816; b=kJToLYVG1g2vOO+ZtMCgZnuli0Qe68TxnIAJIvbGz/BbBaKhmWs2nFjc1ApmxcbHcw 9A9natSq1aSVYnuuLcu12W1M7K6dVn1PXLsIPtz8c6TMc+tSFrMZ4v7qltnbBl06ALnl 6A9vZ/HOq3zckonHKeKxidaqfIdoPUUWZWfbYwU/hOqecJYpJWJxiRDYNVuYY9qtdmFN IP8vrS33YcH1PUlVq7u2Ke9JLz0self1zumZMmOcHjq+tPmoWKSk41UHyD2PhNJbo2rk 5rczO/z5diClu2Cr/SBy71ZF3k8E1ByJM+WbsUS6OEnGbJwYNOWTOo5etlSUyz7MM/iJ sKGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:to:from; bh=0kgSx+KriwrTVVGy5+DXo2RylyziOzlySPEP/nJV6RY=; b=mwhLf6Tqfarr5TlLLYAyaOJnL3o/GZHuboaFOFWDif+pRdWuDdDzatXhXIiFS4kICG e4DQTlZyNPhi7pkJB7akqY1dSCvFrSglhF0J4qetQkyEITPZ9g5HZZFk097+wS/CXEVb OnaNfRCyiv+dVxwXiT2u5At2WkstUFdiXF3cWtk01lPTGzGNeVHyfQzw0DQdGf+9YcLb 9z0qD6iDjV0Yqo2rjg8dy+OhKIeej4O9A9x4PSCUMoXXbRtc9K0/6wlFLoGz97HGnV1V d22lJa3xssLfZU36xNGYZiSdgY1P8HQ2t7YKSAtgiiSMf7aC3OKzlUwR2ogxaUGurUOz BeUw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id lx15-20020a17090b4b0f00b001fe2b8a9c0dsi1869966pjb.6.2022.08.31.04.41.04; Wed, 31 Aug 2022 04:41:21 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-bluetooth-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229802AbiHaLgw (ORCPT + 99 others); Wed, 31 Aug 2022 07:36:52 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56460 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229555AbiHaLgv (ORCPT ); Wed, 31 Aug 2022 07:36:51 -0400 Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [IPv6:2001:4b98:dc4:8::225]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D080BA74CC for ; Wed, 31 Aug 2022 04:36:49 -0700 (PDT) Received: (Authenticated sender: hadess@hadess.net) by mail.gandi.net (Postfix) with ESMTPSA id 5AEEE1C0008 for ; Wed, 31 Aug 2022 11:36:48 +0000 (UTC) From: Bastien Nocera To: linux-bluetooth@vger.kernel.org Subject: [PATCH BlueZ v5 1/6] adapter: Keep track of whether the adapter is rfkill'ed Date: Wed, 31 Aug 2022 13:36:42 +0200 Message-Id: <20220831113647.85110-1-hadess@hadess.net> X-Mailer: git-send-email 2.37.2 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org Instead of only replying to D-Bus requests with an error saying the adapter is blocked, keep track of the rfkill being enabled or disabled so we know the rfkill state of the adapter at all times. --- src/adapter.c | 19 +++++++++++++++++-- src/adapter.h | 1 + src/rfkill.c | 8 ++++++-- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/adapter.c b/src/adapter.c index b453e86a0..ec76171b7 100644 --- a/src/adapter.c +++ b/src/adapter.c @@ -250,6 +250,7 @@ struct btd_adapter { uint32_t dev_class; /* controller class of device */ char *name; /* controller device name */ char *short_name; /* controller short name */ + bool blocked; /* whether rfkill is enabled */ uint32_t supported_settings; /* controller supported settings */ uint32_t pending_settings; /* pending controller settings */ uint32_t current_settings; /* current controller settings */ @@ -654,6 +655,8 @@ static void set_mode_complete(uint8_t status, uint16_t length, if (status != MGMT_STATUS_SUCCESS) { btd_error(adapter->dev_id, "Failed to set mode: %s (0x%02x)", mgmt_errstr(status), status); + if (status == MGMT_STATUS_RFKILLED) + adapter->blocked = true; adapter->pending_settings &= ~data->setting; return; } @@ -2914,10 +2917,12 @@ static void property_set_mode_complete(uint8_t status, uint16_t length, btd_error(adapter->dev_id, "Failed to set mode: %s (0x%02x)", mgmt_errstr(status), status); - if (status == MGMT_STATUS_RFKILLED) + if (status == MGMT_STATUS_RFKILLED) { dbus_err = ERROR_INTERFACE ".Blocked"; - else + adapter->blocked = true; + } else { dbus_err = ERROR_INTERFACE ".Failed"; + } g_dbus_pending_property_error(data->id, dbus_err, mgmt_errstr(status)); @@ -7548,6 +7553,9 @@ int btd_cancel_authorization(guint id) int btd_adapter_restore_powered(struct btd_adapter *adapter) { + if (adapter->blocked) + adapter->blocked = false; + if (btd_adapter_get_powered(adapter)) return 0; @@ -7556,6 +7564,13 @@ int btd_adapter_restore_powered(struct btd_adapter *adapter) return 0; } +int btd_adapter_set_blocked(struct btd_adapter *adapter) +{ + if (!adapter->blocked) + adapter->blocked = true; + return 0; +} + void btd_adapter_register_pin_cb(struct btd_adapter *adapter, btd_adapter_pin_cb_t cb) { diff --git a/src/adapter.h b/src/adapter.h index b09044edd..332c0b239 100644 --- a/src/adapter.h +++ b/src/adapter.h @@ -143,6 +143,7 @@ guint btd_request_authorization_cable_configured(const bdaddr_t *src, const bdad int btd_cancel_authorization(guint id); int btd_adapter_restore_powered(struct btd_adapter *adapter); +int btd_adapter_set_blocked(struct btd_adapter *adapter); typedef ssize_t (*btd_adapter_pin_cb_t) (struct btd_adapter *adapter, struct btd_device *dev, char *out, bool *display, diff --git a/src/rfkill.c b/src/rfkill.c index 2099c5ac5..93f8e0e12 100644 --- a/src/rfkill.c +++ b/src/rfkill.c @@ -61,6 +61,7 @@ static gboolean rfkill_event(GIOChannel *chan, struct rfkill_event event = { 0 }; struct btd_adapter *adapter; char sysname[PATH_MAX]; + bool blocked = false; ssize_t len; int fd, id; @@ -84,7 +85,7 @@ static gboolean rfkill_event(GIOChannel *chan, event.soft, event.hard); if (event.soft || event.hard) - return TRUE; + blocked = true; if (event.op != RFKILL_OP_CHANGE) return TRUE; @@ -122,7 +123,10 @@ static gboolean rfkill_event(GIOChannel *chan, DBG("RFKILL unblock for hci%d", id); - btd_adapter_restore_powered(adapter); + if (blocked) + btd_adapter_set_blocked(adapter); + else + btd_adapter_restore_powered(adapter); return TRUE; } -- 2.37.2