From: Archie Pusaka <apusaka@xxxxxxxxxxxx>
"central" is preferred, as reflected in the BT core spec 5.3.
---
tools/l2cap-tester.c | 20 ++++++++++----------
tools/mgmt-tester.c | 33 +++++++++++++++++----------------
tools/rfcomm-tester.c | 14 +++++++-------
tools/sco-tester.c | 10 +++++-----
tools/smp-tester.c | 12 ++++++------
5 files changed, 45 insertions(+), 44 deletions(-)
diff --git a/tools/l2cap-tester.c b/tools/l2cap-tester.c
index 169a989f54..db662117e0 100644
--- a/tools/l2cap-tester.c
+++ b/tools/l2cap-tester.c
@@ -1103,7 +1103,7 @@ static int create_l2cap_sock(struct test_data *data, uint16_t psm,
uint16_t cid, int sec_level, uint8_t mode)
{
const struct l2cap_data *l2data = data->test_data;
- const uint8_t *master_bdaddr;
+ const uint8_t *central_bdaddr;
struct sockaddr_l2 addr;
int sk, err;
@@ -1116,9 +1116,9 @@ static int create_l2cap_sock(struct test_data *data, uint16_t psm,
return err;
}
- master_bdaddr = hciemu_get_central_bdaddr(data->hciemu);
- if (!master_bdaddr) {
- tester_warn("No master bdaddr");
+ central_bdaddr = hciemu_get_central_bdaddr(data->hciemu);
+ if (!central_bdaddr) {
+ tester_warn("No central bdaddr");
close(sk);
return -ENODEV;
}
@@ -1127,7 +1127,7 @@ static int create_l2cap_sock(struct test_data *data, uint16_t psm,
addr.l2_family = AF_BLUETOOTH;
addr.l2_psm = htobs(psm);
addr.l2_cid = htobs(cid);
- bacpy(&addr.l2_bdaddr, (void *) master_bdaddr);
+ bacpy(&addr.l2_bdaddr, (void *) central_bdaddr);
if (l2data && l2data->addr_type_avail)
addr.l2_bdaddr_type = l2data->addr_type;
@@ -1836,7 +1836,7 @@ static void test_server(const void *test_data)
{
struct test_data *data = tester_get_data();
const struct l2cap_data *l2data = data->test_data;
- const uint8_t *master_bdaddr;
+ const uint8_t *central_bdaddr;
uint8_t addr_type;
struct bthost *bthost;
GIOChannel *io;
@@ -1869,9 +1869,9 @@ static void test_server(const void *test_data)
tester_print("Listening for connections");
}
- master_bdaddr = hciemu_get_central_bdaddr(data->hciemu);
- if (!master_bdaddr) {
- tester_warn("No master bdaddr");
+ central_bdaddr = hciemu_get_central_bdaddr(data->hciemu);
+ if (!central_bdaddr) {
+ tester_warn("No central bdaddr");
tester_test_failed();
return;
}
@@ -1884,7 +1884,7 @@ static void test_server(const void *test_data)
else
addr_type = BDADDR_LE_PUBLIC;
- bthost_hci_connect(bthost, master_bdaddr, addr_type);
+ bthost_hci_connect(bthost, central_bdaddr, addr_type);
}
static void test_getpeername_not_connected(const void *test_data)
diff --git a/tools/mgmt-tester.c b/tools/mgmt-tester.c
index 30db2b2179..04c4393a09 100644
--- a/tools/mgmt-tester.c
+++ b/tools/mgmt-tester.c
@@ -9759,7 +9759,7 @@ static void test_pairing_acceptor(const void *test_data)
{
struct test_data *data = tester_get_data();
const struct generic_data *test = data->test_data;
- const uint8_t *master_bdaddr;
+ const uint8_t *central_bdaddr;
struct bthost *bthost;
uint8_t addr_type;
@@ -9775,9 +9775,9 @@ static void test_pairing_acceptor(const void *test_data)
test_add_condition(data);
}
- master_bdaddr = hciemu_get_central_bdaddr(data->hciemu);
- if (!master_bdaddr) {
- tester_warn("No master bdaddr");
+ central_bdaddr = hciemu_get_central_bdaddr(data->hciemu);
+ if (!central_bdaddr) {
+ tester_warn("No central bdaddr");
tester_test_failed();
return;
}
@@ -9790,7 +9790,7 @@ static void test_pairing_acceptor(const void *test_data)
else
addr_type = BDADDR_LE_PUBLIC;
- bthost_hci_connect(bthost, master_bdaddr, addr_type);
+ bthost_hci_connect(bthost, central_bdaddr, addr_type);
}
static void connected_event(uint16_t index, uint16_t length, const void *param,
@@ -9828,7 +9828,7 @@ static void test_command_generic_connect(const void *test_data)
{
struct test_data *data = tester_get_data();
unsigned int id;
- const uint8_t *master_bdaddr;
+ const uint8_t *central_bdaddr;
uint8_t addr_type;
struct bthost *bthost;
@@ -9840,9 +9840,9 @@ static void test_command_generic_connect(const void *test_data)
data->mgmt_alt_ev_id = id;
test_add_condition(data);
- master_bdaddr = hciemu_get_central_bdaddr(data->hciemu);
- if (!master_bdaddr) {
- tester_warn("No master bdaddr");
+ central_bdaddr = hciemu_get_central_bdaddr(data->hciemu);
+ if (!central_bdaddr) {
+ tester_warn("No central bdaddr");
tester_test_failed();
return;
}
@@ -9851,7 +9851,7 @@ static void test_command_generic_connect(const void *test_data)
BDADDR_LE_PUBLIC;
tester_print("ADDR TYPE: %d", addr_type);
bthost = hciemu_client_get_host(data->hciemu);
- bthost_hci_connect(bthost, master_bdaddr, addr_type);
+ bthost_hci_connect(bthost, central_bdaddr, addr_type);
}
static bool test_adv_enable_hook(const void *data, uint16_t len,
@@ -9904,7 +9904,7 @@ static void add_device_callback(uint8_t status, uint16_t len, const void *param,
struct test_data *data = user_data;
const struct generic_data *test = data->test_data;
struct bthost *bthost;
- const uint8_t *master_bdaddr;
+ const uint8_t *central_bdaddr;
if (status != 0) {
tester_test_failed();
@@ -9919,18 +9919,19 @@ static void add_device_callback(uint8_t status, uint16_t len, const void *param,
if (test->client_enable_adv)
return;
- master_bdaddr = hciemu_get_central_bdaddr(data->hciemu);
- if (!master_bdaddr) {
- tester_warn("No master bdaddr");
+ central_bdaddr = hciemu_get_central_bdaddr(data->hciemu);
+ if (!central_bdaddr) {
+ tester_warn("No central bdaddr");
tester_test_failed();
return;
}
bthost = hciemu_client_get_host(data->hciemu);
if (data->hciemu_type >= HCIEMU_TYPE_BREDRLE50)
- bthost_hci_ext_connect(bthost, master_bdaddr, BDADDR_LE_PUBLIC);
+ bthost_hci_ext_connect(bthost, central_bdaddr,
+ BDADDR_LE_PUBLIC);
else
- bthost_hci_connect(bthost, master_bdaddr, BDADDR_LE_PUBLIC);
+ bthost_hci_connect(bthost, central_bdaddr, BDADDR_LE_PUBLIC);
}
static void test_connected_and_advertising(const void *test_data)
diff --git a/tools/rfcomm-tester.c b/tools/rfcomm-tester.c
index 78b08663bd..ef47904de0 100644
--- a/tools/rfcomm-tester.c
+++ b/tools/rfcomm-tester.c
@@ -534,7 +534,7 @@ static void test_connect(const void *test_data)
struct test_data *data = tester_get_data();
struct bthost *bthost = hciemu_client_get_host(data->hciemu);
const struct rfcomm_client_data *cli = data->test_data;
- const uint8_t *client_addr, *master_addr;
+ const uint8_t *client_addr, *central_addr;
GIOChannel *io;
int sk;
@@ -542,10 +542,10 @@ static void test_connect(const void *test_data)
bthost_add_rfcomm_server(bthost, cli->server_channel,
rfcomm_connect_cb, NULL);
- master_addr = hciemu_get_central_bdaddr(data->hciemu);
+ central_addr = hciemu_get_central_bdaddr(data->hciemu);
client_addr = hciemu_get_client_bdaddr(data->hciemu);
- sk = create_rfcomm_sock((bdaddr_t *) master_addr, 0);
+ sk = create_rfcomm_sock((bdaddr_t *) central_addr, 0);
if (connect_rfcomm_sock(sk, (const bdaddr_t *) client_addr,
cli->client_channel) < 0) {
@@ -675,14 +675,14 @@ static void test_server(const void *test_data)
{
struct test_data *data = tester_get_data();
const struct rfcomm_server_data *srv = data->test_data;
- const uint8_t *master_addr;
+ const uint8_t *central_addr;
struct bthost *bthost;
GIOChannel *io;
int sk;
- master_addr = hciemu_get_central_bdaddr(data->hciemu);
+ central_addr = hciemu_get_central_bdaddr(data->hciemu);
- sk = create_rfcomm_sock((bdaddr_t *) master_addr, srv->server_channel);
+ sk = create_rfcomm_sock((bdaddr_t *) central_addr, srv->server_channel);
if (sk < 0) {
tester_test_failed();
return;
@@ -707,7 +707,7 @@ static void test_server(const void *test_data)
bthost = hciemu_client_get_host(data->hciemu);
bthost_set_connect_cb(bthost, client_new_conn, data);
- bthost_hci_connect(bthost, master_addr, BDADDR_BREDR);
+ bthost_hci_connect(bthost, central_addr, BDADDR_BREDR);
}
#define test_rfcomm(name, data, setup, func) \
diff --git a/tools/sco-tester.c b/tools/sco-tester.c
index 7c83aee195..3e7bfc5e3a 100644
--- a/tools/sco-tester.c
+++ b/tools/sco-tester.c
@@ -413,7 +413,7 @@ end:
static int create_sco_sock(struct test_data *data)
{
- const uint8_t *master_bdaddr;
+ const uint8_t *central_bdaddr;
struct sockaddr_sco addr;
int sk, err;
@@ -426,15 +426,15 @@ static int create_sco_sock(struct test_data *data)
return err;
}
- master_bdaddr = hciemu_get_central_bdaddr(data->hciemu);
- if (!master_bdaddr) {
- tester_warn("No master bdaddr");
+ central_bdaddr = hciemu_get_central_bdaddr(data->hciemu);
+ if (!central_bdaddr) {
+ tester_warn("No central bdaddr");
return -ENODEV;
}
memset(&addr, 0, sizeof(addr));
addr.sco_family = AF_BLUETOOTH;
- bacpy(&addr.sco_bdaddr, (void *) master_bdaddr);
+ bacpy(&addr.sco_bdaddr, (void *) central_bdaddr);
if (bind(sk, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
err = -errno;
diff --git a/tools/smp-tester.c b/tools/smp-tester.c
index b075c5df8a..16fe0dfd7a 100644
--- a/tools/smp-tester.c
+++ b/tools/smp-tester.c
@@ -765,11 +765,11 @@ static void smp_new_conn(uint16_t handle, void *user_data)
static void init_bdaddr(struct test_data *data)
{
- const uint8_t *master_bdaddr, *client_bdaddr;
+ const uint8_t *central_bdaddr, *client_bdaddr;
- master_bdaddr = hciemu_get_central_bdaddr(data->hciemu);
- if (!master_bdaddr) {
- tester_warn("No master bdaddr");
+ central_bdaddr = hciemu_get_central_bdaddr(data->hciemu);
+ if (!central_bdaddr) {
+ tester_warn("No central bdaddr");
tester_test_failed();
return;
}
@@ -786,9 +786,9 @@ static void init_bdaddr(struct test_data *data)
if (data->out) {
memcpy(data->ia, client_bdaddr, sizeof(data->ia));
- memcpy(data->ra, master_bdaddr, sizeof(data->ra));
+ memcpy(data->ra, central_bdaddr, sizeof(data->ra));
} else {
- memcpy(data->ia, master_bdaddr, sizeof(data->ia));
+ memcpy(data->ia, central_bdaddr, sizeof(data->ia));
memcpy(data->ra, client_bdaddr, sizeof(data->ra));
}
}
--
2.33.0.rc1.237.g0d66db33f3-goog
