From: Archie Pusaka <apusaka@google.com>
To: linux-bluetooth <linux-bluetooth@vger.kernel.org>,
Luiz Augusto von Dentz <luiz.dentz@gmail.com>
Cc: CrosBT Upstreaming <chromeos-bluetooth-upstreaming@chromium.org>,
Archie Pusaka <apusaka@chromium.org>
Subject: [Bluez PATCH 60/62] android: Inclusive language for describing relation
Date: Fri, 13 Aug 2021 20:18:45 +0800 [thread overview]
Message-ID: <20210813201256.Bluez.60.I8ce98773a3c7b07aa598fa6601215cac02fd7d31@changeid> (raw)
In-Reply-To: <20210813121848.3686029-1-apusaka@google.com>
From: Archie Pusaka <apusaka@chromium.org>
"central" and "peripheral" are the preferred terms, as reflected in
the BT core spec 5.3.
---
android/bluetooth.c | 40 ++++++++++++++++++++--------------------
android/tester-main.c | 8 ++++----
2 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/android/bluetooth.c b/android/bluetooth.c
index fe956b5d43..b5f584eea2 100644
--- a/android/bluetooth.c
+++ b/android/bluetooth.c
@@ -2198,7 +2198,7 @@ static void mgmt_device_unpaired_event(uint16_t index, uint16_t length,
dev->in_white_list = false;
}
-static void store_ltk(const bdaddr_t *dst, uint8_t bdaddr_type, bool master,
+static void store_ltk(const bdaddr_t *dst, uint8_t bdaddr_type, bool central,
const uint8_t *key, uint8_t key_type, uint8_t enc_size,
uint16_t ediv, uint64_t rand)
{
@@ -2218,11 +2218,11 @@ static void store_ltk(const bdaddr_t *dst, uint8_t bdaddr_type, bool master,
ba2str(dst, addr);
- key_s = master ? "LongTermKey" : "SlaveLongTermKey";
- keytype_s = master ? "LongTermKeyType" : "SlaveLongTermKeyType";
- encsize_s = master ? "LongTermKeyEncSize" : "SlaveLongTermKeyEncSize";
- ediv_s = master ? "LongTermKeyEDiv" : "SlaveLongTermKeyEDiv";
- rand_s = master ? "LongTermKeyRand" : "SlaveLongTermKeyRand";
+ key_s = central ? "LongTermKey" : "SlaveLongTermKey";
+ keytype_s = central ? "LongTermKeyType" : "SlaveLongTermKeyType";
+ encsize_s = central ? "LongTermKeyEncSize" : "SlaveLongTermKeyEncSize";
+ ediv_s = central ? "LongTermKeyEDiv" : "SlaveLongTermKeyEDiv";
+ rand_s = central ? "LongTermKeyRand" : "SlaveLongTermKeyRand";
for (i = 0; i < 16; i++)
sprintf(key_str + (i * 2), "%2.2X", key[i]);
@@ -3059,18 +3059,18 @@ failed:
}
static struct mgmt_ltk_info *get_ltk_info(GKeyFile *key_file, const char *peer,
- bool master)
+ bool central)
{
const char *key_s, *keytype_s, *encsize_s, *ediv_s, *rand_s;
struct mgmt_ltk_info *info = NULL;
char *key;
unsigned int i;
- key_s = master ? "LongTermKey" : "SlaveLongTermKey";
- keytype_s = master ? "LongTermKeyType" : "SlaveLongTermKeyType";
- encsize_s = master ? "LongTermKeyEncSize" : "SlaveLongTermKeyEncSize";
- ediv_s = master ? "LongTermKeyEDiv" : "SlaveLongTermKeyEDiv";
- rand_s = master ? "LongTermKeyRand" : "SlaveLongTermKeyRand";
+ key_s = central ? "LongTermKey" : "SlaveLongTermKey";
+ keytype_s = central ? "LongTermKeyType" : "SlaveLongTermKeyType";
+ encsize_s = central ? "LongTermKeyEncSize" : "SlaveLongTermKeyEncSize";
+ ediv_s = central ? "LongTermKeyEDiv" : "SlaveLongTermKeyEDiv";
+ rand_s = central ? "LongTermKeyRand" : "SlaveLongTermKeyRand";
key = g_key_file_get_string(key_file, peer, key_s, NULL);
if (!key || strlen(key) != 32)
@@ -3097,7 +3097,7 @@ static struct mgmt_ltk_info *get_ltk_info(GKeyFile *key_file, const char *peer,
info->ediv = g_key_file_get_integer(key_file, peer, ediv_s, NULL);
info->ediv = cpu_to_le16(info->ediv);
- info->central = master;
+ info->central = central;
failed:
g_free(key);
@@ -3201,7 +3201,7 @@ static void load_devices_info(bt_bluetooth_ready cb)
struct mgmt_link_key_info *key_info;
struct mgmt_ltk_info *ltk_info;
struct mgmt_irk_info *irk_info;
- struct mgmt_ltk_info *slave_ltk_info;
+ struct mgmt_ltk_info *peripheral_ltk_info;
struct device *dev;
dev = create_device_from_info(key_file, devs[i]);
@@ -3209,15 +3209,15 @@ static void load_devices_info(bt_bluetooth_ready cb)
key_info = get_key_info(key_file, devs[i]);
irk_info = get_irk_info(key_file, devs[i]);
ltk_info = get_ltk_info(key_file, devs[i], true);
- slave_ltk_info = get_ltk_info(key_file, devs[i], false);
+ peripheral_ltk_info = get_ltk_info(key_file, devs[i], false);
/*
* Skip devices that have no permanent keys
* (CSRKs are loaded by create_device_from_info())
*/
if (!dev->valid_local_csrk && !dev->valid_remote_csrk &&
- !key_info && !ltk_info &&
- !slave_ltk_info && !irk_info) {
+ !key_info && !ltk_info &&
+ !peripheral_ltk_info && !irk_info) {
error("Failed to load keys for %s, skipping", devs[i]);
free_device(dev);
continue;
@@ -3235,11 +3235,11 @@ static void load_devices_info(bt_bluetooth_ready cb)
if (ltk_info)
ltks = g_slist_prepend(ltks, ltk_info);
- if (slave_ltk_info)
- ltks = g_slist_prepend(ltks, slave_ltk_info);
+ if (peripheral_ltk_info)
+ ltks = g_slist_prepend(ltks, peripheral_ltk_info);
if (dev->valid_local_csrk || dev->valid_remote_csrk ||
- irk_info || ltk_info || slave_ltk_info) {
+ irk_info || ltk_info || peripheral_ltk_info) {
dev->le_paired = true;
dev->le_bonded = true;
}
diff --git a/android/tester-main.c b/android/tester-main.c
index ff5ecdf834..05ced5fb4c 100644
--- a/android/tester-main.c
+++ b/android/tester-main.c
@@ -2784,17 +2784,17 @@ void emu_remote_connect_hci_action(void)
struct step *current_data_step = queue_peek_head(data->steps);
struct bt_action_data *action_data = current_data_step->set_data;
struct step *step = g_new0(struct step, 1);
- const uint8_t *master_addr;
+ const uint8_t *central_addr;
- master_addr = hciemu_get_central_bdaddr(data->hciemu);
+ central_addr = hciemu_get_central_bdaddr(data->hciemu);
tester_print("Trying to connect hci");
if (action_data)
- bthost_hci_connect(bthost, master_addr,
+ bthost_hci_connect(bthost, central_addr,
action_data->bearer_type);
else
- bthost_hci_connect(bthost, master_addr, BDADDR_BREDR);
+ bthost_hci_connect(bthost, central_addr, BDADDR_BREDR);
step->action_status = BT_STATUS_SUCCESS;
--
2.33.0.rc1.237.g0d66db33f3-goog
next prev parent reply other threads:[~2021-08-13 12:23 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-13 12:17 [Bluez PATCH 00/62] Inclusive language changes Archie Pusaka
2021-08-13 12:17 ` [Bluez PATCH 01/62] lib: Inclusive language in HCI commands and events Archie Pusaka
2021-08-13 12:49 ` Inclusive language changes bluez.test.bot
2021-08-13 19:26 ` [Bluez PATCH 01/62] lib: Inclusive language in HCI commands and events Marcel Holtmann
2021-08-13 21:47 ` Luiz Augusto von Dentz
2021-08-16 15:59 ` Marcel Holtmann
2021-08-13 12:17 ` [Bluez PATCH 02/62] lib: Inclusive language in consts and strings Archie Pusaka
2021-08-13 12:17 ` [Bluez PATCH 03/62] tools/hciconfig: Inclusive language update Archie Pusaka
2021-08-13 12:17 ` [Bluez PATCH 04/62] core: Inclusive language for l2cap Archie Pusaka
2021-08-13 12:17 ` [Bluez PATCH 05/62] core: Inclusive language for rfcomm Archie Pusaka
2021-08-13 12:17 ` [Bluez PATCH 06/62] lib: Inclusive language for filtering devices Archie Pusaka
2021-08-13 12:17 ` [Bluez PATCH 07/62] lib/mgmt: Inclusive language for LTK Archie Pusaka
2021-08-13 12:17 ` [Bluez PATCH 08/62] doc/mgmt: Inclusive language update Archie Pusaka
2021-08-13 12:17 ` [Bluez PATCH 09/62] btio: Inclusive language changes Archie Pusaka
2021-08-13 12:17 ` [Bluez PATCH 10/62] shared/ad: " Archie Pusaka
2021-08-13 12:17 ` [Bluez PATCH 11/62] shared/hfp: " Archie Pusaka
2021-08-13 12:17 ` [Bluez PATCH 12/62] monitor: Inclusive language in struct member Archie Pusaka
2021-08-13 12:17 ` [Bluez PATCH 13/62] monitor: Inclusive language in SMP related things Archie Pusaka
2021-08-13 12:17 ` [Bluez PATCH 14/62] monitor: Inclusive language in LE states Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 15/62] monitor: Inclusive language in LL feature Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 16/62] monitor: Inclusive language in link key transaction Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 17/62] monitor: Inclusive language in peripheral broadcast Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 18/62] monitor: Inclusive language in peripheral page response timeout Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 19/62] monitor: Inclusive language in consts and strings Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 20/62] monitor: Inclusive language in filtering devices Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 21/62] emulator: Inclusive language in naming Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 22/62] emulator: Inclusive language in strings Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 23/62] emulator: Inclusive language in filtering device Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 24/62] tools: Inclusive language in referring the central address Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 25/62] tools/parser/hci: Inclusive language changes Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 26/62] tools/parser/smp: " Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 27/62] tools/3dsp: " Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 28/62] tools/mgmt-tester: " Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 29/62] tools/bdaddr: " Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 30/62] tools/hciconfig: " Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 31/62] tools/meshctl: " Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 32/62] tools/mgmt-tester: " Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 33/62] tools/parser: Inclusive language in struct member Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 34/62] tools/parser/lmp: Inclusive language changes Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 35/62] tools/parser/avdtp: " Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 36/62] tools/parser/csr: " Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 37/62] tools/btpclientctl: " Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 38/62] tools/l2cap-tester: " Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 39/62] tools/hci-tester: " Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 40/62] tools/btiotest: " Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 41/62] tools/hcitool: Inclusive language changes, central peripheral Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 42/62] tools/hcitool: Inclusive language changes, accept list Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 43/62] tools/l2test: Inclusive language changes Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 44/62] tools/rctest: " Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 45/62] tools/rfcomm: " Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 46/62] plugins/sixaxis: " Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 47/62] profiles/audio: " Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 48/62] profiles/health: " Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 49/62] sdp: " Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 50/62] adapter: Inclusive language for central and peripheral Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 51/62] adapter: Inclusive language for storing LTK Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 52/62] adapter: Inclusive language for device filtering Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 53/62] client: Inclusive language changes Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 54/62] mesh: " Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 55/62] tools/mesh: " Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 56/62] tools/mesh-gatt: " Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 57/62] unit/mesh: " Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 58/62] doc/mesh: " Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 59/62] android: Inclusive language for volume control Archie Pusaka
2021-08-13 12:18 ` Archie Pusaka [this message]
2021-08-13 12:18 ` [Bluez PATCH 61/62] android: Inclusive language for filtering devices Archie Pusaka
2021-08-13 12:18 ` [Bluez PATCH 62/62] android: Inclusive language in storing LTK Archie Pusaka
2021-08-13 21:42 ` [Bluez PATCH 00/62] Inclusive language changes Luiz Augusto von Dentz
2021-08-14 5:22 ` Archie Pusaka
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210813201256.Bluez.60.I8ce98773a3c7b07aa598fa6601215cac02fd7d31@changeid \
--to=apusaka@google.com \
--cc=apusaka@chromium.org \
--cc=chromeos-bluetooth-upstreaming@chromium.org \
--cc=linux-bluetooth@vger.kernel.org \
--cc=luiz.dentz@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).