@@ -2276,7 +2276,7 @@ static void new_long_term_key_event(uint16_t index, uint16_t length,
ediv = le16_to_cpu(key->ediv);
rand = le64_to_cpu(key->rand);
- store_ltk(&key->addr.bdaddr, key->addr.type, key->master,
+ store_ltk(&key->addr.bdaddr, key->addr.type, key->central,
key->val, key->type, key->enc_size, ediv, rand);
}
@@ -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->master = master;
+ info->central = master;
failed:
g_free(key);
@@ -288,7 +288,7 @@ int hci_strtolp(char *str, unsigned int *val)
static hci_map link_mode_map[] = {
{ "NONE", 0 },
{ "ACCEPT", HCI_LM_ACCEPT },
- { "MASTER", HCI_LM_MASTER },
+ { "CENTRAL", HCI_LM_MASTER },
{ "AUTH", HCI_LM_AUTH },
{ "ENCRYPT", HCI_LM_ENCRYPT },
{ "TRUSTED", HCI_LM_TRUSTED },
@@ -305,7 +305,7 @@ char *hci_lmtostr(unsigned int lm)
*str = 0;
if (!(lm & HCI_LM_MASTER))
- strcpy(str, "SLAVE ");
+ strcpy(str, "PERIPHERAL ");
s = hci_bit2str(link_mode_map, lm);
if (!s) {
@@ -320,7 +320,15 @@ char *hci_lmtostr(unsigned int lm)
int hci_strtolm(char *str, unsigned int *val)
{
- return hci_str2bit(link_mode_map, str, val);
+ int ret = hci_str2bit(link_mode_map, str, val);
+
+ /* Deprecated name. Kept for compatibility. */
+ if (strcasestr(str, "MASTER")) {
+ ret = 1;
+ *val |= HCI_LM_MASTER;
+ }
+
+ return ret;
}
/* Command mapping */
@@ -345,7 +353,7 @@ static hci_map commands_map[] = {
{ "Set Connection Encryption", 16 },
{ "Change Connection Link Key", 17 },
- { "Master Link Key", 18 },
+ { "Temporary Link Key", 18 },
{ "Remote Name Request", 19 },
{ "Cancel Remote Name Request", 20 },
{ "Read Remote Supported Features", 21 },
@@ -565,11 +573,11 @@ static hci_map commands_map[] = {
{ "LE Set Scan Enable", 211 },
{ "LE Create Connection", 212 },
{ "LE Create Connection Cancel", 213 },
- { "LE Read White List Size", 214 },
- { "LE Clear White List", 215 },
+ { "LE Read Accept List Size", 214 },
+ { "LE Clear Accept List", 215 },
- { "LE Add Device To White List", 216 },
- { "LE Remove Device From White List", 217 },
+ { "LE Add Device To Accept List", 216 },
+ { "LE Remove Device From Accept List", 217 },
{ "LE Connection Update", 218 },
{ "LE Set Host Channel Classification", 219 },
{ "LE Read Channel Map", 220 },
@@ -735,8 +743,8 @@ static hci_map lmp_features_map[8][9] = {
{ "<EV4 packets>", LMP_EV4 }, /* Bit 0 */
{ "<EV5 packets>", LMP_EV5 }, /* Bit 1 */
{ "<no. 34>", 0x04 }, /* Bit 2 */
- { "<AFH cap. slave>", LMP_AFH_CAP_SLV }, /* Bit 3 */
- { "<AFH class. slave>", LMP_AFH_CLS_SLV }, /* Bit 4 */
+ { "<AFH cap. perip.>", LMP_AFH_CAP_SLV }, /* Bit 3 */
+ { "<AFH cls. perip.>", LMP_AFH_CLS_SLV }, /* Bit 4 */
{ "<BR/EDR not supp.>", LMP_NO_BREDR }, /* Bit 5 */
{ "<LE support>", LMP_LE }, /* Bit 6 */
{ "<3-slot EDR ACL>", LMP_EDR_3SLOT }, /* Bit 7 */
@@ -746,8 +754,8 @@ static hci_map lmp_features_map[8][9] = {
{ "<5-slot EDR ACL>", LMP_EDR_5SLOT }, /* Bit 0 */
{ "<sniff subrating>", LMP_SNIFF_SUBR }, /* Bit 1 */
{ "<pause encryption>", LMP_PAUSE_ENC }, /* Bit 2 */
- { "<AFH cap. master>", LMP_AFH_CAP_MST }, /* Bit 3 */
- { "<AFH class. master>",LMP_AFH_CLS_MST }, /* Bit 4 */
+ { "<AFH cap. central>", LMP_AFH_CAP_MST }, /* Bit 3 */
+ { "<AFH cls. central>", LMP_AFH_CLS_MST }, /* Bit 4 */
{ "<EDR eSCO 2 Mbps>", LMP_EDR_ESCO_2M }, /* Bit 5 */
{ "<EDR eSCO 3 Mbps>", LMP_EDR_ESCO_3M }, /* Bit 6 */
{ "<3-slot EDR eSCO>", LMP_EDR_3S_ESCO }, /* Bit 7 */
@@ -179,7 +179,7 @@ struct mgmt_cp_load_link_keys {
struct mgmt_ltk_info {
struct mgmt_addr_info addr;
uint8_t type;
- uint8_t master;
+ uint8_t central;
uint8_t enc_size;
uint16_t ediv;
uint64_t rand;
@@ -308,13 +308,13 @@ static void mgmt_new_long_term_key(uint16_t len, const void *buf)
/* LE SC keys are both for master and slave */
switch (ev->key.type) {
case 0x00:
- if (ev->key.master)
+ if (ev->key.central)
type = "Master (Unauthenticated)";
else
type = "Slave (Unauthenticated)";
break;
case 0x01:
- if (ev->key.master)
+ if (ev->key.central)
type = "Master (Authenticated)";
else
type = "Slave (Authenticated)";
@@ -4208,7 +4208,7 @@ static void load_ltks(struct btd_adapter *adapter, GSList *keys)
key->rand = cpu_to_le64(info->rand);
key->ediv = cpu_to_le16(info->ediv);
key->type = info->authenticated;
- key->master = info->master;
+ key->central = info->master;
key->enc_size = info->enc_size;
}
@@ -8395,7 +8395,7 @@ static void new_long_term_key_callback(uint16_t index, uint16_t length,
rand = le64_to_cpu(key->rand);
store_longtermkey(adapter, &key->addr.bdaddr,
- key->addr.type, key->val, key->master,
+ key->addr.type, key->val, key->central,
key->type, key->enc_size, ediv, rand);
device_set_bonded(device, addr->type);
@@ -133,13 +133,13 @@ static void new_long_term_key_event(uint16_t index, uint16_t len,
switch (ev->key.type) {
case 0x00:
- if (ev->key.master)
+ if (ev->key.central)
type = "Unauthenticated, Master";
else
type = "Unauthenticated, Slave";
break;
case 0x01:
- if (ev->key.master)
+ if (ev->key.central)
type = "Authenticated, Master";
else
type = "Authenticated, Slave";
From: Archie Pusaka <apusaka@chromium.org> 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", and "accept list". --- Changes in v5: * Support the original term as input parameter for tools Changes in v3: * Not replacing some terms which belong to libluetooth API Changes in v2: * Merging several patches from the same directory into one android/bluetooth.c | 4 ++-- lib/hci.c | 32 ++++++++++++++++++++------------ lib/mgmt.h | 2 +- monitor/control.c | 4 ++-- src/adapter.c | 4 ++-- tools/oobtest.c | 4 ++-- 6 files changed, 29 insertions(+), 21 deletions(-)