btproxy: Allow to select multiple BT controllers

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 keeps the old beahvior when used without -i option, in this case
it will try to use the first controller available.
It also allows to select multiple controllers to be used by btproxy.

Signed-off-by: Manika Shrivastava <manika.sh@samsung.com>
Signed-off-by: Ayush Garg <ayush.garg@samsung.com>

diff --git a/tools/btproxy.c b/tools/btproxy.c
index 122dfee..4764e5e 100755 (executable)
--- a/tools/btproxy.c
+++ b/tools/btproxy.c
@@ -47,8 +47,9 @@ struct sockaddr_hci {
 };
 #define HCI_CHANNEL_USER       1
 #define HCI_INDEX_NONE         0xffff
+#define HCI_INDEX_MAX          16
 
-static uint16_t hci_index = HCI_INDEX_NONE;
+static uint64_t hci_index = HCI_INDEX_NONE;
 static bool client_active = false;
 static bool debug_enabled = false;
 static bool emulate_ecc = false;
@@ -532,13 +533,18 @@ static bool setup_proxy(int host_fd, bool host_shutdown,
        return true;
 }
 
-static int open_channel(uint16_t index)
+static int open_channel(uint64_t hci_index)
 {
        struct sockaddr_hci addr;
        int fd, err;
+       uint8_t index;
 
-       if (index == HCI_INDEX_NONE)
-               index = 0;
+       index = util_get_uid(&hci_index, HCI_INDEX_MAX);
+       if (index == 0) {
+               perror("No controller available");
+               return -1;
+       }
+       index--;
 
        printf("Opening user channel for hci%u\n", index);
 
@@ -557,12 +563,11 @@ static int open_channel(uint16_t index)
                err = -errno;
                close(fd);
 
-               /* Open next available controller if no specific index was
-                * provided and the error indicates that the controller.
+               /* Open next available controller if the error indicates
+                * that the controller is in use.
                 */
-               if (hci_index == HCI_INDEX_NONE &&
-                               (err == -EBUSY || err == -EUSERS))
-                       return open_channel(++index);
+               if (err == -EBUSY || err == -EUSERS)
+                       return open_channel(hci_index);
 
                perror("Failed to bind Bluetooth socket");
                return -1;
@@ -600,12 +605,6 @@ 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);
        if (dev_fd < 0) {
                close(host_fd);
@@ -799,6 +798,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);
@@ -843,7 +843,13 @@ int main(int argc, char *argv[])
                                usage();
                                return EXIT_FAILURE;
                        }
-                       hci_index = atoi(str);
+                       index = atoi(str) + 1;
+                       if (index > HCI_INDEX_MAX) {
+                               fprintf(stderr, "Invalid controller index\n");
+                               usage();
+                               return EXIT_FAILURE;
+                       }
+                       util_clear_uid(&hci_index, index);
                        break;
                case 'a':
                        type = HCI_AMP;
@@ -883,6 +889,9 @@ int main(int argc, char *argv[])
                return EXIT_FAILURE;
        }
 
+       if (hci_index == HCI_INDEX_NONE)
+               hci_index = 0;
+
        mainloop_init();
 
        if (connect_address || use_redirect) {