From 3cdbe5aba6cdba9833d8a0a66965f0b2c737695e Mon Sep 17 00:00:00 2001 From: Greg Herlein Date: Mon, 8 Feb 2016 12:33:57 -0800 Subject: [PATCH 1/2] fixed offset that was clipping first letter of name --- experiments/scantest.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/experiments/scantest.c b/experiments/scantest.c index f1232d7..c3b6824 100644 --- a/experiments/scantest.c +++ b/experiments/scantest.c @@ -141,7 +141,7 @@ void process_data(uint8_t *data, size_t data_len, le_advertising_info *info) size_t name_len = data_len - 1; char *name = malloc(name_len + 1); memset(name, 0, name_len + 1); - memcpy(name, &data[2], name_len); + memcpy(name, &data[1], name_len); char addr[18]; ba2str(&info->bdaddr, addr); From 54d2ae509f40ec698d9f750b3f89cae055497ad9 Mon Sep 17 00:00:00 2001 From: Greg Herlein Date: Mon, 8 Feb 2016 12:49:27 -0800 Subject: [PATCH 2/2] added option to bypass curses --- experiments/scantest.c | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/experiments/scantest.c b/experiments/scantest.c index c3b6824..95d7038 100644 --- a/experiments/scantest.c +++ b/experiments/scantest.c @@ -1,6 +1,13 @@ +#ifdef USE_CURSES + #include +#else + #include + #include + #define TRUE 1 + #define FALSE 0 +#endif #include #include -#include #include #include @@ -27,6 +34,17 @@ struct hci_state { #define EIR_NAME_COMPLETE 0x09 #define EIR_MANUFACTURE_SPECIFIC 0xFF +#ifndef USE_CURSES +void wprintf(const char *fmt, ...) +{ + va_list args; + va_start(args, fmt); + vprintf(fmt, args); + va_end(args); +} +#endif + + struct hci_state open_default_hci_device() { struct hci_state current_hci_state = {0};