From: Archie Pusaka <apusaka@xxxxxxxxxxxx>
"accept list" is preferred, as reflected in the BT core spec 5.3.
---
tools/hcitool.c | 90 +++++++++++++++++++++++------------------------
tools/hcitool.rst | 20 +++++------
2 files changed, 55 insertions(+), 55 deletions(-)
diff --git a/tools/hcitool.c b/tools/hcitool.c
index f61eae106c..082895bce4 100644
--- a/tools/hcitool.c
+++ b/tools/hcitool.c
@@ -2474,7 +2474,7 @@ static struct option lescan_options[] = {
{ "static", 0, 0, 's' },
{ "privacy", 0, 0, 'p' },
{ "passive", 0, 0, 'P' },
- { "whitelist", 0, 0, 'w' },
+ { "acceptlist", 0, 0, 'a' },
{ "discovery", 1, 0, 'd' },
{ "duplicates", 0, 0, 'D' },
{ 0, 0, 0, 0 }
@@ -2484,7 +2484,7 @@ static const char *lescan_help =
"Usage:\n"
"\tlescan [--privacy] enable privacy\n"
"\tlescan [--passive] set scan type passive (default active)\n"
- "\tlescan [--whitelist] scan for address in the whitelist only\n"
+ "\tlescan [--acceptlist] scan for address in the accept list only\n"
"\tlescan [--discovery=g|l] enable general or limited discovery"
"procedure\n"
"\tlescan [--duplicates] don't filter duplicates\n";
@@ -2511,8 +2511,8 @@ static void cmd_lescan(int dev_id, int argc, char **argv)
case 'P':
scan_type = 0x00; /* Passive */
break;
- case 'w':
- filter_policy = 0x01; /* Whitelist */
+ case 'a':
+ filter_policy = 0x01; /* Accept list */
break;
case 'd':
filter_type = optarg[0];
@@ -2678,14 +2678,14 @@ static struct option lecc_options[] = {
{ "help", 0, 0, 'h' },
{ "static", 0, 0, 's' },
{ "random", 0, 0, 'r' },
- { "whitelist", 0, 0, 'w' },
+ { "acceptlist", 0, 0, 'a' },
{ 0, 0, 0, 0 }
};
static const char *lecc_help =
"Usage:\n"
"\tlecc [--static] [--random] <bdaddr>\n"
- "\tlecc --whitelist\n";
+ "\tlecc --acceptlist\n";
static void cmd_lecc(int dev_id, int argc, char **argv)
{
@@ -2707,8 +2707,8 @@ static void cmd_lecc(int dev_id, int argc, char **argv)
case 'r':
peer_bdaddr_type = LE_RANDOM_ADDRESS;
break;
- case 'w':
- initiator_filter = 0x01; /* Use white list */
+ case 'a':
+ initiator_filter = 0x01; /* Use accept list */
break;
default:
printf("%s", lecc_help);
@@ -2753,34 +2753,34 @@ static void cmd_lecc(int dev_id, int argc, char **argv)
hci_close_dev(dd);
}
-static struct option lewladd_options[] = {
+static struct option lealall_options[] = {
{ "help", 0, 0, 'h' },
{ "random", 0, 0, 'r' },
{ 0, 0, 0, 0 }
};
-static const char *lewladd_help =
+static const char *lealall_help =
"Usage:\n"
- "\tlewladd [--random] <bdaddr>\n";
+ "\tlealall [--random] <bdaddr>\n";
-static void cmd_lewladd(int dev_id, int argc, char **argv)
+static void cmd_lealall(int dev_id, int argc, char **argv)
{
int err, opt, dd;
bdaddr_t bdaddr;
uint8_t bdaddr_type = LE_PUBLIC_ADDRESS;
- for_each_opt(opt, lewladd_options, NULL) {
+ for_each_opt(opt, lealall_options, NULL) {
switch (opt) {
case 'r':
bdaddr_type = LE_RANDOM_ADDRESS;
break;
default:
- printf("%s", lewladd_help);
+ printf("%s", lealall_help);
return;
}
}
- helper_arg(1, 1, &argc, &argv, lewladd_help);
+ helper_arg(1, 1, &argc, &argv, lealall_help);
if (dev_id < 0)
dev_id = hci_get_route(NULL);
@@ -2798,35 +2798,35 @@ static void cmd_lewladd(int dev_id, int argc, char **argv)
if (err < 0) {
err = -errno;
- fprintf(stderr, "Can't add to white list: %s(%d)\n",
+ fprintf(stderr, "Can't add to accept list: %s(%d)\n",
strerror(-err), -err);
exit(1);
}
}
-static struct option lewlrm_options[] = {
+static struct option lealrm_options[] = {
{ "help", 0, 0, 'h' },
{ 0, 0, 0, 0 }
};
-static const char *lewlrm_help =
+static const char *lealrm_help =
"Usage:\n"
- "\tlewlrm <bdaddr>\n";
+ "\tlealrm <bdaddr>\n";
-static void cmd_lewlrm(int dev_id, int argc, char **argv)
+static void cmd_lealrm(int dev_id, int argc, char **argv)
{
int err, opt, dd;
bdaddr_t bdaddr;
- for_each_opt(opt, lewlrm_options, NULL) {
+ for_each_opt(opt, lealrm_options, NULL) {
switch (opt) {
default:
- printf("%s", lewlrm_help);
+ printf("%s", lealrm_help);
return;
}
}
- helper_arg(1, 1, &argc, &argv, lewlrm_help);
+ helper_arg(1, 1, &argc, &argv, lealrm_help);
if (dev_id < 0)
dev_id = hci_get_route(NULL);
@@ -2844,35 +2844,35 @@ static void cmd_lewlrm(int dev_id, int argc, char **argv)
if (err < 0) {
err = errno;
- fprintf(stderr, "Can't remove from white list: %s(%d)\n",
+ fprintf(stderr, "Can't remove from accept list: %s(%d)\n",
strerror(err), err);
exit(1);
}
}
-static struct option lewlsz_options[] = {
+static struct option lealsz_options[] = {
{ "help", 0, 0, 'h' },
{ 0, 0, 0, 0 }
};
-static const char *lewlsz_help =
+static const char *lealsz_help =
"Usage:\n"
- "\tlewlsz\n";
+ "\tlealsz\n";
-static void cmd_lewlsz(int dev_id, int argc, char **argv)
+static void cmd_lealsz(int dev_id, int argc, char **argv)
{
int err, dd, opt;
uint8_t size;
- for_each_opt(opt, lewlsz_options, NULL) {
+ for_each_opt(opt, lealsz_options, NULL) {
switch (opt) {
default:
- printf("%s", lewlsz_help);
+ printf("%s", lealsz_help);
return;
}
}
- helper_arg(0, 0, &argc, &argv, lewlsz_help);
+ helper_arg(0, 0, &argc, &argv, lealsz_help);
if (dev_id < 0)
dev_id = hci_get_route(NULL);
@@ -2888,36 +2888,36 @@ static void cmd_lewlsz(int dev_id, int argc, char **argv)
if (err < 0) {
err = -errno;
- fprintf(stderr, "Can't read white list size: %s(%d)\n",
+ fprintf(stderr, "Can't read accept list size: %s(%d)\n",
strerror(-err), -err);
exit(1);
}
- printf("White list size: %d\n", size);
+ printf("Accept list size: %d\n", size);
}
-static struct option lewlclr_options[] = {
+static struct option lealclr_options[] = {
{ "help", 0, 0, 'h' },
{ 0, 0, 0, 0 }
};
-static const char *lewlclr_help =
+static const char *lealclr_help =
"Usage:\n"
- "\tlewlclr\n";
+ "\tlealclr\n";
-static void cmd_lewlclr(int dev_id, int argc, char **argv)
+static void cmd_lealclr(int dev_id, int argc, char **argv)
{
int err, dd, opt;
- for_each_opt(opt, lewlclr_options, NULL) {
+ for_each_opt(opt, lealclr_options, NULL) {
switch (opt) {
default:
- printf("%s", lewlclr_help);
+ printf("%s", lealclr_help);
return;
}
}
- helper_arg(0, 0, &argc, &argv, lewlclr_help);
+ helper_arg(0, 0, &argc, &argv, lealclr_help);
if (dev_id < 0)
dev_id = hci_get_route(NULL);
@@ -2933,7 +2933,7 @@ static void cmd_lewlclr(int dev_id, int argc, char **argv)
if (err < 0) {
err = -errno;
- fprintf(stderr, "Can't clear white list: %s(%d)\n",
+ fprintf(stderr, "Can't clear accept list: %s(%d)\n",
strerror(-err), -err);
exit(1);
}
@@ -3394,10 +3394,10 @@ static struct {
{ "clock", cmd_clock, "Read local or remote clock" },
{ "lescan", cmd_lescan, "Start LE scan" },
{ "leinfo", cmd_leinfo, "Get LE remote information" },
- { "lewladd", cmd_lewladd, "Add device to LE White List" },
- { "lewlrm", cmd_lewlrm, "Remove device from LE White List" },
- { "lewlsz", cmd_lewlsz, "Read size of LE White List" },
- { "lewlclr", cmd_lewlclr, "Clear LE White List" },
+ { "lealall", cmd_lealall, "Add device to LE Accept List" },
+ { "lealrm", cmd_lealrm, "Remove device from LE Accept List" },
+ { "lealsz", cmd_lealsz, "Read size of LE Accept List" },
+ { "lealclr", cmd_lealclr, "Clear LE Accept List" },
{ "lerladd", cmd_lerladd, "Add device to LE Resolving List" },
{ "lerlrm", cmd_lerlrm, "Remove device from LE Resolving List" },
{ "lerlclr", cmd_lerlclr, "Clear LE Resolving List" },
diff --git a/tools/hcitool.rst b/tools/hcitool.rst
index 80f8c6c22f..36cf4fd66b 100644
--- a/tools/hcitool.rst
+++ b/tools/hcitool.rst
@@ -157,23 +157,23 @@ clock [*bdaddr*] [*clock*]
The *clock* can be **0** for the local clock or **1** for the piconet
clock (which is default).
-lescan [--*privacy*] [--*passive*] [--*whitelist*] [--*discovery*\=g|l] [--*duplicates*]
+lescan [--*privacy*] [--*passive*] [--*acceptlist*] [--*discovery*\=g|l] [--*duplicates*]
Start LE scan
leinfo [--*static*] [--*random*] <*bdaddr*>
Get LE remote information
-lewladd [--*random*] <*bdaddr*>
- Add device to LE White List
+lealall [--*random*] <*bdaddr*>
+ Add device to LE Accept List
-lewlrm <*bdaddr*>
- Remove device from LE White List
+lealrm <*bdaddr*>
+ Remove device from LE Accept List
-lewlsz
- Read size of LE White List
+lealsz
+ Read size of LE Accept List
-lewlclr
- Clear LE White List
+lealclr
+ Clear LE Accept List
lerladd [--*local_irk*] [--*peer_irk*] [--*random*] <*bdaddr*>
Add device to LE Resolving List
@@ -193,7 +193,7 @@ lerlon
lerloff
Disable LE Address Resolution
-lecc [--*static*] [--*random*] <*bdaddr*> | [--*whitelist*]
+lecc [--*static*] [--*random*] <*bdaddr*> | [--*acceptlist*]
Create a LE Connection
ledc <*handle*> [*reason*]
--
2.33.0.rc1.237.g0d66db33f3-goog
