From: Archie Pusaka <apusaka@xxxxxxxxxxxx>
"central" is preferred, as reflected in the BT core spec 5.3.
---
android/bluetooth.c | 4 ++--
lib/mgmt.h | 2 +-
monitor/control.c | 4 ++--
src/adapter.c | 4 ++--
tools/oobtest.c | 4 ++--
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/android/bluetooth.c b/android/bluetooth.c
index c3ad503497..fe956b5d43 100644
--- a/android/bluetooth.c
+++ b/android/bluetooth.c
@@ -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);
diff --git a/lib/mgmt.h b/lib/mgmt.h
index 0a6349321a..0d1678f01d 100644
--- a/lib/mgmt.h
+++ b/lib/mgmt.h
@@ -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;
diff --git a/monitor/control.c b/monitor/control.c
index d1ba97d377..97d7e789c4 100644
--- a/monitor/control.c
+++ b/monitor/control.c
@@ -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)";
diff --git a/src/adapter.c b/src/adapter.c
index 663b778e4a..a71ebd15c3 100644
--- a/src/adapter.c
+++ b/src/adapter.c
@@ -4028,7 +4028,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;
}
@@ -8145,7 +8145,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);
diff --git a/tools/oobtest.c b/tools/oobtest.c
index c095036fe7..0368bc3865 100644
--- a/tools/oobtest.c
+++ b/tools/oobtest.c
@@ -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";
--
2.33.0.rc1.237.g0d66db33f3-goog
