Thread (5 messages) read the whole thread 5 messages, 4 authors, 2011-02-21

Re: [PATCH 2/4] HCI command to remove device from LE White List

From: Anderson Lizardo <hidden>
Date: 2011-01-24 11:42:24

Hi,

On Mon, Jan 24, 2011 at 5:58 AM, Sumit Kumar BAJPAI
[off-list ref] wrote:
quoted hunk ↗ jump to hunk
---
 lib/hci.c       |   29 +++++++++++++++++++++++++++++
 lib/hci_lib.h   |    1 +
 tools/hcitool.c |   47 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 77 insertions(+), 0 deletions(-)
diff --git a/lib/hci.c b/lib/hci.c
index b75f612..11b47b3 100755
--- a/lib/hci.c
+++ b/lib/hci.c
@@ -1320,6 +1320,35 @@ int hci_le_add_to_white_list(int dd, const bdaddr_t* bdaddr, uint8_t type)
       return 0;
 }

+int hci_le_remove_from_white_list(int dd, const bdaddr_t* bdaddr, uint8_t type)
Coding style issue:

bdaddr_t* bdaddr -> bdaddr_t *bdaddr

(no C++ style declarations)
+{
+       struct hci_request rq;
+       le_remove_device_from_white_list_cp cp;
+       uint8_t status;
+
+       memset(&cp, 0, sizeof(cp));
+       cp.bdaddr_type = type;
+       bacpy(&cp.bdaddr,bdaddr);
bacpy(&cp.bdaddr,bdaddr); -> bacpy(&cp.bdaddr, bdaddr);

(missing whitespace after comma)
quoted hunk ↗ jump to hunk
+
+       memset(&rq, 0, sizeof(rq));
+       rq.ogf = OGF_LE_CTL;
+       rq.ocf = OCF_LE_REMOVE_DEVICE_FROM_WHITE_LIST;
+       rq.cparam = &cp;
+       rq.clen = LE_REMOVE_DEVICE_FROM_WHITE_LIST_CP_SIZE;
+       rq.rparam = &status;
+       rq.rlen = 1;
+
+       if (hci_send_req(dd, &rq, 1000) < 0)
+               return -1;
+
+       if (status) {
+               errno = EIO;
+               return -1;
+       }
+
+       return 0;
+}
+
 int hci_read_local_name(int dd, int len, char *name, int to)
 {
       read_local_name_rp rp;
diff --git a/lib/hci_lib.h b/lib/hci_lib.h
index dd995dd..e64a431 100755
--- a/lib/hci_lib.h
+++ b/lib/hci_lib.h
@@ -128,6 +128,7 @@ int hci_le_create_conn(int dd, uint16_t interval, uint16_t window,
               uint16_t min_ce_length, uint16_t max_ce_length,
               uint16_t *handle, int to);
 int hci_le_add_to_white_list(int dd, const bdaddr_t* bdaddr, uint8_t type);
+int hci_le_remove_from_white_list(int dd, const bdaddr_t* bdaddr, uint8_t type);
bdaddr_t* bdaddr -> bdaddr_t *bdaddr
quoted hunk ↗ jump to hunk
 int hci_for_each_dev(int flag, int(*func)(int dd, int dev_id, long arg), long arg);
 int hci_get_route(bdaddr_t *bdaddr);
diff --git a/tools/hcitool.c b/tools/hcitool.c
index 9147995..038d05e 100755
--- a/tools/hcitool.c
+++ b/tools/hcitool.c
@@ -2517,6 +2517,52 @@ static void cmd_leaddwl(int dev_id, int argc, char **argv)
       }
 }

+static struct option lermwl_options[] = {
+       { "help",       0, 0, 'h' },
+       { 0, 0, 0, 0 }
+};
+
+static const char *lermwl_help =
+       "Usage:\n"
+       "\tlermwl <bdaddr>\n";
+
+static void cmd_lermwl(int dev_id, int argc, char **argv)
+{
+       int err, opt, dd;
+       bdaddr_t bdaddr;
+       le_device_addr_type bdaddr_type;
+
+       for_each_opt(opt, lermwl_options, NULL) {
+               switch (opt) {
+               default:
+                       printf("%s", lermwl_help);
+                       return;
+               }
+       }
+
+       helper_arg(1, 1, &argc, &argv, lermwl_help);
+
+       if (dev_id < 0)
+               dev_id = hci_get_route(NULL);
+
+       dd = hci_open_dev(dev_id);
+       if (dd < 0) {
+               perror("Could not open device");
+               exit(1);
+       }
+
+       str2ba(argv[0], &bdaddr);
+       bdaddr_type = LE_PUBLIC_DEVICE_ADDR;
+
+       err = hci_le_remove_from_white_list(dd, &bdaddr, bdaddr_type);
+       hci_close_dev(dd);
+
+       if (err < 0) {
+               perror("Cant remove from white list");
+               exit(1);
+       }
+}
+
 static struct option ledc_options[] = {
       { "help",       0, 0, 'h' },
       { 0, 0, 0, 0 }
@@ -2594,6 +2640,7 @@ static struct {
       { "clock",  cmd_clock,  "Read local or remote clock"           },
       { "lescan", cmd_lescan, "Start LE scan"                        },
       { "leaddwl", cmd_leaddwl, "Add this device to white list"          },
+       { "lermwl", cmd_lermwl, "Remove this device from white list"   },
       { "lecc",   cmd_lecc,   "Create a LE Connection",              },
       { "ledc",   cmd_ledc,   "Disconnect a LE Connection",          },
       { NULL, NULL, 0 }
--
1.6.5
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


-- 
Anderson Lizardo
OpenBossa Labs - INdT
Manaus - Brazil
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help