Received-SPF: pass (google.com: domain of linux-bluetooth-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Content-Type: text/plain;
        charset=us-ascii
Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.120.0.1.13\))
Subject: Re: [Bluez PATCH v4 01/12] lib: Inclusive language changes
From:   Marcel Holtmann <marcel@holtmann.org>
In-Reply-To: <20210906160340.Bluez.v4.1.I2169032b03520f33b73ca4dc7f2ae7ab0a901da3@changeid>
Date:   Mon, 6 Sep 2021 18:05:53 +0200
Cc:     linux-bluetooth <linux-bluetooth@vger.kernel.org>,
        Luiz Augusto von Dentz <luiz.dentz@gmail.com>,
        CrosBT Upstreaming <chromeos-bluetooth-upstreaming@chromium.org>,
        Archie Pusaka <apusaka@chromium.org>
Content-Transfer-Encoding: 8BIT
Message-Id: <35AC05A9-E7F9-461C-9EAA-1FBB4898B699@holtmann.org>
References: <20210906080450.1771211-1-apusaka@google.com>
 <20210906160340.Bluez.v4.1.I2169032b03520f33b73ca4dc7f2ae7ab0a901da3@changeid>
To:     Archie Pusaka <apusaka@google.com>
Precedence: bulk

Hi Archie,

> 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".
> ---
> 
> (no changes since v3)
> 
> 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           | 22 +++++++++++-----------
> lib/mgmt.h          |  2 +-
> monitor/control.c   |  4 ++--
> src/adapter.c       |  4 ++--
> tools/oobtest.c     |  4 ++--
> 6 files changed, 20 insertions(+), 20 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/hci.c b/lib/hci.c
> index 53af0a1148..a2dd7a2ae6 100644
> --- a/lib/hci.c
> +++ b/lib/hci.c
> @@ -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	},

you can't do this since it actually maps to input of hciconfig tool. You really need to check where link_mode_map is used.

> @@ -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) {
> @@ -345,7 +345,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 +565,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 +735,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 +746,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 */
> 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 266602a34c..dad23a0e62 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 ddd8967515..ac1e02af6c 100644
> --- a/src/adapter.c
> +++ b/src/adapter.c
> @@ -4122,7 +4122,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;
> 	}
> 
> @@ -8307,7 +8307,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";

These strings you could have changed. It is just a test tool and not installed.

Regards

Marcel