diff options
| author | Archie Pusaka <apusaka@chromium.org> | 2021-09-15 16:31:59 +0800 |
|---|---|---|
| committer | Marcel Holtmann <marcel@holtmann.org> | 2021-09-21 10:51:54 +0200 |
| commit | 43f547d7e55ceae1825909b6d50f89320e7d81e8 (patch) | |
| tree | 49dc8781b07923bbfd63bcbea46b8476c220c418 /tools/l2cap-tester.c | |
| parent | 048f2ac0e4fcc19cf9b1f8fc9525a1dec21ab87f (diff) | |
| download | bluez-43f547d7e55ceae1825909b6d50f89320e7d81e8.tar.gz | |
tools: Inclusive language changes
BT core spec 5.3 promotes the usage of inclusive languages.
This CL replaces some terms with the more appropriate counterparts,
such as "central", "peripheral", "accept list", "reject list", and
"temporary link key". Note that some suggestions come from
https://specificationrefs.bluetooth.com/language-mapping/Appropriate_Language_Mapping_Table.pdf
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Diffstat (limited to 'tools/l2cap-tester.c')
| -rw-r--r-- | tools/l2cap-tester.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/tools/l2cap-tester.c b/tools/l2cap-tester.c index 169a989f5..d78b1e29c 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; @@ -1437,7 +1437,7 @@ static gboolean test_close_socket_1_part_2(gpointer args) tester_print("Will close socket during scan phase..."); /* We tried to conect to LE device that is not advertising. It - * was added to kernel whitelist, and scan was started. We + * was added to kernel accept list, and scan was started. We * should be still scanning. */ if (!hciemu_get_central_le_scan_enable(data->hciemu)) { @@ -1446,7 +1446,7 @@ static gboolean test_close_socket_1_part_2(gpointer args) return FALSE; } - /* Calling close() should remove device from whitelist, and stop + /* Calling close() should remove device from accept list, and stop * the scan. */ if (close(sk) < 0) { @@ -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) |