Module Name: src
Committed By: plunky
Date: Thu Oct 8 19:29:42 UTC 2009
Modified Files:
src/usr.sbin/btconfig: btconfig.c
Log Message:
revert previous commit
(bah, I committed the wrong version and there are some other
changes that may not work with current sources)
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.19 src/usr.sbin/btconfig/btconfig.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/btconfig/btconfig.c
diff -u src/usr.sbin/btconfig/btconfig.c:1.18 src/usr.sbin/btconfig/btconfig.c:1.19
--- src/usr.sbin/btconfig/btconfig.c:1.18 Thu Oct 8 19:25:24 2009
+++ src/usr.sbin/btconfig/btconfig.c Thu Oct 8 19:29:42 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: btconfig.c,v 1.18 2009/10/08 19:25:24 plunky Exp $ */
+/* $NetBSD: btconfig.c,v 1.19 2009/10/08 19:29:42 plunky Exp $ */
/*-
* Copyright (c) 2006 Itronix Inc.
@@ -33,7 +33,7 @@
#include <sys/cdefs.h>
__COPYRIGHT("@(#) Copyright (c) 2006 Itronix, Inc. All rights reserved.");
-__RCSID("$NetBSD: btconfig.c,v 1.18 2009/10/08 19:25:24 plunky Exp $");
+__RCSID("$NetBSD: btconfig.c,v 1.19 2009/10/08 19:29:42 plunky Exp $");
#include <sys/ioctl.h>
#include <sys/param.h>
@@ -48,6 +48,15 @@
#include <unistd.h>
#include <util.h>
+/* inquiry results storage */
+struct result {
+ bdaddr_t bdaddr;
+ uint8_t page_scan_rep_mode;
+ uint8_t uclass[HCI_CLASS_SIZE];
+ uint16_t clock_offset;
+ int8_t rssi;
+};
+
int main(int, char *[]);
void badarg(const char *);
void badparam(const char *);
@@ -58,19 +67,19 @@
void print_val(const char *, const char **, int);
void print_info(int);
void print_stats(void);
-void print_class(const char *, uint8_t *);
-void print_class0(void);
+void print_class(const char *);
void print_voice(int);
void tag(const char *);
void print_features(const char *, uint8_t, uint8_t *);
void print_features0(uint8_t *);
void print_features1(uint8_t *);
-void print_result(int, struct bt_devinquiry *);
void do_inquiry(void);
+void print_result(int, struct result *, int);
void hci_req(uint16_t, uint8_t , void *, size_t, void *, size_t);
-void save_value(uint16_t, void *, size_t);
-void load_value(uint16_t, void *, size_t);
+#define save_value(opcode, cbuf, clen) hci_req(opcode, 0, cbuf, clen, NULL, 0)
+#define load_value(opcode, rbuf, rlen) hci_req(opcode, 0, NULL, 0, rbuf, rlen)
+#define hci_cmd(opcode, cbuf, clen) hci_req(opcode, 0, cbuf, clen, NULL, 0)
#define MAX_STR_SIZE 0xff
@@ -142,7 +151,7 @@
int opt_rssi = 0; /* inquiry_with_rssi (obsolete flag) */
int opt_imode = 0; /* inquiry mode */
int opt_inquiry = 0;
-#define INQUIRY_LENGTH 10 /* seconds */
+#define INQUIRY_LENGTH 10 /* about 12 seconds */
#define INQUIRY_MAX_RESPONSES 10
const char *imodes[] = { "std", "rssi", "ext", NULL };
@@ -381,53 +390,88 @@
}
/*
- * basic HCI request wrapper with error check
+ * basic HCI cmd request function with argument return.
+ *
+ * Normally, this will return on COMMAND_STATUS or COMMAND_COMPLETE for the given
+ * opcode, but if event is given then it will ignore COMMAND_STATUS (unless error)
+ * and wait for the specified event.
+ *
+ * if rbuf/rlen is given, results will be copied into the result buffer for
+ * COMMAND_COMPLETE/event responses.
*/
void
-hci_req(uint16_t opcode, uint8_t event, void *cbuf, size_t clen,
- void *rbuf, size_t rlen)
+hci_req(uint16_t opcode, uint8_t event, void *cbuf, size_t clen, void *rbuf, size_t rlen)
{
- struct bt_devreq req;
+ uint8_t msg[sizeof(hci_cmd_hdr_t) + HCI_CMD_PKT_SIZE];
+ hci_event_hdr_t *ep;
+ hci_cmd_hdr_t *cp;
- req.opcode = opcode;
- req.event = event;
- req.cparam = cbuf;
- req.clen = clen;
- req.rparam = rbuf;
- req.rlen = rlen;
-
- if (bt_devreq(hci, &req, 10) == -1)
- err(EXIT_FAILURE, "cmd (%02x|%03x)",
- HCI_OGF(opcode), HCI_OCF(opcode));
-
- if (event == 0 && rlen > 0 && ((uint8_t *)rbuf)[0] != 0)
- errx(EXIT_FAILURE, "cmd (%02x|%03x): status 0x%02x",
- HCI_OGF(opcode), HCI_OCF(opcode), ((uint8_t *)rbuf)[0]);
-}
+ cp = (hci_cmd_hdr_t *)msg;
+ cp->type = HCI_CMD_PKT;
+ cp->opcode = opcode = htole16(opcode);
+ cp->length = clen = MIN(clen, sizeof(msg) - sizeof(hci_cmd_hdr_t));
-/*
- * write value to device with opcode.
- * provide a small response buffer so that the status can be checked
- */
-void
-save_value(uint16_t opcode, void *cbuf, size_t clen)
-{
- uint8_t buf[1];
+ if (clen) memcpy((cp + 1), cbuf, clen);
- hci_req(opcode, 0, cbuf, clen, buf, sizeof(buf));
-}
+ if (send(hci, msg, sizeof(hci_cmd_hdr_t) + clen, 0) < 0)
+ err(EXIT_FAILURE, "HCI Send");
-/*
- * read value from device with opcode.
- * use our own buffer and only return the value from the response packet
- */
-void
-load_value(uint16_t opcode, void *rbuf, size_t rlen)
-{
- uint8_t buf[UINT8_MAX];
+ ep = (hci_event_hdr_t *)msg;
+ for(;;) {
+ if (recv(hci, msg, sizeof(msg), 0) < 0) {
+ if (errno == EAGAIN || errno == EINTR)
+ continue;
+
+ err(EXIT_FAILURE, "HCI Recv");
+ }
+
+ if (ep->event == HCI_EVENT_COMMAND_STATUS) {
+ hci_command_status_ep *cs;
- hci_req(opcode, 0, NULL, 0, buf, sizeof(buf));
- memcpy(rbuf, buf + 1, rlen);
+ cs = (hci_command_status_ep *)(ep + 1);
+ if (cs->opcode != opcode)
+ continue;
+
+ if (cs->status)
+ errx(EXIT_FAILURE,
+ "HCI cmd (%4.4x) failed (status %d)",
+ opcode, cs->status);
+
+ if (event == 0)
+ break;
+
+ continue;
+ }
+
+ if (ep->event == HCI_EVENT_COMMAND_COMPL) {
+ hci_command_compl_ep *cc;
+ uint8_t *ptr;
+
+ cc = (hci_command_compl_ep *)(ep + 1);
+ if (cc->opcode != opcode)
+ continue;
+
+ if (rbuf == NULL)
+ break;
+
+ ptr = (uint8_t *)(cc + 1);
+ if (*ptr)
+ errx(EXIT_FAILURE,
+ "HCI cmd (%4.4x) failed (status %d)",
+ opcode, *ptr);
+
+ memcpy(rbuf, ++ptr, rlen);
+ break;
+ }
+
+ if (ep->event == event) {
+ if (rbuf == NULL)
+ break;
+
+ memcpy(rbuf, (ep + 1), rlen);
+ break;
+ }
+ }
}
int
@@ -461,8 +505,11 @@
config_unit(void)
{
- if (opt_enable < 0 || opt_reset) {
- btr.btr_flags &= ~BTF_UP;
+ if (opt_enable) {
+ if (opt_enable > 0)
+ btr.btr_flags |= BTF_UP;
+ else
+ btr.btr_flags &= ~BTF_UP;
if (ioctl(hci, SIOCSBTFLAGS, &btr) < 0)
err(EXIT_FAILURE, "SIOCSBTFLAGS");
@@ -471,12 +518,22 @@
err(EXIT_FAILURE, "%s", btr.btr_name);
}
- if (opt_enable > 0 || opt_reset) {
- btr.btr_flags |= BTF_UP;
+ if (opt_reset) {
+ hci_cmd(HCI_CMD_RESET, NULL, 0);
+ btr.btr_flags |= BTF_INIT;
if (ioctl(hci, SIOCSBTFLAGS, &btr) < 0)
err(EXIT_FAILURE, "SIOCSBTFLAGS");
+ /*
+ * although the reset command will automatically
+ * carry out these commands, we do them manually
+ * just so we can wait for completion.
+ */
+ hci_cmd(HCI_CMD_READ_BDADDR, NULL, 0);
+ hci_cmd(HCI_CMD_READ_BUFFER_SIZE, NULL, 0);
+ hci_cmd(HCI_CMD_READ_LOCAL_FEATURES, NULL, 0);
+
if (set_unit(SIOCGBTINFO) < 0)
err(EXIT_FAILURE, "%s", btr.btr_name);
}
@@ -656,7 +713,8 @@
}
load_value(HCI_CMD_READ_UNIT_CLASS, buf, HCI_CLASS_SIZE);
- print_class("\tclass:", buf);
+ class = (buf[2] << 16) | (buf[1] << 8) | (buf[0]);
+ print_class("\t");
load_value(HCI_CMD_READ_LOCAL_NAME, buf, HCI_UNIT_NAME_SIZE);
printf("\tname: \"%s\"\n", buf);
@@ -732,17 +790,15 @@
if ((buf[7] & HCI_LMP_EXTENDED_FEATURES) == 0) {
print_features("\tfeatures:", 0, buf);
} else {
- hci_read_local_extended_features_rp rp;
-
- rp.page = 0;
+ buf[0] = 0;
do {
hci_req(HCI_CMD_READ_LOCAL_EXTENDED_FEATURES, 0,
- &rp.page, sizeof(rp.page), &rp, sizeof(rp));
+ buf, 1,
+ buf, HCI_FEATURES_SIZE + 2);
- print_features("\tfeatures (page %d):",
- rp.page, rp.features);
- } while (rp.page++ < rp.max_page);
+ print_features("\tfeatures page#%d:", buf[0], buf + 2);
+ } while (buf[0]++ < buf[1]);
}
}
@@ -878,39 +934,30 @@
}
void
-print_class(const char *str, uint8_t *uclass)
+print_class(const char *str)
{
+ int major, minor;
- class = (uclass[2] << 16) | (uclass[1] << 8) | uclass[0];
- width = printf("%s [0x%06x]", str, class);
+ major = (class & 0x1f00) >> 8;
+ minor = (class & 0x00fc) >> 2;
- switch(__SHIFTOUT(class, __BITS(0, 1))) {
- case 0: print_class0(); break;
- default: break;
- }
+ width = printf("%sclass: [0x%6.6x]", str, class);
- tag(NULL);
-}
-
-void
-print_class0(void)
-{
-
- switch (__SHIFTOUT(class, __BITS(8, 12))) {
+ switch (major) {
case 1: /* Computer */
- switch (__SHIFTOUT(class, __BITS(2, 7))) {
- case 1: tag("Desktop workstation"); break;
- case 2: tag("Server-class computer"); break;
+ switch (minor) {
+ case 1: tag("Desktop"); break;
+ case 2: tag("Server"); break;
case 3: tag("Laptop"); break;
- case 4: tag("Handheld PC/PDA"); break;
- case 5: tag("Palm Sized PC/PDA"); break;
- case 6: tag("Wearable computer"); break;
- default: tag("Computer"); break;
+ case 4: tag("Handheld"); break;
+ case 5: tag("Palm Sized"); break;
+ case 6: tag("Wearable"); break;
}
+ tag("Computer");
break;
case 2: /* Phone */
- switch (__SHIFTOUT(class, __BITS(2, 7))) {
+ switch (minor) {
case 1: tag("Cellular Phone"); break;
case 2: tag("Cordless Phone"); break;
case 3: tag("Smart Phone"); break;
@@ -922,7 +969,7 @@
case 3: /* LAN */
tag("LAN");
- switch (__SHIFTOUT(class, __BITS(5, 7))) {
+ switch ((minor & 0x38) >> 3) {
case 0: tag("[Fully available]"); break;
case 1: tag("[1-17% utilised]"); break;
case 2: tag("[17-33% utilised]"); break;
@@ -935,7 +982,7 @@
break;
case 4: /* Audio/Visual */
- switch (__SHIFTOUT(class, __BITS(2, 7))) {
+ switch (minor) {
case 1: tag("Wearable Headset"); break;
case 2: tag("Hands-free Audio"); break;
case 4: tag("Microphone"); break;
@@ -957,7 +1004,7 @@
break;
case 5: /* Peripheral */
- switch (__SHIFTOUT(class, __BITS(2, 5))) {
+ switch (minor & 0x0f) {
case 1: tag("Joystick"); break;
case 2: tag("Gamepad"); break;
case 3: tag("Remote Control"); break;
@@ -967,20 +1014,20 @@
default: tag("Peripheral"); break;
}
- if (class & __BIT(6)) tag("Keyboard");
- if (class & __BIT(7)) tag("Mouse");
+ if (minor & 0x10) tag("Keyboard");
+ if (minor & 0x20) tag("Mouse");
break;
case 6: /* Imaging */
- if (class & __BIT(4)) tag("Display");
- if (class & __BIT(5)) tag("Camera");
- if (class & __BIT(6)) tag("Scanner");
- if (class & __BIT(7)) tag("Printer");
- if ((class & __BITS(4, 7)) == 0) tag("Imaging");
+ if (minor & 0x20) tag("Printer");
+ if (minor & 0x10) tag("Scanner");
+ if (minor & 0x08) tag("Camera");
+ if (minor & 0x04) tag("Display");
+ if ((minor & 0x3c) == 0) tag("Imaging");
break;
case 7: /* Wearable */
- switch (__SHIFTOUT(class, __BITS(2, 7))) {
+ switch (minor) {
case 1: tag("Wrist Watch"); break;
case 2: tag("Pager"); break;
case 3: tag("Jacket"); break;
@@ -991,7 +1038,7 @@
break;
case 8: /* Toy */
- switch (__SHIFTOUT(class, __BITS(2, 7))) {
+ switch (minor) {
case 1: tag("Robot"); break;
case 2: tag("Vehicle"); break;
case 3: tag("Doll / Action Figure"); break;
@@ -1001,39 +1048,26 @@
}
break;
- case 9: /* Health */
- switch (__SHIFTOUT(class, __BITS(2, 7))) {
- case 1: tag("Blood Pressure Monitor"); break;
- case 2: tag("Thermometer"); break;
- case 3: tag("Weighing Scale"); break;
- case 4: tag("Glucose Meter"); break;
- case 5: tag("Pulse Oximeter"); break;
- case 6: tag("Heart/Pulse Rate Monitor"); break;
- case 7: tag("Health Data Display"); break;
- default: tag("Health"); break;
- }
- break;
-
default:
break;
}
- if (class & __BIT(13)) tag("<Limited Discoverable>");
- if (class & __BIT(16)) tag("<Positioning>");
- if (class & __BIT(17)) tag("<Networking>");
- if (class & __BIT(18)) tag("<Rendering>");
- if (class & __BIT(19)) tag("<Capturing>");
- if (class & __BIT(20)) tag("<Object Transfer>");
- if (class & __BIT(21)) tag("<Audio>");
- if (class & __BIT(22)) tag("<Telephony>");
- if (class & __BIT(23)) tag("<Information>");
+ if (class & 0x002000) tag("<Limited Discoverable>");
+ if (class & 0x010000) tag("<Positioning>");
+ if (class & 0x020000) tag("<Networking>");
+ if (class & 0x040000) tag("<Rendering>");
+ if (class & 0x080000) tag("<Capturing>");
+ if (class & 0x100000) tag("<Object Transfer>");
+ if (class & 0x200000) tag("<Audio>");
+ if (class & 0x400000) tag("<Telephony>");
+ if (class & 0x800000) tag("<Information>");
+ tag(NULL);
}
void
print_voice(int level)
{
-
- printf("\tvoice: [0x%04x]\n", voice);
+ printf("\tvoice: [0x%4.4x]\n", voice);
if (level == 0)
return;
@@ -1041,8 +1075,8 @@
printf("\t\tInput Coding: ");
switch ((voice & 0x0300) >> 8) {
case 0x00: printf("Linear PCM [%d-bit, pos %d]",
- (voice & 0x0020 ? 16 : 8),
- (voice & 0x001c) >> 2); break;
+ (voice & 0x0020 ? 16 : 8),
+ (voice & 0x001c) >> 2); break;
case 0x01: printf("u-Law"); break;
case 0x02: printf("A-Law"); break;
case 0x03: printf("unknown"); break;
@@ -1067,13 +1101,15 @@
}
void
-print_result(int num, struct bt_devinquiry *r)
+print_result(int num, struct result *r, int rssi)
{
hci_remote_name_req_cp ncp;
hci_remote_name_req_compl_ep nep;
struct hostent *hp;
- printf("%3d: bdaddr %s", num, bt_ntoa(&r->bdaddr, NULL));
+ printf("%3d: bdaddr %s",
+ num,
+ bt_ntoa(&r->bdaddr, NULL));
hp = bt_gethostbyaddr((const char *)&r->bdaddr, sizeof(bdaddr_t), AF_BLUETOOTH);
if (hp != NULL)
@@ -1083,7 +1119,7 @@
memset(&ncp, 0, sizeof(ncp));
bdaddr_copy(&ncp.bdaddr, &r->bdaddr);
- ncp.page_scan_rep_mode = r->pscan_rep_mode;
+ ncp.page_scan_rep_mode = r->page_scan_rep_mode;
ncp.clock_offset = r->clock_offset;
hci_req(HCI_CMD_REMOTE_NAME_REQ,
@@ -1092,18 +1128,28 @@
&nep, sizeof(nep));
printf(" : name \"%s\"\n", nep.name);
- print_class(" : class", r->dev_class);
- printf(" : page scan rep mode 0x%02x\n", r->pscan_rep_mode);
+
+ class = (r->uclass[2] << 16) | (r->uclass[1] << 8) | (r->uclass[0]);
+ print_class(" : ");
+
+ printf(" : page scan rep mode 0x%02x\n", r->page_scan_rep_mode);
printf(" : clock offset %d\n", le16toh(r->clock_offset));
- printf(" : rssi %d\n", r->rssi);
+
+ if (rssi)
+ printf(" : rssi %d\n", r->rssi);
+
printf("\n");
}
void
do_inquiry(void)
{
- struct bt_devinquiry *result;
- int i, num;
+ uint8_t buf[HCI_EVENT_PKT_SIZE];
+ struct result result[INQUIRY_MAX_RESPONSES];
+ hci_inquiry_cp inq;
+ struct hci_filter f;
+ hci_event_hdr_t *hh;
+ int i, j, num, rssi;
if (opt_inquiry == 0)
return;
@@ -1111,18 +1157,97 @@
printf("Device Discovery from device: %s ...", btr.btr_name);
fflush(stdout);
- num = bt_devinquiry(btr.btr_name, INQUIRY_LENGTH,
- INQUIRY_MAX_RESPONSES, &result);
+ memset(&f, 0, sizeof(f));
+ hci_filter_set(HCI_EVENT_COMMAND_STATUS, &f);
+ hci_filter_set(HCI_EVENT_COMMAND_COMPL, &f);
+ hci_filter_set(HCI_EVENT_INQUIRY_RESULT, &f);
+ hci_filter_set(HCI_EVENT_RSSI_RESULT, &f);
+ hci_filter_set(HCI_EVENT_INQUIRY_COMPL, &f);
+ hci_filter_set(HCI_EVENT_REMOTE_NAME_REQ_COMPL, &f);
+ hci_filter_set(HCI_EVENT_READ_REMOTE_FEATURES_COMPL, &f);
+ if (setsockopt(hci, BTPROTO_HCI, SO_HCI_EVT_FILTER, &f, sizeof(f)) < 0)
+ err(EXIT_FAILURE, "Can't set event filter");
+
+ /* General Inquiry LAP is 0x9e8b33 */
+ inq.lap[0] = 0x33;
+ inq.lap[1] = 0x8b;
+ inq.lap[2] = 0x9e;
+ inq.inquiry_length = INQUIRY_LENGTH;
+ inq.num_responses = INQUIRY_MAX_RESPONSES;
+
+ hci_cmd(HCI_CMD_INQUIRY, &inq, sizeof(inq));
+
+ num = 0;
+ rssi = 0;
+ hh = (hci_event_hdr_t *)buf;
+
+ for (;;) {
+ if (recv(hci, buf, sizeof(buf), 0) <= 0)
+ err(EXIT_FAILURE, "recv");
+
+ if (hh->event == HCI_EVENT_INQUIRY_COMPL)
+ break;
- if (num == -1) {
- printf("failed\n");
- err(EXIT_FAILURE, "%s", btr.btr_name);
+ if (hh->event == HCI_EVENT_INQUIRY_RESULT) {
+ hci_inquiry_result_ep *ep = (hci_inquiry_result_ep *)(hh + 1);
+ hci_inquiry_response *ir = (hci_inquiry_response *)(ep + 1);
+
+ for (i = 0 ; i < ep->num_responses ; i++) {
+ if (num == INQUIRY_MAX_RESPONSES)
+ break;
+
+ /* some devices keep responding, ignore dupes */
+ for (j = 0 ; j < num ; j++)
+ if (bdaddr_same(&result[j].bdaddr, &ir[i].bdaddr))
+ break;
+
+ if (j < num)
+ continue;
+
+ bdaddr_copy(&result[num].bdaddr, &ir[i].bdaddr);
+ memcpy(&result[num].uclass, &ir[i].uclass, HCI_CLASS_SIZE);
+ result[num].page_scan_rep_mode = ir[i].page_scan_rep_mode;
+ result[num].clock_offset = ir[i].clock_offset;
+ result[num].rssi = 0;
+ num++;
+ printf(".");
+ fflush(stdout);
+ }
+ continue;
+ }
+
+ if (hh->event == HCI_EVENT_RSSI_RESULT) {
+ hci_rssi_result_ep *ep = (hci_rssi_result_ep *)(hh + 1);
+ hci_rssi_response *rr = (hci_rssi_response *)(ep + 1);
+
+ for (i = 0 ; i < ep->num_responses ; i++) {
+ if (num == INQUIRY_MAX_RESPONSES)
+ break;
+
+ /* some devices keep responding, ignore dupes */
+ for (j = 0 ; j < num ; j++)
+ if (bdaddr_same(&result[j].bdaddr, &rr[i].bdaddr))
+ break;
+
+ if (j < num)
+ continue;
+
+ bdaddr_copy(&result[num].bdaddr, &rr[i].bdaddr);
+ memcpy(&result[num].uclass, &rr[i].uclass, HCI_CLASS_SIZE);
+ result[num].page_scan_rep_mode = rr[i].page_scan_rep_mode;
+ result[num].clock_offset = rr[i].clock_offset;
+ result[num].rssi = rr[i].rssi;
+ rssi = 1;
+ num++;
+ printf(".");
+ fflush(stdout);
+ }
+ continue;
+ }
}
printf(" %d response%s\n", num, (num == 1 ? "" : "s"));
for (i = 0 ; i < num ; i++)
- print_result(i + 1, &result[i]);
-
- free(result);
+ print_result(i + 1, &result[i], rssi);
}
