[Bluez PATCH v5 02/13] btio: Inclusive language changes

Archie Pusaka
2021-09-15T08:32:33Z

This CL uses "central" as it is deemed to be more appropriate.
---

(no changes since v1)

android/a2dp.c | 2 +-
btio/btio.c | 42 +++++++++++++++++++++---------------------
btio/btio.h | 2 +-
profiles/audio/a2dp.c | 2 +-
profiles/audio/avctp.c | 2 +-
profiles/sap/server.c | 2 +-
tools/btiotest.c | 8 ++++----
7 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/android/a2dp.c b/android/a2dp.c
index e24f79348d..029107cf5c 100644
--- a/android/a2dp.c
+++ b/android/a2dp.c
@@ -1692,7 +1692,7 @@ bool bt_a2dp_register(struct ipc *ipc, const bdaddr_t *addr, uint8_t mode)
BT_IO_OPT_SOURCE_BDADDR, &adapter_addr,
BT_IO_OPT_PSM, AVDTP_PSM,
BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_MEDIUM,
- BT_IO_OPT_MASTER, true,
+ BT_IO_OPT_CENTRAL, true,
BT_IO_OPT_INVALID);
if (!server) {
error("Failed to listen on AVDTP channel: %s", err->message);
diff --git a/btio/btio.c b/btio/btio.c
index 1f1c374bca..f4f53574c8 100644
--- a/btio/btio.c
+++ b/btio/btio.c
@@ -61,7 +61,7 @@ struct set_opts {
uint16_t mtu;
uint16_t imtu;
uint16_t omtu;
- int master;
+ int central;
uint8_t mode;
int flushable;
uint32_t priority;
@@ -359,7 +359,7 @@ static int l2cap_connect(int sock, const bdaddr_t *dst, uint8_t dst_type,
return 0;
}

-static int l2cap_set_master(int sock, int master)
+static int l2cap_set_central(int sock, int central)
{
int flags;
socklen_t len;
@@ -368,7 +368,7 @@ static int l2cap_set_master(int sock, int master)
if (getsockopt(sock, SOL_L2CAP, L2CAP_LM, &flags, &len) < 0)
return -errno;

- if (master) {
+ if (central) {
if (flags & L2CAP_LM_MASTER)
return 0;
flags |= L2CAP_LM_MASTER;
@@ -384,7 +384,7 @@ static int l2cap_set_master(int sock, int master)
return 0;
}

-static int rfcomm_set_master(int sock, int master)
+static int rfcomm_set_central(int sock, int central)
{
int flags;
socklen_t len;
@@ -393,7 +393,7 @@ static int rfcomm_set_master(int sock, int master)
if (getsockopt(sock, SOL_RFCOMM, RFCOMM_LM, &flags, &len) < 0)
return -errno;

- if (master) {
+ if (central) {
if (flags & RFCOMM_LM_MASTER)
return 0;
flags |= RFCOMM_LM_MASTER;
@@ -656,7 +656,7 @@ static gboolean set_le_mode(int sock, uint8_t mode, GError **err)

static gboolean l2cap_set(int sock, uint8_t src_type, int sec_level,
uint16_t imtu, uint16_t omtu, uint8_t mode,
- int master, int flushable, uint32_t priority,
+ int central, int flushable, uint32_t priority,
GError **err)
{
if (imtu || omtu || mode) {
@@ -676,8 +676,8 @@ static gboolean l2cap_set(int sock, uint8_t src_type, int sec_level,
return ret;
}

- if (master >= 0 && l2cap_set_master(sock, master) < 0) {
- ERROR_FAILED(err, "l2cap_set_master", errno);
+ if (central >= 0 && l2cap_set_central(sock, central) < 0) {
+ ERROR_FAILED(err, "l2cap_set_central", errno);
return FALSE;
}

@@ -733,13 +733,13 @@ static int rfcomm_connect(int sock, const bdaddr_t *dst, uint8_t channel)
return 0;
}

-static gboolean rfcomm_set(int sock, int sec_level, int master, GError **err)
+static gboolean rfcomm_set(int sock, int sec_level, int central, GError **err)
{
if (sec_level && !set_sec_level(sock, BT_IO_RFCOMM, sec_level, err))
return FALSE;

- if (master >= 0 && rfcomm_set_master(sock, master) < 0) {
- ERROR_FAILED(err, "rfcomm_set_master", errno);
+ if (central >= 0 && rfcomm_set_central(sock, central) < 0) {
+ ERROR_FAILED(err, "rfcomm_set_central", errno);
return FALSE;
}

@@ -828,7 +828,7 @@ static gboolean parse_set_opts(struct set_opts *opts, GError **err,
/* Set defaults */
opts->type = BT_IO_SCO;
opts->defer = DEFAULT_DEFER_TIMEOUT;
- opts->master = -1;
+ opts->central = -1;
opts->mode = L2CAP_MODE_BASIC;
opts->flushable = -1;
opts->priority = 0;
@@ -889,8 +889,8 @@ static gboolean parse_set_opts(struct set_opts *opts, GError **err,
if (!opts->mtu)
opts->mtu = opts->imtu;
break;
- case BT_IO_OPT_MASTER:
- opts->master = va_arg(args, gboolean);
+ case BT_IO_OPT_CENTRAL:
+ opts->central = va_arg(args, gboolean);
break;
case BT_IO_OPT_MODE:
opts->mode = va_arg(args, int);
@@ -1171,7 +1171,7 @@ parse_opts:
case BT_IO_OPT_IMTU:
*(va_arg(args, uint16_t *)) = l2o.imtu;
break;
- case BT_IO_OPT_MASTER:
+ case BT_IO_OPT_CENTRAL:
len = sizeof(flags);
if (getsockopt(sock, SOL_L2CAP, L2CAP_LM, &flags,
&len) < 0) {
@@ -1336,7 +1336,7 @@ static gboolean rfcomm_get(int sock, GError **err, BtIOOption opt1,

*(va_arg(args, uint8_t *)) = dst.rc_channel;
break;
- case BT_IO_OPT_MASTER:
+ case BT_IO_OPT_CENTRAL:
len = sizeof(flags);
if (getsockopt(sock, SOL_RFCOMM, RFCOMM_LM, &flags,
&len) < 0) {
@@ -1484,7 +1484,7 @@ static gboolean sco_get(int sock, GError **err, BtIOOption opt1, va_list args)
case BT_IO_OPT_DEST_CHANNEL:
case BT_IO_OPT_PSM:
case BT_IO_OPT_CID:
- case BT_IO_OPT_MASTER:
+ case BT_IO_OPT_CENTRAL:
case BT_IO_OPT_MODE:
case BT_IO_OPT_FLUSHABLE:
case BT_IO_OPT_PRIORITY:
@@ -1578,10 +1578,10 @@ gboolean bt_io_set(GIOChannel *io, GError **err, BtIOOption opt1, ...)
switch (type) {
case BT_IO_L2CAP:
return l2cap_set(sock, opts.src_type, opts.sec_level, opts.imtu,
- opts.omtu, opts.mode, opts.master,
+ opts.omtu, opts.mode, opts.central,
opts.flushable, opts.priority, err);
case BT_IO_RFCOMM:
- return rfcomm_set(sock, opts.sec_level, opts.master, err);
+ return rfcomm_set(sock, opts.sec_level, opts.central, err);
case BT_IO_SCO:
return sco_set(sock, opts.mtu, opts.voice, err);
case BT_IO_INVALID:
@@ -1628,7 +1628,7 @@ static GIOChannel *create_io(gboolean server, struct set_opts *opts,
goto failed;
if (!l2cap_set(sock, opts->src_type, opts->sec_level,
opts->imtu, opts->omtu, opts->mode,
- opts->master, opts->flushable, opts->priority,
+ opts->central, opts->flushable, opts->priority,
err))
goto failed;
break;
@@ -1641,7 +1641,7 @@ static GIOChannel *create_io(gboolean server, struct set_opts *opts,
if (rfcomm_bind(sock, &opts->src,
server ? opts->channel : 0, err) < 0)
goto failed;
- if (!rfcomm_set(sock, opts->sec_level, opts->master, err))
+ if (!rfcomm_set(sock, opts->sec_level, opts->central, err))
goto failed;
break;
case BT_IO_SCO:
diff --git a/btio/btio.h b/btio/btio.h
index f0259cf1db..50a2a4dc02 100644
--- a/btio/btio.h
+++ b/btio/btio.h
@@ -36,7 +36,7 @@ typedef enum {
BT_IO_OPT_MTU,
BT_IO_OPT_OMTU,
BT_IO_OPT_IMTU,
- BT_IO_OPT_MASTER,
+ BT_IO_OPT_CENTRAL,
BT_IO_OPT_HANDLE,
BT_IO_OPT_CLASS,
BT_IO_OPT_MODE,
diff --git a/profiles/audio/a2dp.c b/profiles/audio/a2dp.c
index 9d3aaa1363..031ece6287 100644
--- a/profiles/audio/a2dp.c
+++ b/profiles/audio/a2dp.c
@@ -2519,7 +2519,7 @@ static bool a2dp_server_listen(struct a2dp_server *server)
BT_IO_OPT_PSM, AVDTP_PSM,
BT_IO_OPT_MODE, mode,
BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_MEDIUM,
- BT_IO_OPT_MASTER, true,
+ BT_IO_OPT_CENTRAL, true,
BT_IO_OPT_INVALID);
if (server->io)
return true;
diff --git a/profiles/audio/avctp.c b/profiles/audio/avctp.c
index 50de336181..9f717f35bb 100644
--- a/profiles/audio/avctp.c
+++ b/profiles/audio/avctp.c
@@ -1625,7 +1625,7 @@ static GIOChannel *avctp_server_socket(const bdaddr_t *src, gboolean master,
BT_IO_OPT_SOURCE_BDADDR, src,
BT_IO_OPT_PSM, psm,
BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_MEDIUM,
- BT_IO_OPT_MASTER, master,
+ BT_IO_OPT_CENTRAL, master,
BT_IO_OPT_MODE, mode,
BT_IO_OPT_INVALID);
if (!io) {
diff --git a/profiles/sap/server.c b/profiles/sap/server.c
index 82365fca90..e6f3024ea6 100644
--- a/profiles/sap/server.c
+++ b/profiles/sap/server.c
@@ -1369,7 +1369,7 @@ int sap_server_register(struct btd_adapter *adapter)
btd_adapter_get_address(adapter),
BT_IO_OPT_CHANNEL, SAP_SERVER_CHANNEL,
BT_IO_OPT_SEC_LEVEL, BT_IO_SEC_HIGH,
- BT_IO_OPT_MASTER, TRUE,
+ BT_IO_OPT_CENTRAL, TRUE,
BT_IO_OPT_INVALID);
if (!io) {
error("Can't listen at channel %d.", SAP_SERVER_CHANNEL);
diff --git a/tools/btiotest.c b/tools/btiotest.c
index cb8cc35348..3f4900a5a5 100644
--- a/tools/btiotest.c
+++ b/tools/btiotest.c
@@ -343,7 +343,7 @@ static void l2cap_listen(const char *src, uint8_t addr_type, uint16_t psm,
BT_IO_OPT_PSM, psm,
BT_IO_OPT_CID, cid,
BT_IO_OPT_SEC_LEVEL, sec,
- BT_IO_OPT_MASTER, master,
+ BT_IO_OPT_CENTRAL, master,
BT_IO_OPT_INVALID);
else
l2_srv = bt_io_listen(conn, cfm, data,
@@ -353,7 +353,7 @@ static void l2cap_listen(const char *src, uint8_t addr_type, uint16_t psm,
BT_IO_OPT_PSM, psm,
BT_IO_OPT_CID, cid,
BT_IO_OPT_SEC_LEVEL, sec,
- BT_IO_OPT_MASTER, master,
+ BT_IO_OPT_CENTRAL, master,
BT_IO_OPT_INVALID);

if (!l2_srv) {
@@ -427,7 +427,7 @@ static void rfcomm_listen(const char *src, uint8_t ch, gboolean defer,
BT_IO_OPT_SOURCE, src,
BT_IO_OPT_CHANNEL, ch,
BT_IO_OPT_SEC_LEVEL, sec,
- BT_IO_OPT_MASTER, master,
+ BT_IO_OPT_CENTRAL, master,
BT_IO_OPT_INVALID);
else
rc_srv = bt_io_listen(conn, cfm,
@@ -435,7 +435,7 @@ static void rfcomm_listen(const char *src, uint8_t ch, gboolean defer,
&err,
BT_IO_OPT_CHANNEL, ch,
BT_IO_OPT_SEC_LEVEL, sec,
- BT_IO_OPT_MASTER, master,
+ BT_IO_OPT_CENTRAL, master,
BT_IO_OPT_INVALID);

if (!rc_srv) {
--
2.33.0.464.g1972c5931b-goog