korg/bluez
0
0
Fork 0
mirror of https://git.kernel.org/pub/scm/bluetooth/bluez.git synced 2024-11-26 21:54:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Add support for parsing the remote name during LE Scan

Browse Source
This commit is contained in:
Vinicius Costa Gomes 2011-10-13 18:39:07 -03:00 committed by Johan Hedberg
parent 239a0f68bb
commit 402398c7dc
1 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
tools/hcitool.c
View File

@ -54,6 +54,18 @@
#define FLAGS_LIMITED_MODE_BIT 0x01 #define FLAGS_LIMITED_MODE_BIT 0x01
#define FLAGS_GENERAL_MODE_BIT 0x02 #define FLAGS_GENERAL_MODE_BIT 0x02
#define EIR_FLAGS 0x01 /* flags */
#define EIR_UUID16_SOME 0x02 /* 16-bit UUID, more available */
#define EIR_UUID16_ALL 0x03 /* 16-bit UUID, all listed */
#define EIR_UUID32_SOME 0x04 /* 32-bit UUID, more available */
#define EIR_UUID32_ALL 0x05 /* 32-bit UUID, all listed */
#define EIR_UUID128_SOME 0x06 /* 128-bit UUID, more available */
#define EIR_UUID128_ALL 0x07 /* 128-bit UUID, all listed */
#define EIR_NAME_SHORT 0x08 /* shortened local name */
#define EIR_NAME_COMPLETE 0x09 /* complete local name */
#define EIR_TX_POWER 0x0A /* transmit power level */
#define EIR_DEVICE_ID 0x10 /* device ID */
#define for_each_opt(opt, long, short) while ((opt=getopt_long(argc, argv, short ? short:"+", long, NULL)) != -1) #define for_each_opt(opt, long, short) while ((opt=getopt_long(argc, argv, short ? short:"+", long, NULL)) != -1)
static volatile int signal_received = 0; static volatile int signal_received = 0;
@ -2354,6 +2366,40 @@ static void sigint_handler(int sig)
signal_received = sig; signal_received = sig;
} }
static void eir_parse_name(uint8_t *eir_data, char *name)
{
int len;
if (eir_data == NULL)
goto failed;
len = 0;
while (len < HCI_MAX_EIR_LENGTH - 1) {
uint8_t field_len = eir_data[0];
/* Check for the end of EIR */
if (field_len == 0)
break;
switch (eir_data[1]) {
case EIR_NAME_SHORT:
case EIR_NAME_COMPLETE:
if (field_len > HCI_MAX_NAME_LENGTH)
goto failed;
memcpy(name, &eir_data[2], field_len - 1);
return;
}
len += field_len + 1;
eir_data += field_len + 1;
}
failed:
sprintf(name, "(unknown)");
return;
}
static int print_advertising_devices(int dd, uint8_t filter_type) static int print_advertising_devices(int dd, uint8_t filter_type)
{ {
unsigned char buf[HCI_MAX_EVENT_SIZE], *ptr; unsigned char buf[HCI_MAX_EVENT_SIZE], *ptr;
@ -2409,8 +2455,14 @@ static int print_advertising_devices(int dd, uint8_t filter_type)
/* Ignoring multiple reports */ /* Ignoring multiple reports */
info = (le_advertising_info *) (meta->data + 1); info = (le_advertising_info *) (meta->data + 1);
if (check_report_filter(filter_type, info)) { if (check_report_filter(filter_type, info)) {
char name[HCI_MAX_NAME_LENGTH + 1];
memset(name, 0, sizeof(name));
ba2str(&info->bdaddr, addr); ba2str(&info->bdaddr, addr);
printf("%s\n", addr); eir_parse_name(info->data, name);
printf("%s %s\n", addr, name);
} }
} }