From patchwork Thu Jun 2 19:25:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Fr=C3=A9d=C3=A9ric_Danis?= X-Patchwork-Id: 578230 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 81DB8C43334 for ; Thu, 2 Jun 2022 19:25:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238574AbiFBTZo (ORCPT ); Thu, 2 Jun 2022 15:25:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33784 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238646AbiFBTZg (ORCPT ); Thu, 2 Jun 2022 15:25:36 -0400 Received: from bhuna.collabora.co.uk (bhuna.collabora.co.uk [46.235.227.227]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D81D02DCD for ; Thu, 2 Jun 2022 12:25:13 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) (Authenticated sender: fdanis) with ESMTPSA id 8BCE31F40859 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1654197912; bh=T3FRHGp9r7b+5pwSe9TnXPuza/fuuEJN4t+3VB4a7S0=; h=From:To:Subject:Date:From; b=aU1vCuTe/vCKf3ID1YmI42KNhC/uN5OOB/rXgHIih3j5I1pcoP8joP17/mh8tEsY7 z/WAvi0qQsYAk2bQg62GRRcvz1hOn5+0zQGUkq2THphBIxMhd2WnniXOaFUhkn9QKu LlxwIu3gfXYF7+IEvZ1ELOHwVxVr4lLOC8rgPw1JLuTibHLhdq2i725rcOrlvu6mR4 JPI96azeK37mULgB91DaG67WledxvcB9FigRqnRpyzwVt5cNCMVMXPcwnTr0yhDqkN xKAHttV/aatIAOkwcut/TdFNRXcEg+TKvmQqz+PX8vDg8GZ0LqdOnl4USbETp9hpC5 bRLdH9xr6EWng== From: =?utf-8?q?Fr=C3=A9d=C3=A9ric_Danis?= To: linux-bluetooth@vger.kernel.org Subject: [PATCH V2] btproxy: Allow to select multiple BT controllers Date: Thu, 2 Jun 2022 21:25:01 +0200 Message-Id: <20220602192501.90288-1-frederic.danis@collabora.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-bluetooth@vger.kernel.org When running on a computer with a real Bluetooth controller (e.g. hci0) and multiple emulators (e.g. hci1 and hci2) it isn't possible to use the emulators with 2 test-runner vms. If btproxy is started without index parameter the first test-runner will use hci0, and btprox can't be started with multiple index parameters (e.g. -i1 -i2). This patch allows to select the controllers to be used by btproxy. --- tools/btproxy.c | 48 ++++++++++++++++++++++++++++++++++-------------- 1 file changed, 34 insertions(+), 14 deletions(-) diff --git a/tools/btproxy.c b/tools/btproxy.c index 94ca1c7fd..3546603ac 100644 --- a/tools/btproxy.c +++ b/tools/btproxy.c @@ -48,6 +48,7 @@ struct sockaddr_hci { }; #define HCI_CHANNEL_USER 1 #define HCI_INDEX_NONE 0xffff +#define HCI_INDEX_MAX 15 static uint16_t hci_index = HCI_INDEX_NONE; static bool client_active = false; @@ -533,13 +534,28 @@ static bool setup_proxy(int host_fd, bool host_shutdown, return true; } -static int open_channel(uint16_t index) +static int get_next_hci_index(int index) +{ + while (++index <= HCI_INDEX_MAX) { + if (hci_index & (1 << index)) + return index; + } + + return -1; +} + +static int open_channel(int index) { struct sockaddr_hci addr; int fd, err; - if (index == HCI_INDEX_NONE) - index = 0; + if (index == HCI_INDEX_NONE) { + index = get_next_hci_index(-1); + if (index < 0) { + perror("No controller available"); + return -1; + } + } printf("Opening user channel for hci%u\n", index); @@ -561,9 +577,10 @@ static int open_channel(uint16_t index) /* Open next available controller if no specific index was * provided and the error indicates that the controller. */ - if (hci_index == HCI_INDEX_NONE && + index = get_next_hci_index(index); + if (index >= 0 && (err == -EBUSY || err == -EUSERS)) - return open_channel(++index); + return open_channel(index); perror("Failed to bind Bluetooth socket"); return -1; @@ -601,13 +618,7 @@ static void server_callback(int fd, uint32_t events, void *user_data) return; } - if (client_active && hci_index != HCI_INDEX_NONE) { - fprintf(stderr, "Active client already present\n"); - close(host_fd); - return; - } - - dev_fd = open_channel(hci_index); + dev_fd = open_channel(HCI_INDEX_NONE); if (dev_fd < 0) { close(host_fd); return; @@ -800,6 +811,7 @@ int main(int argc, char *argv[]) for (;;) { int opt; + int index; opt = getopt_long(argc, argv, "rc:l::u::p:i:aezdvh", main_options, NULL); @@ -844,7 +856,15 @@ int main(int argc, char *argv[]) usage(); return EXIT_FAILURE; } - hci_index = atoi(str); + index = atoi(str); + if (index > HCI_INDEX_MAX) { + fprintf(stderr, "Invalid controller index\n"); + usage(); + return EXIT_FAILURE; + } + if (hci_index == HCI_INDEX_NONE) + hci_index = 0; + hci_index |= 1 << index; break; case 'a': type = HCI_AMP; @@ -892,7 +912,7 @@ int main(int argc, char *argv[]) if (use_redirect) { printf("Creating local redirect\n"); - dev_fd = open_channel(hci_index); + dev_fd = open_channel(HCI_INDEX_NONE); } else { printf("Connecting to %s:%u\n", connect_address, tcp_port);