mgmt-tester: Add support ext create connection and enh conn complete

Change-Id: I530bbf57ef32b76a8c2b62cf722fe62ac96c74be
Signed-off-by: himanshu <h.himanshu@samsung.com>

diff --git a/tools/mgmt-tester.c b/tools/mgmt-tester.c
index 615b968..0f8371c 100755 (executable)
--- a/tools/mgmt-tester.c
+++ b/tools/mgmt-tester.c
@@ -5292,6 +5292,7 @@ static void client_cmd_complete(uint16_t opcode, uint8_t status,
        switch (opcode) {
        case BT_HCI_CMD_WRITE_SCAN_ENABLE:
        case BT_HCI_CMD_LE_SET_ADV_ENABLE:
+       case BT_HCI_CMD_LE_SET_EXT_ADV_ENABLE:
                tester_print("Client set connectable: %s (0x%02x)",
                                                mgmt_errstr(status), status);
                if (!status && test->client_enable_ssp) {
@@ -5321,9 +5322,14 @@ static void setup_bthost(void)
 
        bthost = hciemu_client_get_host(data->hciemu);
        bthost_set_cmd_complete_cb(bthost, client_cmd_complete, data);
-       if (data->hciemu_type == HCIEMU_TYPE_LE || test->client_enable_adv)
-               bthost_set_adv_enable(bthost, 0x01);
-       else
+
+       if (data->hciemu_type == HCIEMU_TYPE_LE ||
+               test->client_enable_adv) {
+               if (data->hciemu_type == HCIEMU_TYPE_BREDRLE50)
+                       bthost_set_ext_adv_enable(bthost, 0x01);
+               else
+                       bthost_set_adv_enable(bthost, 0x01);
+       } else
                bthost_write_scan_enable(bthost, 0x03);
 }
 
@@ -8676,9 +8682,15 @@ static void le_connected_event(uint16_t index, uint16_t length,
        tester_print("Device connected");
 
        test_add_condition(data);
-       hciemu_add_hook(data->hciemu, HCIEMU_HOOK_POST_CMD,
-                                               BT_HCI_CMD_LE_SET_ADV_ENABLE,
-                                               test_adv_enable_hook, data);
+
+       if (data->hciemu_type == HCIEMU_TYPE_BREDRLE50)
+               hciemu_add_hook(data->hciemu, HCIEMU_HOOK_POST_CMD,
+                                       BT_HCI_CMD_LE_SET_EXT_ADV_ENABLE,
+                                       test_adv_enable_hook, data);
+       else
+               hciemu_add_hook(data->hciemu, HCIEMU_HOOK_POST_CMD,
+                                       BT_HCI_CMD_LE_SET_ADV_ENABLE,
+                                       test_adv_enable_hook, data);
 
        /* Make sure we get not disconnected during the testaces */
        mgmt_register(data->mgmt_alt, MGMT_EV_DEVICE_DISCONNECTED,
@@ -8718,7 +8730,10 @@ static void add_device_callback(uint8_t status, uint16_t len, const void *param,
        }
 
        bthost = hciemu_client_get_host(data->hciemu);
-       bthost_hci_connect(bthost, master_bdaddr, BDADDR_LE_PUBLIC);
+       if (data->hciemu_type == HCIEMU_TYPE_BREDRLE50)
+               bthost_hci_ext_connect(bthost, master_bdaddr, BDADDR_LE_PUBLIC);
+       else
+               bthost_hci_connect(bthost, master_bdaddr, BDADDR_LE_PUBLIC);
 }
 
 static void test_connected_and_advertising(const void *test_data)
@@ -10192,5 +10207,25 @@ int main(int argc, char *argv[])
                                &device_found_invalid_field,
                                NULL, test_device_found);
 
+       test_bredrle50_full("Ext Adv. connectable & connected (slave) - Success",
+                               &conn_slave_adv_conneactable_test,
+                               setup_advertise_while_connected,
+                               test_connected_and_advertising, 10);
+
+       test_bredrle50_full("Ext Adv. non-connectable & connected (slave) - Success",
+                               &conn_slave_adv_non_conneactable_test,
+                               setup_advertise_while_connected,
+                               test_connected_and_advertising, 10);
+
+       test_bredrle50_full("Ext Adv. connectable & connected (master) - Success",
+                               &conn_master_adv_conneactable_test,
+                               setup_advertise_while_connected,
+                               test_connected_and_advertising, 10);
+
+       test_bredrle50_full("Ext Adv. non-connectable & connected (master) - Success",
+                               &conn_master_adv_non_conneactable_test,
+                               setup_advertise_while_connected,
+                               test_connected_and_advertising, 10);
+
        return tester_run();
 }