[Bluez,v2,01/13] lib: Inclusive language changes

Message ID	20210902120509.Bluez.v2.1.I3be2e373e96293524fa38328ebac177eddc71938@changeid (mailing list archive)
State	Superseded
Headers	show Return-Path: <linux-bluetooth-owner@kernel.org> Date: Thu, 2 Sep 2021 12:06:59 +0800 In-Reply-To: <20210902040711.665952-1-apusaka@google.com> Message-Id: <20210902120509.Bluez.v2.1.I3be2e373e96293524fa38328ebac177eddc71938@changeid> Mime-Version: 1.0 References: <20210902040711.665952-1-apusaka@google.com> Subject: [Bluez PATCH v2 01/13] lib: Inclusive language changes 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> Content-Type: text/plain; charset="UTF-8" Precedence: bulk
Series	Inclusive language changes \| expand [Bluez,v2,00/13] Inclusive language changes [Bluez,v2,01/13] lib: Inclusive language changes [Bluez,v2,02/13] btio: Inclusive language changes [Bluez,v2,03/13] monitor: Inclusive language changes [Bluez,v2,04/13] emulator: Inclusive language changes [Bluez,v2,05/13] tools: Inclusive language changes [Bluez,v2,06/13] plugins/sixaxis: Inclusive language changes [Bluez,v2,07/13] profiles: Inclusive language changes [Bluez,v2,08/13] src: Inclusive language changes [Bluez,v2,09/13] client: Inclusive language changes [Bluez,v2,10/13] mesh: Inclusive language changes [Bluez,v2,11/13] unit/mesh: Inclusive language changes [Bluez,v2,12/13] doc: Inclusive language update [Bluez,v2,13/13] adapter: Inclusive language for storing LTK

Hi Luiz, Thanks, patch series v4 is sent to address lines over 80 columns. There's still one instance left though (in profiles/health/mcap.h) which is much a hassle to fix. The code around seems to encourage commenting over 80 lines and there is no good example on how we should handle the situation. I decided to leave that as is. Cheers, Archie On Sat, 4 Sept 2021 at 07:11, Luiz Augusto von Dentz <luiz.dentz@gmail.com> wrote: > > Hi Archie, Tedd, > > On Wed, Sep 1, 2021 at 9:51 PM <bluez.test.bot@gmail.com> wrote: > > > > This is automated email and please do not reply to this email! > > > > Dear submitter, > > > > Thank you for submitting the patches to the linux bluetooth mailing list. > > This is a CI test results with your patch series: > > PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=540975 > > > > ---Test result--- > > > > Test Summary: > > CheckPatch FAIL 4.45 seconds > > GitLint FAIL 1.28 seconds > > Prep - Setup ELL PASS 39.55 seconds > > Build - Prep PASS 0.10 seconds > > Build - Configure PASS 6.94 seconds > > Build - Make PASS 171.01 seconds > > Make Check PASS 8.97 seconds > > Make Distcheck PASS 207.59 seconds > > Build w/ext ELL - Configure PASS 7.26 seconds > > Build w/ext ELL - Make PASS 160.39 seconds > > > > Details > > ############################## > > Test: CheckPatch - FAIL > > Desc: Run checkpatch.pl script with rule in .checkpatch.conf > > Output: > > lib: Inclusive language changes > > ERROR:SPACING: space required after that ',' (ctx:VxV) > > #146: FILE: lib/hci.c:739: > > + { "<AFH class. perip.>",LMP_AFH_CLS_PRP }, /* Bit 4 */ > > ^ > > > > WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) > > #296: FILE: lib/hci.h:427: > > +} __attribute__ ((packed)) central_link_key_cp; > > > > WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) > > #312: FILE: lib/hci.h:1568: > > +} __attribute__ ((packed)) le_read_accept_list_size_rp; > > > > WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) > > #325: FILE: lib/hci.h:1577: > > +} __attribute__ ((packed)) le_add_device_to_accept_list_cp; > > > > WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) > > #335: FILE: lib/hci.h:1584: > > +} __attribute__ ((packed)) le_remove_device_from_accept_list_cp; > > > > WARNING:PREFER_DEFINED_ATTRIBUTE_MACRO: Prefer __packed over __attribute__((packed)) > > #352: FILE: lib/hci.h:1812: > > +} __attribute__ ((packed)) evt_central_link_key_complete; > > @Tedd we should probably shut down warnings like above, since that > only apply to the kernel tree. > > > WARNING:LONG_LINE: line length of 81 exceeds 80 columns > > #378: FILE: lib/hci_lib.h:120: > > +int hci_le_add_accept_list(int dd, const bdaddr_t *bdaddr, uint8_t type, int to); > > > > - total: 1 errors, 6 warnings, 531 lines checked > > > > NOTE: For some of the reported defects, checkpatch may be able to > > mechanically convert to the typical style using --fix or --fix-inplace. > > > > "[PATCH] lib: Inclusive language changes" has style problems, please review. > > > > NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO > > > > NOTE: If any of the errors are false positives, please report > > them to the maintainer, see CHECKPATCH in MAINTAINERS. > > > > monitor: Inclusive language changes > > WARNING:LONG_LINE_STRING: line length of 83 exceeds 80 columns > > #1147: FILE: monitor/packet.c:3681: > > + print_field("Peripheral Conn. Interval: 0x%4.4x - 0x%4.4x", > > > > ERROR:TRAILING_WHITESPACE: trailing whitespace > > #1388: FILE: monitor/packet.c:8075: > > +^Iprint_field("Central to Peripheral Maximum SDU: 0x%4.4x", $ > > > > WARNING:LONG_LINE: line length of 84 exceeds 80 columns > > #1538: FILE: monitor/packet.c:10261: > > + const struct bt_hci_evt_peripheral_broadcast_channel_map_change *evt = data; > > @Archie Pusaka you will need to fix these long lines going past 80 > columns, also maybe it would have been better to cut > peripheral_broadcast from the struct name above since channel_map > should be enough to distinct from other events. > > > - total: 1 errors, 2 warnings, 1635 lines checked > > > > NOTE: For some of the reported defects, checkpatch may be able to > > mechanically convert to the typical style using --fix or --fix-inplace. > > > > NOTE: Whitespace errors detected. > > You may wish to use scripts/cleanpatch or scripts/cleanfile > > > > "[PATCH] monitor: Inclusive language changes" has style problems, please review. > > > > NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO > > > > NOTE: If any of the errors are false positives, please report > > them to the maintainer, see CHECKPATCH in MAINTAINERS. > > > > emulator: Inclusive language changes > > WARNING:LONG_LINE_COMMENT: line length of 81 exceeds 80 columns > > #130: FILE: emulator/btdev.c:3609: > > + * • any advertising filter policy uses the Accept List and advertising > > > > WARNING:LONG_LINE_COMMENT: line length of 81 exceeds 80 columns > > #177: FILE: emulator/btdev.c:3646: > > + * • any advertising filter policy uses the Accept List and advertising > > > > WARNING:LONG_LINE_COMMENT: line length of 81 exceeds 80 columns > > #232: FILE: emulator/btdev.c:3697: > > + * • any advertising filter policy uses the Accept List and advertising > > > > WARNING:LONG_LINE_COMMENT: line length of 84 exceeds 80 columns > > #383: FILE: emulator/btdev.c:6188: > > + btdev->le_features[0] |= 0x08; /* Peripheral-initiated Features Exchange */ > > > > WARNING:LONG_LINE_COMMENT: line length of 84 exceeds 80 columns > > #607: FILE: emulator/le.c:346: > > + //hci->le_features[0] |= 0x08; /* Peripheral-initiated Features Exchange */ > > > > WARNING:LONG_LINE_COMMENT: line length of 84 exceeds 80 columns > > #628: FILE: emulator/le.c:402: > > + hci->le_states[0] |= 0x40; /* Initiating + Connection (Central Role) */ > > > > - total: 0 errors, 6 warnings, 894 lines checked > > > > NOTE: For some of the reported defects, checkpatch may be able to > > mechanically convert to the typical style using --fix or --fix-inplace. > > > > "[PATCH] emulator: Inclusive language changes" has style problems, please review. > > > > NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO > > > > NOTE: If any of the errors are false positives, please report > > them to the maintainer, see CHECKPATCH in MAINTAINERS. > > > > tools: Inclusive language changes > > WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) > > #10: > > https://specificationrefs.bluetooth.com/language-mapping/Appropriate_Language_Mapping_Table.pdf > > > > WARNING:LONG_LINE: line length of 92 exceeds 80 columns > > #340: FILE: tools/hciconfig.c:1925: > > + { "block", cmd_block, "<bdaddr>", "Add a device to the reject list" }, > > > > WARNING:LONG_LINE: line length of 97 exceeds 80 columns > > #341: FILE: tools/hciconfig.c:1926: > > + { "unblock", cmd_unblock, "<bdaddr>", "Remove a device from the reject list" }, > > > > ERROR:INITIALISED_STATIC: do not initialise statics to 0 > > #861: FILE: tools/l2test.c:113: > > +static int central = 0; > > > > WARNING:MISSING_SPACE: break quoted strings at a space character > > #906: FILE: tools/l2test.c:1340: > > while ((opt = getopt(argc, argv, "a:b:cde:g:i:mnpqrstuwxyz" > > + "AB:CD:EF:GH:I:J:K:L:M:N:O:P:Q:RSTUV:W:X:Y:Z:")) != EOF) { > > > > ERROR:FUNCTION_WITHOUT_ARGS: Bad function definition - void setup_accept_list() should probably be void setup_accept_list(void) > > #1033: FILE: tools/mesh-gatt/net.c:944: > > +static void setup_accept_list() > > > > WARNING:LONG_LINE_STRING: line length of 86 exceeds 80 columns > > #1657: FILE: tools/mgmt-tester.c:11605: > > + test_bredrle50_full("Ext Adv. connectable & connected (peripheral) - Success", > > > > WARNING:LONG_LINE_STRING: line length of 90 exceeds 80 columns > > #1664: FILE: tools/mgmt-tester.c:11610: > > + test_bredrle50_full("Ext Adv. non-connectable & connected (peripheral) - Success", > > > > WARNING:LONG_LINE_STRING: line length of 83 exceeds 80 columns > > #1671: FILE: tools/mgmt-tester.c:11615: > > + test_bredrle50_full("Ext Adv. connectable & connected (central) - Success", > > > > WARNING:LONG_LINE_STRING: line length of 87 exceeds 80 columns > > #1678: FILE: tools/mgmt-tester.c:11620: > > + test_bredrle50_full("Ext Adv. non-connectable & connected (central) - Success", > > > > WARNING:LONG_LINE_STRING: line length of 86 exceeds 80 columns > > #1725: FILE: tools/parser/avdtp.c:662: > > + printf("AVDTP(c): ver %d %s%scc %d %spt %d seqn %d time %d ssrc %d\n", > > > > WARNING:LONG_LINE: line length of 81 exceeds 80 columns > > #1874: FILE: tools/parser/hci.c:1643: > > + (cp->filter == 0x01 ? "accept list only" : "reserved"))); > > > > ERROR:INITIALISED_STATIC: do not initialise statics to 0 > > #2196: FILE: tools/rctest.c:79: > > +static int central = 0; > > > > WARNING:LONG_LINE: line length of 90 exceeds 80 columns > > #2239: FILE: tools/rctest.c:700: > > + while ((opt=getopt(argc,argv,"rdscuwmna:b:i:P:U:B:O:N:CAESL:W:M:D:Y:T")) != EOF) { > > > > ERROR:SPACING: spaces required around that '=' (ctx:VxV) > > #2239: FILE: tools/rctest.c:700: > > + while ((opt=getopt(argc,argv,"rdscuwmna:b:i:P:U:B:O:N:CAESL:W:M:D:Y:T")) != EOF) { > > ^ > > > > ERROR:SPACING: space required after that ',' (ctx:VxV) > > #2239: FILE: tools/rctest.c:700: > > + while ((opt=getopt(argc,argv,"rdscuwmna:b:i:P:U:B:O:N:CAESL:W:M:D:Y:T")) != EOF) { > > ^ > > > > ERROR:SPACING: space required after that ',' (ctx:VxV) > > #2239: FILE: tools/rctest.c:700: > > + while ((opt=getopt(argc,argv,"rdscuwmna:b:i:P:U:B:O:N:CAESL:W:M:D:Y:T")) != EOF) { > > ^ > > > > ERROR:INITIALISED_STATIC: do not initialise statics to 0 > > #2347: FILE: tools/rfcomm.c:40: > > +static int central = 0; > > > > WARNING:LONG_LINE: line length of 91 exceeds 80 columns > > #2383: FILE: tools/rfcomm.c:683: > > + while ((opt = getopt_long(argc, argv, "+i:rahAESCL:", main_options, NULL)) != -1) { > > > > - total: 7 errors, 12 warnings, 2159 lines checked > > > > NOTE: For some of the reported defects, checkpatch may be able to > > mechanically convert to the typical style using --fix or --fix-inplace. > > > > "[PATCH] tools: Inclusive language changes" has style problems, please review. > > > > NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO > > > > NOTE: If any of the errors are false positives, please report > > them to the maintainer, see CHECKPATCH in MAINTAINERS. > > > > profiles: Inclusive language changes > > WARNING:LONG_LINE_COMMENT: line length of 85 exceeds 80 columns > > #87: FILE: profiles/health/mcap.c:56: > > + guint remote_caps; /* CSP-Peripheral: remote central got caps */ > > > > WARNING:LONG_LINE_COMMENT: line length of 90 exceeds 80 columns > > #88: FILE: profiles/health/mcap.c:57: > > + guint rem_req_acc; /* CSP-Peripheral: accuracy required by central */ > > > > WARNING:LONG_LINE_COMMENT: line length of 81 exceeds 80 columns > > #94: FILE: profiles/health/mcap.c:63: > > + void *csp_priv_data; /* CSP-Central: In-flight request data */ > > > > WARNING:LONG_LINE_COMMENT: line length of 100 exceeds 80 columns > > #116: FILE: profiles/health/mcap.h:273: > > + mcap_info_ind_event_cb mcl_sync_infoind_cb; /* (CSP Central) Received info indication */ > > > > - total: 0 errors, 4 warnings, 87 lines checked > > > > NOTE: For some of the reported defects, checkpatch may be able to > > mechanically convert to the typical style using --fix or --fix-inplace. > > > > "[PATCH] profiles: Inclusive language changes" has style problems, please review. > > > > NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO > > > > NOTE: If any of the errors are false positives, please report > > them to the maintainer, see CHECKPATCH in MAINTAINERS. > > > > src: Inclusive language changes > > WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) > > #10: > > https://specificationrefs.bluetooth.com/language-mapping/Appropriate_Language_Mapping_Table.pdf > > > > ERROR:INITIALISED_STATIC: do not initialise statics to NULL > > #36: FILE: src/adapter.c:115: > > +static struct mgmt *mgmt_primary = NULL; > > > > - total: 1 errors, 1 warnings, 478 lines checked > > > > NOTE: For some of the reported defects, checkpatch may be able to > > mechanically convert to the typical style using --fix or --fix-inplace. > > > > "[PATCH] src: Inclusive language changes" has style problems, please review. > > > > NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO > > > > NOTE: If any of the errors are false positives, please report > > them to the maintainer, see CHECKPATCH in MAINTAINERS. > > > > mesh: Inclusive language changes > > WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) > > #7: > > https://specificationrefs.bluetooth.com/language-mapping/Appropriate_Language_Mapping_Table.pdf > > > > ERROR:INITIALISED_STATIC: do not initialise statics to 0 > > #28: FILE: mesh/net-keys.c:56: > > +static uint32_t last_flooding_id = 0; > > > > - total: 1 errors, 1 warnings, 146 lines checked > > > > NOTE: For some of the reported defects, checkpatch may be able to > > mechanically convert to the typical style using --fix or --fix-inplace. > > > > "[PATCH] mesh: Inclusive language changes" has style problems, please review. > > > > NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO > > > > NOTE: If any of the errors are false positives, please report > > them to the maintainer, see CHECKPATCH in MAINTAINERS. > > > > unit/mesh: Inclusive language changes > > WARNING:COMMIT_LOG_LONG_LINE: Possible unwrapped commit description (prefer a maximum 75 chars per line) > > #7: > > https://specificationrefs.bluetooth.com/language-mapping/Appropriate_Language_Mapping_Table.pdf > > > > - total: 0 errors, 1 warnings, 16 lines checked > > > > NOTE: For some of the reported defects, checkpatch may be able to > > mechanically convert to the typical style using --fix or --fix-inplace. > > > > "[PATCH] unit/mesh: Inclusive language changes" has style problems, please review. > > > > NOTE: Ignored message types: COMMIT_MESSAGE COMPLEX_MACRO CONST_STRUCT FILE_PATH_CHANGES MISSING_SIGN_OFF PREFER_PACKED SPDX_LICENSE_TAG SPLIT_STRING SSCANF_TO_KSTRTO > > > > NOTE: If any of the errors are false positives, please report > > them to the maintainer, see CHECKPATCH in MAINTAINERS. > > You should probably add a hook like the following > > cat .git/hooks/pre-commit > exec git diff --cached | <pathto:checkpatch.pl> -q --no-signoff > --ignore CAMELCASE,NEW_TYPEDEFS,INITIALISED_STATIC,GLOBAL_INITIALISERS,PREFER_PACKED,SPACING,FSF_MAILING_ADDRESS,TRAILING_STATEMENTS,RETURN_VOID,FILE_PATH_CHANGES,COMPLEX_MACRO,SPLIT_STRING,OPEN_BRACE,MISSING_SPACE,STATIC_CONST_CHAR_ARRAY,LINE_SPACING,SYMBOLIC_PERMS,SPDX_LICENSE_TAG,SUSPECT_CODE_INDENT,SSCANF_TO_KSTRTO,EXECUTE_PERMISSIONS > --show-types - > > I should probably add something like this to HACKING so I don't have > to remind contributors how to use checkpatch locally. > > > > > ############################## > > Test: GitLint - FAIL > > Desc: Run gitlint with rule in .gitlint > > Output: > > tools: Inclusive language changes > > 7: B1 Line exceeds max length (95>80): "https://specificationrefs.bluetooth.com/language-mapping/Appropriate_Language_Mapping_Table.pdf" > > > > src: Inclusive language changes > > 7: B1 Line exceeds max length (95>80): "https://specificationrefs.bluetooth.com/language-mapping/Appropriate_Language_Mapping_Table.pdf" > > > > mesh: Inclusive language changes > > 4: B1 Line exceeds max length (95>80): "https://specificationrefs.bluetooth.com/language-mapping/Appropriate_Language_Mapping_Table.pdf" > > > > unit/mesh: Inclusive language changes > > 4: B1 Line exceeds max length (95>80): "https://specificationrefs.bluetooth.com/language-mapping/Appropriate_Language_Mapping_Table.pdf" > > > > > > ############################## > > Test: Prep - Setup ELL - PASS > > Desc: Clone, build, and install ELL > > > > ############################## > > Test: Build - Prep - PASS > > Desc: Prepare environment for build > > > > ############################## > > Test: Build - Configure - PASS > > Desc: Configure the BlueZ source tree > > > > ############################## > > Test: Build - Make - PASS > > Desc: Build the BlueZ source tree > > > > ############################## > > Test: Make Check - PASS > > Desc: Run 'make check' > > > > ############################## > > Test: Make Distcheck - PASS > > Desc: Run distcheck to check the distribution > > > > ############################## > > Test: Build w/ext ELL - Configure - PASS > > Desc: Configure BlueZ source with '--enable-external-ell' configuration > > > > ############################## > > Test: Build w/ext ELL - Make - PASS > > Desc: Build BlueZ source with '--enable-external-ell' configuration > > > > > > > > --- > > Regards, > > Linux Bluetooth > > > > > -- > Luiz Augusto von Dentz

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/btio/btio.c b/btio/btio.c index 1f1c374bca..ce958bdd09 100644 --- a/btio/btio.c +++ b/btio/btio.c @@ -369,13 +369,13 @@ static int l2cap_set_master(int sock, int master) return -errno; if (master) { - if (flags & L2CAP_LM_MASTER) + if (flags & L2CAP_LM_CENTRAL) return 0; - flags |= L2CAP_LM_MASTER; + flags |= L2CAP_LM_CENTRAL; } else { - if (!(flags & L2CAP_LM_MASTER)) + if (!(flags & L2CAP_LM_CENTRAL)) return 0; - flags &= ~L2CAP_LM_MASTER; + flags &= ~L2CAP_LM_CENTRAL; } if (setsockopt(sock, SOL_L2CAP, L2CAP_LM, &flags, sizeof(flags)) < 0) @@ -394,13 +394,13 @@ static int rfcomm_set_master(int sock, int master) return -errno; if (master) { - if (flags & RFCOMM_LM_MASTER) + if (flags & RFCOMM_LM_CENTRAL) return 0; - flags |= RFCOMM_LM_MASTER; + flags |= RFCOMM_LM_CENTRAL; } else { - if (!(flags & RFCOMM_LM_MASTER)) + if (!(flags & RFCOMM_LM_CENTRAL)) return 0; - flags &= ~RFCOMM_LM_MASTER; + flags &= ~RFCOMM_LM_CENTRAL; } if (setsockopt(sock, SOL_RFCOMM, RFCOMM_LM, &flags, sizeof(flags)) < 0) @@ -1180,7 +1180,7 @@ parse_opts: return FALSE; } *(va_arg(args, gboolean *)) = - (flags & L2CAP_LM_MASTER) ? TRUE : FALSE; + (flags & L2CAP_LM_CENTRAL) ? TRUE : FALSE; break; case BT_IO_OPT_HANDLE: if (l2cap_get_info(sock, &handle, dev_class) < 0) { @@ -1345,7 +1345,7 @@ static gboolean rfcomm_get(int sock, GError **err, BtIOOption opt1, return FALSE; } *(va_arg(args, gboolean *)) = - (flags & RFCOMM_LM_MASTER) ? TRUE : FALSE; + (flags & RFCOMM_LM_CENTRAL) ? TRUE : FALSE; break; case BT_IO_OPT_HANDLE: if (rfcomm_get_info(sock, &handle, dev_class) < 0) { diff --git a/lib/hci.c b/lib/hci.c index 53af0a1148..d2753a934d 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_CENTRAL }, { "AUTH", HCI_LM_AUTH }, { "ENCRYPT", HCI_LM_ENCRYPT }, { "TRUSTED", HCI_LM_TRUSTED }, @@ -304,8 +304,8 @@ char *hci_lmtostr(unsigned int lm) return NULL; *str = 0; - if (!(lm & HCI_LM_MASTER)) - strcpy(str, "SLAVE "); + if (!(lm & HCI_LM_CENTRAL)) + 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_PRP }, /* Bit 3 */ + { "<AFH class. perip.>",LMP_AFH_CLS_PRP }, /* 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_CEN }, /* Bit 3 */ + { "<AFH class. cent.>", LMP_AFH_CLS_CEN }, /* 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 */ @@ -1322,10 +1322,10 @@ int hci_disconnect(int dd, uint16_t handle, uint8_t reason, int to) return 0; } -int hci_le_add_white_list(int dd, const bdaddr_t *bdaddr, uint8_t type, int to) +int hci_le_add_accept_list(int dd, const bdaddr_t *bdaddr, uint8_t type, int to) { struct hci_request rq; - le_add_device_to_white_list_cp cp; + le_add_device_to_accept_list_cp cp; uint8_t status; memset(&cp, 0, sizeof(cp)); @@ -1334,9 +1334,9 @@ int hci_le_add_white_list(int dd, const bdaddr_t *bdaddr, uint8_t type, int to) memset(&rq, 0, sizeof(rq)); rq.ogf = OGF_LE_CTL; - rq.ocf = OCF_LE_ADD_DEVICE_TO_WHITE_LIST; + rq.ocf = OCF_LE_ADD_DEVICE_TO_ACCEPT_LIST; rq.cparam = &cp; - rq.clen = LE_ADD_DEVICE_TO_WHITE_LIST_CP_SIZE; + rq.clen = LE_ADD_DEVICE_TO_ACCEPT_LIST_CP_SIZE; rq.rparam = &status; rq.rlen = 1; @@ -1351,10 +1351,10 @@ int hci_le_add_white_list(int dd, const bdaddr_t *bdaddr, uint8_t type, int to) return 0; } -int hci_le_rm_white_list(int dd, const bdaddr_t *bdaddr, uint8_t type, int to) +int hci_le_rm_accept_list(int dd, const bdaddr_t *bdaddr, uint8_t type, int to) { struct hci_request rq; - le_remove_device_from_white_list_cp cp; + le_remove_device_from_accept_list_cp cp; uint8_t status; memset(&cp, 0, sizeof(cp)); @@ -1363,9 +1363,9 @@ int hci_le_rm_white_list(int dd, const bdaddr_t *bdaddr, uint8_t type, int to) memset(&rq, 0, sizeof(rq)); rq.ogf = OGF_LE_CTL; - rq.ocf = OCF_LE_REMOVE_DEVICE_FROM_WHITE_LIST; + rq.ocf = OCF_LE_REMOVE_DEVICE_FROM_ACCEPT_LIST; rq.cparam = &cp; - rq.clen = LE_REMOVE_DEVICE_FROM_WHITE_LIST_CP_SIZE; + rq.clen = LE_REMOVE_DEVICE_FROM_ACCEPT_LIST_CP_SIZE; rq.rparam = &status; rq.rlen = 1; @@ -1380,18 +1380,18 @@ int hci_le_rm_white_list(int dd, const bdaddr_t *bdaddr, uint8_t type, int to) return 0; } -int hci_le_read_white_list_size(int dd, uint8_t *size, int to) +int hci_le_read_accept_list_size(int dd, uint8_t *size, int to) { struct hci_request rq; - le_read_white_list_size_rp rp; + le_read_accept_list_size_rp rp; memset(&rp, 0, sizeof(rp)); memset(&rq, 0, sizeof(rq)); rq.ogf = OGF_LE_CTL; - rq.ocf = OCF_LE_READ_WHITE_LIST_SIZE; + rq.ocf = OCF_LE_READ_ACCEPT_LIST_SIZE; rq.rparam = &rp; - rq.rlen = LE_READ_WHITE_LIST_SIZE_RP_SIZE; + rq.rlen = LE_READ_ACCEPT_LIST_SIZE_RP_SIZE; if (hci_send_req(dd, &rq, to) < 0) return -1; @@ -1407,14 +1407,14 @@ int hci_le_read_white_list_size(int dd, uint8_t *size, int to) return 0; } -int hci_le_clear_white_list(int dd, int to) +int hci_le_clear_accept_list(int dd, int to) { struct hci_request rq; uint8_t status; memset(&rq, 0, sizeof(rq)); rq.ogf = OGF_LE_CTL; - rq.ocf = OCF_LE_CLEAR_WHITE_LIST; + rq.ocf = OCF_LE_CLEAR_ACCEPT_LIST; rq.rparam = &status; rq.rlen = 1; diff --git a/lib/hci.h b/lib/hci.h index 3382b87bf3..e31685b644 100644 --- a/lib/hci.h +++ b/lib/hci.h @@ -241,8 +241,8 @@ enum { #define LMP_EV4 0x01 #define LMP_EV5 0x02 -#define LMP_AFH_CAP_SLV 0x08 -#define LMP_AFH_CLS_SLV 0x10 +#define LMP_AFH_CAP_PRP 0x08 +#define LMP_AFH_CLS_PRP 0x10 #define LMP_NO_BREDR 0x20 #define LMP_LE 0x40 #define LMP_EDR_3SLOT 0x80 @@ -250,8 +250,8 @@ enum { #define LMP_EDR_5SLOT 0x01 #define LMP_SNIFF_SUBR 0x02 #define LMP_PAUSE_ENC 0x04 -#define LMP_AFH_CAP_MST 0x08 -#define LMP_AFH_CLS_MST 0x10 +#define LMP_AFH_CAP_CEN 0x08 +#define LMP_AFH_CLS_CEN 0x10 #define LMP_EDR_ESCO_2M 0x20 #define LMP_EDR_ESCO_3M 0x40 #define LMP_EDR_3S_ESCO 0x80 @@ -281,7 +281,7 @@ enum { /* Link mode */ #define HCI_LM_ACCEPT 0x8000 -#define HCI_LM_MASTER 0x0001 +#define HCI_LM_CENTRAL 0x0001 #define HCI_LM_AUTH 0x0002 #define HCI_LM_ENCRYPT 0x0004 #define HCI_LM_TRUSTED 0x0008 @@ -421,11 +421,11 @@ typedef struct { } __attribute__ ((packed)) change_conn_link_key_cp; #define CHANGE_CONN_LINK_KEY_CP_SIZE 2 -#define OCF_MASTER_LINK_KEY 0x0017 +#define OCF_CENTRAL_LINK_KEY 0x0017 typedef struct { uint8_t key_flag; -} __attribute__ ((packed)) master_link_key_cp; -#define MASTER_LINK_KEY_CP_SIZE 1 +} __attribute__ ((packed)) central_link_key_cp; +#define CENTRAL_LINK_KEY_CP_SIZE 1 #define OCF_REMOTE_NAME_REQ 0x0019 typedef struct { @@ -1561,28 +1561,28 @@ typedef struct { #define OCF_LE_CREATE_CONN_CANCEL 0x000E -#define OCF_LE_READ_WHITE_LIST_SIZE 0x000F +#define OCF_LE_READ_ACCEPT_LIST_SIZE 0x000F typedef struct { uint8_t status; uint8_t size; -} __attribute__ ((packed)) le_read_white_list_size_rp; -#define LE_READ_WHITE_LIST_SIZE_RP_SIZE 2 +} __attribute__ ((packed)) le_read_accept_list_size_rp; +#define LE_READ_ACCEPT_LIST_SIZE_RP_SIZE 2 -#define OCF_LE_CLEAR_WHITE_LIST 0x0010 +#define OCF_LE_CLEAR_ACCEPT_LIST 0x0010 -#define OCF_LE_ADD_DEVICE_TO_WHITE_LIST 0x0011 +#define OCF_LE_ADD_DEVICE_TO_ACCEPT_LIST 0x0011 typedef struct { uint8_t bdaddr_type; bdaddr_t bdaddr; -} __attribute__ ((packed)) le_add_device_to_white_list_cp; -#define LE_ADD_DEVICE_TO_WHITE_LIST_CP_SIZE 7 +} __attribute__ ((packed)) le_add_device_to_accept_list_cp; +#define LE_ADD_DEVICE_TO_ACCEPT_LIST_CP_SIZE 7 -#define OCF_LE_REMOVE_DEVICE_FROM_WHITE_LIST 0x0012 +#define OCF_LE_REMOVE_DEVICE_FROM_ACCEPT_LIST 0x0012 typedef struct { uint8_t bdaddr_type; bdaddr_t bdaddr; -} __attribute__ ((packed)) le_remove_device_from_white_list_cp; -#define LE_REMOVE_DEVICE_FROM_WHITE_LIST_CP_SIZE 7 +} __attribute__ ((packed)) le_remove_device_from_accept_list_cp; +#define LE_REMOVE_DEVICE_FROM_ACCEPT_LIST_CP_SIZE 7 #define OCF_LE_CONN_UPDATE 0x0013 typedef struct { @@ -1804,13 +1804,13 @@ typedef struct { } __attribute__ ((packed)) evt_change_conn_link_key_complete; #define EVT_CHANGE_CONN_LINK_KEY_COMPLETE_SIZE 3 -#define EVT_MASTER_LINK_KEY_COMPLETE 0x0A +#define EVT_CENTRAL_LINK_KEY_COMPLETE 0x0A typedef struct { uint8_t status; uint16_t handle; uint8_t key_flag; -} __attribute__ ((packed)) evt_master_link_key_complete; -#define EVT_MASTER_LINK_KEY_COMPLETE_SIZE 4 +} __attribute__ ((packed)) evt_central_link_key_complete; +#define EVT_CENTRAL_LINK_KEY_COMPLETE_SIZE 4 #define EVT_READ_REMOTE_FEATURES_COMPLETE 0x0B typedef struct { @@ -2149,7 +2149,7 @@ typedef struct { uint16_t interval; uint16_t latency; uint16_t supervision_timeout; - uint8_t master_clock_accuracy; + uint8_t central_clock_accuracy; } __attribute__ ((packed)) evt_le_connection_complete; #define EVT_LE_CONN_COMPLETE_SIZE 18 diff --git a/lib/hci_lib.h b/lib/hci_lib.h index 6b1a548b55..a0dfed615f 100644 --- a/lib/hci_lib.h +++ b/lib/hci_lib.h @@ -117,10 +117,10 @@ int hci_le_create_conn(int dd, uint16_t interval, uint16_t window, int hci_le_conn_update(int dd, uint16_t handle, uint16_t min_interval, uint16_t max_interval, uint16_t latency, uint16_t supervision_timeout, int to); -int hci_le_add_white_list(int dd, const bdaddr_t *bdaddr, uint8_t type, int to); -int hci_le_rm_white_list(int dd, const bdaddr_t *bdaddr, uint8_t type, int to); -int hci_le_read_white_list_size(int dd, uint8_t *size, int to); -int hci_le_clear_white_list(int dd, int to); +int hci_le_add_accept_list(int dd, const bdaddr_t *bdaddr, uint8_t type, int to); +int hci_le_rm_accept_list(int dd, const bdaddr_t *bdaddr, uint8_t type, int to); +int hci_le_read_accept_list_size(int dd, uint8_t *size, int to); +int hci_le_clear_accept_list(int dd, int to); int hci_le_add_resolving_list(int dd, const bdaddr_t *bdaddr, uint8_t type, uint8_t *peer_irk, uint8_t *local_irk, int to); int hci_le_rm_resolving_list(int dd, const bdaddr_t *bdaddr, uint8_t type, int to); diff --git a/lib/l2cap.h b/lib/l2cap.h index 9197800df4..a0ea111839 100644 --- a/lib/l2cap.h +++ b/lib/l2cap.h @@ -52,7 +52,7 @@ struct l2cap_conninfo { }; #define L2CAP_LM 0x03 -#define L2CAP_LM_MASTER 0x0001 +#define L2CAP_LM_CENTRAL 0x0001 #define L2CAP_LM_AUTH 0x0002 #define L2CAP_LM_ENCRYPT 0x0004 #define L2CAP_LM_TRUSTED 0x0008 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/lib/rfcomm.h b/lib/rfcomm.h index 0347ddc367..ab1df888c2 100644 --- a/lib/rfcomm.h +++ b/lib/rfcomm.h @@ -38,7 +38,7 @@ struct rfcomm_conninfo { }; #define RFCOMM_LM 0x03 -#define RFCOMM_LM_MASTER 0x0001 +#define RFCOMM_LM_CENTRAL 0x0001 #define RFCOMM_LM_AUTH 0x0002 #define RFCOMM_LM_ENCRYPT 0x0004 #define RFCOMM_LM_TRUSTED 0x0008 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/profiles/health/mcap.c b/profiles/health/mcap.c index be13af37a0..ab05a2bc24 100644 --- a/profiles/health/mcap.c +++ b/profiles/health/mcap.c @@ -2426,7 +2426,7 @@ static gboolean get_btrole(struct mcap_mcl *mcl) if (getsockopt(sock, SOL_L2CAP, L2CAP_LM, &flags, &len)) DBG("CSP: could not read role"); - return flags & L2CAP_LM_MASTER; + return flags & L2CAP_LM_CENTRAL; } uint64_t mcap_get_timestamp(struct mcap_mcl *mcl, 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/src/sdpd-server.c b/src/sdpd-server.c index 306b92a44c..c71e2c22da 100644 --- a/src/sdpd-server.c +++ b/src/sdpd-server.c @@ -72,7 +72,7 @@ static int init_server(uint16_t mtu, int master, int compat) } if (master) { - int opt = L2CAP_LM_MASTER; + int opt = L2CAP_LM_CENTRAL; if (setsockopt(l2cap_sock, SOL_L2CAP, L2CAP_LM, &opt, sizeof(opt)) < 0) { error("setsockopt: %s", strerror(errno)); return -1; diff --git a/tools/hcitool.c b/tools/hcitool.c index c6a9093733..f7fca5216c 100644 --- a/tools/hcitool.c +++ b/tools/hcitool.c @@ -2793,7 +2793,7 @@ static void cmd_lewladd(int dev_id, int argc, char **argv) str2ba(argv[0], &bdaddr); - err = hci_le_add_white_list(dd, &bdaddr, bdaddr_type, 1000); + err = hci_le_add_accept_list(dd, &bdaddr, bdaddr_type, 1000); hci_close_dev(dd); if (err < 0) { @@ -2839,7 +2839,7 @@ static void cmd_lewlrm(int dev_id, int argc, char **argv) str2ba(argv[0], &bdaddr); - err = hci_le_rm_white_list(dd, &bdaddr, LE_PUBLIC_ADDRESS, 1000); + err = hci_le_rm_accept_list(dd, &bdaddr, LE_PUBLIC_ADDRESS, 1000); hci_close_dev(dd); if (err < 0) { @@ -2883,7 +2883,7 @@ static void cmd_lewlsz(int dev_id, int argc, char **argv) exit(1); } - err = hci_le_read_white_list_size(dd, &size, 1000); + err = hci_le_read_accept_list_size(dd, &size, 1000); hci_close_dev(dd); if (err < 0) { @@ -2928,7 +2928,7 @@ static void cmd_lewlclr(int dev_id, int argc, char **argv) exit(1); } - err = hci_le_clear_white_list(dd, 1000); + err = hci_le_clear_accept_list(dd, 1000); hci_close_dev(dd); if (err < 0) { diff --git a/tools/l2test.c b/tools/l2test.c index 6e07f7b842..822cdc8cc9 100644 --- a/tools/l2test.c +++ b/tools/l2test.c @@ -484,7 +484,7 @@ static int do_connect(char *svr) if (reliable) opt |= L2CAP_LM_RELIABLE; if (master) - opt |= L2CAP_LM_MASTER; + opt |= L2CAP_LM_CENTRAL; if (auth) opt |= L2CAP_LM_AUTH; if (encr) @@ -587,7 +587,7 @@ static void do_listen(void (*handler)(int sk)) if (reliable) opt |= L2CAP_LM_RELIABLE; if (master) - opt |= L2CAP_LM_MASTER; + opt |= L2CAP_LM_CENTRAL; if (auth) opt |= L2CAP_LM_AUTH; if (encr) 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"; diff --git a/tools/parser/hci.c b/tools/parser/hci.c index d395e37f54..02ebcfc442 100644 --- a/tools/parser/hci.c +++ b/tools/parser/hci.c @@ -1084,7 +1084,7 @@ static inline void remote_name_req_dump(int level, struct frame *frm) static inline void master_link_key_dump(int level, struct frame *frm) { - master_link_key_cp *cp = frm->ptr; + central_link_key_cp *cp = frm->ptr; p_indent(level, frm); printf("flag %d\n", cp->key_flag); @@ -1771,7 +1771,7 @@ static inline void command_dump(int level, struct frame *frm) case OCF_DISCONNECT_LOGICAL_LINK: generic_command_dump(level + 1, frm); return; - case OCF_MASTER_LINK_KEY: + case OCF_CENTRAL_LINK_KEY: master_link_key_dump(level + 1, frm); return; case OCF_READ_REMOTE_EXT_FEATURES: @@ -2969,9 +2969,9 @@ static inline void cmd_complete_dump(int level, struct frame *frm) case OCF_LE_SET_SCAN_PARAMETERS: case OCF_LE_SET_SCAN_ENABLE: case OCF_LE_CREATE_CONN: - case OCF_LE_CLEAR_WHITE_LIST: - case OCF_LE_ADD_DEVICE_TO_WHITE_LIST: - case OCF_LE_REMOVE_DEVICE_FROM_WHITE_LIST: + case OCF_LE_CLEAR_ACCEPT_LIST: + case OCF_LE_ADD_DEVICE_TO_ACCEPT_LIST: + case OCF_LE_REMOVE_DEVICE_FROM_ACCEPT_LIST: case OCF_LE_SET_HOST_CHANNEL_CLASSIFICATION: case OCF_LE_RECEIVER_TEST: case OCF_LE_TRANSMITTER_TEST: @@ -3116,7 +3116,7 @@ static inline void remote_name_req_complete_dump(int level, struct frame *frm) static inline void master_link_key_complete_dump(int level, struct frame *frm) { - evt_master_link_key_complete *evt = frm->ptr; + evt_central_link_key_complete *evt = frm->ptr; p_indent(level, frm); printf("status 0x%2.2x handle %d flag %d\n", @@ -3874,7 +3874,7 @@ static inline void event_dump(int level, struct frame *frm) case EVT_CHANGE_CONN_LINK_KEY_COMPLETE: generic_response_dump(level + 1, frm); break; - case EVT_MASTER_LINK_KEY_COMPLETE: + case EVT_CENTRAL_LINK_KEY_COMPLETE: master_link_key_complete_dump(level + 1, frm); break; case EVT_REMOTE_NAME_REQ_COMPLETE: diff --git a/tools/rctest.c b/tools/rctest.c index 7d688691c4..034ae167b2 100644 --- a/tools/rctest.c +++ b/tools/rctest.c @@ -203,7 +203,7 @@ static int do_connect(const char *svr) /* Set link mode */ opt = 0; if (master) - opt |= RFCOMM_LM_MASTER; + opt |= RFCOMM_LM_CENTRAL; if (auth) opt |= RFCOMM_LM_AUTH; if (encr) @@ -294,7 +294,7 @@ static void do_listen(void (*handler)(int sk)) /* Set link mode */ opt = 0; if (master) - opt |= RFCOMM_LM_MASTER; + opt |= RFCOMM_LM_CENTRAL; if (auth) opt |= RFCOMM_LM_AUTH; if (encr) diff --git a/tools/rfcomm.c b/tools/rfcomm.c index 8e1db8ebaa..7ad7ca5ad6 100644 --- a/tools/rfcomm.c +++ b/tools/rfcomm.c @@ -435,7 +435,7 @@ static void cmd_listen(int ctl, int dev, bdaddr_t *bdaddr, int argc, char **argv lm = 0; if (master) - lm |= RFCOMM_LM_MASTER; + lm |= RFCOMM_LM_CENTRAL; if (auth) lm |= RFCOMM_LM_AUTH; if (encryption)

[Bluez,v2,01/13] lib: Inclusive language changes

Commit Message

Comments

Patch