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..c09a504ff 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);
--
2.25.1
This is automated email and please do not reply to this email!
Dear submitter,
Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=646928
---Test result---
Test Summary:
CheckPatch FAIL 0.71 seconds
GitLint PASS 0.45 seconds
Prep - Setup ELL PASS 55.27 seconds
Build - Prep PASS 0.53 seconds
Build - Configure PASS 10.18 seconds
Build - Make PASS 1540.95 seconds
Make Check PASS 13.17 seconds
Make Check w/Valgrind PASS 531.99 seconds
Make Distcheck PASS 284.86 seconds
Build w/ext ELL - Configure PASS 10.16 seconds
Build w/ext ELL - Make PASS 1504.60 seconds
Incremental Build with patchesPASS 0.00 seconds
Details
##############################
Test: CheckPatch - FAIL
Desc: Run checkpatch.pl script with rule in .checkpatch.conf
Output:
btproxy: Allow to select multiple BT controllers
ERROR:SPACING: spaces required around that '>=' (ctx:WxV)
#114: FILE: tools/btproxy.c:581:
+ if (index >=0 &&
^
/github/workspace/src/12867964.patch total: 1 errors, 0 warnings, 95 lines checked
NOTE: For some of the reported defects, checkpatch may be able to
mechanically convert to the typical style using --fix or --fix-inplace.
/github/workspace/src/12867964.patch has style problems, please review.
NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO
NOTE: If any of the errors are false positives, please report
them to the maintainer, see CHECKPATCH in MAINTAINERS.
---
Regards,
Linux Bluetooth
Hi Frédéric,
On Thu, Jun 2, 2022 at 9:08 AM Frédéric Danis
<[email protected]> wrote:
>
> 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.
Does it keep the old behavior and adds the possibility to enter -i
command line option multiple times?
> ---
> tools/btproxy.c | 48 ++++++++++++++++++++++++++++++++++--------------
> 1 file changed, 34 insertions(+), 14 deletions(-)
>
> diff --git a/tools/btproxy.c b/tools/btproxy.c
> index 94ca1c7fd..c09a504ff 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;
> +}
Perhaps use util_get_uid?
> +
> +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);
> --
> 2.25.1
>
--
Luiz Augusto von Dentz
Hi Luiz,
On 02/06/2022 22:45, Luiz Augusto von Dentz wrote:
> Hi Frédéric,
>
> On Thu, Jun 2, 2022 at 9:08 AM Frédéric Danis
> <[email protected]> wrote:
>> 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.
> Does it keep the old behavior and adds the possibility to enter -i
> command line option multiple times?
Yes, it keeps old behavior when used without -i option, in this case it
will try to use the first controller available.
The only change from the old behavior is that when started with one or
more -i option it will not check if a client is already active, so no
"Active client already present" error message.
>> ---
>> tools/btproxy.c | 48 ++++++++++++++++++++++++++++++++++--------------
>> 1 file changed, 34 insertions(+), 14 deletions(-)
>>
>> diff --git a/tools/btproxy.c b/tools/btproxy.c
>> index 94ca1c7fd..c09a504ff 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;
>> +}
> Perhaps use util_get_uid?
Yes, this should simplify it
>> +
>> +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);
>> --
>> 2.25.1
>>
>
--
Frédéric Danis
Senior Software Engineer
Collabora Ltd.
Platinum Building, St John's Innovation Park, Cambridge CB4 0DS, United Kingdom
Registered in England & Wales, no. 5513718