diff --git a/monitor/bt.h b/monitor/bt.h
index b96ab7f..02cba56 100644
--- a/monitor/bt.h
+++ b/monitor/bt.h
uint8_t error;
} __attribute__ ((packed));
+#define BT_LMP_AU_RAND 11
+struct bt_lmp_au_rand {
+ uint8_t number[16];
+} __attribute__ ((packed));
+
+#define BT_LMP_SRES 12
+struct bt_lmp_sres {
+ uint8_t response[4];
+} __attribute__ ((packed));
+
+#define BT_LMP_ENCRYPTION_MODE_REQ 15
+struct bt_lmp_encryption_mode_req {
+ uint8_t mode;
+} __attribute__ ((packed));
+
+#define BT_LMP_ENCRYPTION_KEY_SIZE_REQ 16
+struct bt_lmp_encryption_key_size_req {
+ uint8_t key_size;
+} __attribute__ ((packed));
+
+#define BT_LMP_START_ENCRYPTION_REQ 17
+struct bt_lmp_start_encryption_req {
+ uint8_t number[16];
+} __attribute__ ((packed));
+
+#define BT_LMP_STOP_ENCRYPTION_REQ 18
+
#define BT_LMP_AUTO_RATE 35
#define BT_LMP_VERSION_REQ 37
uint8_t map[10];
} __attribute__ ((packed));
+#define BT_LMP_ENCAPSULATED_HEADER 61
+struct bt_lmp_encapsulated_header {
+ uint8_t major;
+ uint8_t minor;
+ uint8_t length;
+} __attribute__ ((packed));
+
+#define BT_LMP_ENCAPSULATED_PAYLOAD 62
+struct bt_lmp_encapsulated_payload {
+ uint8_t data[16];
+} __attribute__ ((packed));
+
+#define BT_LMP_SIMPLE_PAIRING_CONFIRM 63
+struct bt_lmp_simple_pairing_confirm {
+ uint8_t value[16];
+} __attribute__ ((packed));
+
+#define BT_LMP_SIMPLE_PAIRING_NUMBER 64
+struct bt_lmp_simple_pairing_number {
+ uint8_t value[16];
+} __attribute__ ((packed));
+
+#define BT_LMP_DHKEY_CHECK 65
+struct bt_lmp_dhkey_check {
+ uint8_t value[16];
+} __attribute__ ((packed));
+
+#define BT_LMP_PAUSE_ENCRYPTION_AES_REQ 66
+
#define BT_LMP_ACCEPTED_EXT LMP_ESC4(1)
struct bt_lmp_accepted_ext {
uint8_t escape;
uint8_t table;
} __attribute__ ((packed));
+#define BT_LMP_CHANNEL_CLASSIFICATION_REQ LMP_ESC4(16)
+struct bt_lmp_channel_classification_req {
+ uint8_t mode;
+ uint16_t min_interval;
+ uint16_t max_interval;
+} __attribute__ ((packed));
+
+#define BT_LMP_CHANNEL_CLASSIFICATION LMP_ESC4(17)
+struct bt_lmp_channel_classification {
+ uint8_t classification[10];
+} __attribute__ ((packed));
+
+#define BT_LMP_IO_CAPABILITY_REQ LMP_ESC4(25)
+struct bt_lmp_io_capability_req {
+ uint8_t capability;
+ uint8_t oob_data;
+ uint8_t authentication;
+} __attribute__ ((packed));
+
+#define BT_LMP_IO_CAPABILITY_RES LMP_ESC4(26)
+struct bt_lmp_io_capability_res {
+ uint8_t capability;
+ uint8_t oob_data;
+ uint8_t authentication;
+} __attribute__ ((packed));
+
#define BT_LMP_POWER_CONTROL_REQ LMP_ESC4(31)
struct bt_lmp_power_control_req {
uint8_t request;
diff --git a/monitor/lmp.c b/monitor/lmp.c
index 59c9f4b..0a8b4d3 100644
--- a/monitor/lmp.c
+++ b/monitor/lmp.c
packet_print_error("Error code", pdu->error);
}
+static void au_rand(const void *data, uint8_t size)
+{
+ const struct bt_lmp_au_rand *pdu = data;
+
+ packet_hexdump(pdu->number, 16);
+}
+
+static void sres(const void *data, uint8_t size)
+{
+ const struct bt_lmp_sres *pdu = data;
+
+ packet_hexdump(pdu->response, 4);
+}
+
+static void encryption_mode_req(const void *data, uint8_t size)
+{
+ const struct bt_lmp_encryption_mode_req *pdu = data;
+ const char *str;
+
+ switch (pdu->mode) {
+ case 0x00:
+ str = "No encryption";
+ break;
+ case 0x01:
+ str = "Encryption";
+ break;
+ case 0x02:
+ str = "Encryption";
+ break;
+ default:
+ str = "Reserved";
+ break;
+ }
+
+ print_field("Mode: %s (%u)", str, pdu->mode);
+}
+
+static void encryption_key_size_req(const void *data, uint8_t size)
+{
+ const struct bt_lmp_encryption_key_size_req *pdu = data;
+
+ print_field("Key size: %u", pdu->key_size);
+}
+
+static void start_encryption_req(const void *data, uint8_t size)
+{
+ const struct bt_lmp_start_encryption_req *pdu = data;
+
+ packet_hexdump(pdu->number, 16);
+}
+
+static void stop_encryption_req(const void *data, uint8_t size)
+{
+}
+
static void auto_rate(const void *data, uint8_t size)
{
}
packet_print_channel_map_lmp(pdu->map);
}
+static void encapsulated_header(const void *data, uint8_t size)
+{
+ const struct bt_lmp_encapsulated_header *pdu = data;
+ const char *str;
+
+ print_field("Major type: %u", pdu->major);
+ print_field("Minor type: %u", pdu->minor);
+
+ if (pdu->major == 0x01) {
+ switch (pdu->minor) {
+ case 0x01:
+ str = "P-192 Public Key";
+ break;
+ case 0x02:
+ str = "P-256 Public Key";
+ break;
+ default:
+ str = "Reserved";
+ break;
+ }
+
+ print_field(" %s", str);
+ }
+
+ print_field("Length: %u", pdu->length);
+}
+
+static void encapsulated_payload(const void *data, uint8_t size)
+{
+ const struct bt_lmp_encapsulated_payload *pdu = data;
+
+ packet_hexdump(pdu->data, 16);
+}
+
+static void simple_pairing_confirm(const void *data, uint8_t size)
+{
+ const struct bt_lmp_simple_pairing_confirm *pdu = data;
+
+ packet_hexdump(pdu->value, 16);
+}
+
+static void simple_pairing_number(const void *data, uint8_t size)
+{
+ const struct bt_lmp_simple_pairing_number *pdu = data;
+
+ packet_hexdump(pdu->value, 16);
+}
+
+static void dhkey_check(const void *data, uint8_t size)
+{
+ const struct bt_lmp_dhkey_check *pdu = data;
+
+ packet_hexdump(pdu->value, 16);
+}
+
static void accepted_ext(const void *data, uint8_t size)
{
const struct bt_lmp_accepted_ext *pdu = data;
print_field("Table: %s (0x%2.2x)", str, pdu->table);
}
+static void channel_classification_req(const void *data, uint8_t size)
+{
+ const struct bt_lmp_channel_classification_req *pdu = data;
+ const char *str;
+
+ switch (pdu->mode) {
+ case 0x00:
+ str = "Disabled";
+ break;
+ case 0x01:
+ str = "Enabled";
+ break;
+ default:
+ str = "Reserved";
+ break;
+ }
+
+ print_field("Reporting mode: %s (0x%2.2x)", str, pdu->mode);
+ print_field("Min interval: 0x%2.2x", pdu->min_interval);
+ print_field("Max interval: 0x%2.2x", pdu->max_interval);
+}
+
+static void channel_classification(const void *data, uint8_t size)
+{
+ const struct bt_lmp_channel_classification *pdu = data;
+ char str[21];
+ int i;
+
+ for (i = 0; i < 10; i++)
+ sprintf(str + (i * 2), "%2.2x", pdu->classification[i]);
+
+ print_field("Features: 0x%s", str);
+}
+
+static void io_capability_req(const void *data, uint8_t size)
+{
+ const struct bt_lmp_io_capability_req *pdu = data;
+ const char *str;
+
+ packet_print_io_capability(pdu->capability);
+
+ switch (pdu->oob_data) {
+ case 0x00:
+ str = "No authentication data received";
+ break;
+ case 0x01:
+ str = "Authentication data received";
+ break;
+ default:
+ str = "Reserved";
+ break;
+ }
+
+ print_field("OOB data: %s (0x%2.2x)", str, pdu->oob_data);
+
+ packet_print_io_authentication(pdu->authentication);
+}
+
+static void io_capability_res(const void *data, uint8_t size)
+{
+ const struct bt_lmp_io_capability_res *pdu = data;
+ const char *str;
+
+ packet_print_io_capability(pdu->capability);
+
+ switch (pdu->oob_data) {
+ case 0x00:
+ str = "No authentication data received";
+ break;
+ case 0x01:
+ str = "Authentication data received";
+ break;
+ default:
+ str = "Reserved";
+ break;
+ }
+
+ print_field("OOB data: %s (0x%2.2x)", str, pdu->oob_data);
+
+ packet_print_io_authentication(pdu->authentication);
+}
+
static void power_control_req(const void *data, uint8_t size)
{
const struct bt_lmp_power_control_req *pdu = data;
{ 8, "LMP_in_rand" },
{ 9, "LMP_comb_key" },
{ 10, "LMP_unit_key" },
- { 11, "LMP_au_rand" },
- { 12, "LMP_sres" },
+ { 11, "LMP_au_rand", au_rand, 16, true },
+ { 12, "LMP_sres", sres, 4, true },
{ 13, "LMP_temp_rand" },
{ 14, "LMP_temp_key" },
- { 15, "LMP_encryption_mode_req" },
- { 16, "LMP_encryption_key_size_req" },
- { 17, "LMP_start_encryption_req" },
- { 18, "LMP_stop_encryption_req" },
+ { 15, "LMP_encryption_mode_req", encryption_mode_req, 1, true },
+ { 16, "LMP_encryption_key_size_req", encryption_key_size_req, 1, true },
+ { 17, "LMP_start_encryption_req", start_encryption_req, 16, true },
+ { 18, "LMP_stop_encryption_req", stop_encryption_req, 0, true },
{ 19, "LMP_switch_req" },
{ 20, "LMP_hold" },
{ 21, "LMP_hold_req" },
{ 58, "LMP_encryption_key_size_mask_req" },
{ 59, "LMP_encryption_key_size_mask_res" },
{ 60, "LMP_set_AFH", set_afh, 15, true },
- { 61, "LMP_encapsulated_header" },
- { 62, "LMP_encapsulated_payload" },
- { 63, "LMP_simple_pairing_confirm" },
- { 64, "LMP_simple_pairing_number" },
- { 65, "LMP_DHkey_check" },
+ { 61, "LMP_encapsulated_header", encapsulated_header, 3, true },
+ { 62, "LMP_encapsulated_payload", encapsulated_payload, 16, true },
+ { 63, "LMP_simple_pairing_confirm", simple_pairing_confirm, 16, true },
+ { 64, "LMP_simple_pairing_number", simple_pairing_number, 16, true },
+ { 65, "LMP_DHkey_check", dhkey_check, 16, true },
{ 66, "LMP_pause_encryption_aes_req" },
{ LMP_ESC4(1), "LMP_accepted_ext", accepted_ext, 2, true },
{ LMP_ESC4(2), "LMP_not_accepted_ext", not_accepted_ext, 3, true },
{ LMP_ESC4(11), "LMP_packet_type_table_req", packet_type_table_req, 1, true },
{ LMP_ESC4(12), "LMP_eSCO_link_req" },
{ LMP_ESC4(13), "LMP_remove_eSCO_link_req" },
- { LMP_ESC4(16), "LMP_channel_classification_req" },
- { LMP_ESC4(17), "LMP_channel_classification" },
+ { LMP_ESC4(16), "LMP_channel_classification_req", channel_classification_req, 5, true },
+ { LMP_ESC4(17), "LMP_channel_classification", channel_classification, 10, true },
{ LMP_ESC4(21), "LMP_sniff_subrating_req" },
{ LMP_ESC4(22), "LMP_sniff_subrating_res" },
{ LMP_ESC4(23), "LMP_pause_encryption_req" },
{ LMP_ESC4(24), "LMP_resume_encryption_req" },
- { LMP_ESC4(25), "LMP_IO_capability_req" },
- { LMP_ESC4(26), "LMP_IO_capability_res" },
+ { LMP_ESC4(25), "LMP_IO_capability_req", io_capability_req, 3, true },
+ { LMP_ESC4(26), "LMP_IO_capability_res", io_capability_res, 3, true },
{ LMP_ESC4(27), "LMP_numeric_comparision_failed" },
{ LMP_ESC4(28), "LMP_passkey_failed" },
{ LMP_ESC4(29), "LMP_oob_failed" },
diff --git a/monitor/packet.c b/monitor/packet.c
index 761536b..636000c 100644
--- a/monitor/packet.c
+++ b/monitor/packet.c
print_field("Authentication: %s (0x%2.2x)", str, authentication);
}
+void packet_print_io_capability(uint8_t capability)
+{
+ print_io_capability(capability);
+}
+
+void packet_print_io_authentication(uint8_t authentication)
+{
+ print_authentication(authentication);
+}
+
static void print_location_domain_aware(uint8_t aware)
{
const char *str;
diff --git a/monitor/packet.h b/monitor/packet.h
index 10ba240..c640d03 100644
--- a/monitor/packet.h
+++ b/monitor/packet.h
void packet_print_features_ll(const uint8_t *features);
void packet_print_channel_map_lmp(const uint8_t *map);
void packet_print_channel_map_ll(const uint8_t *map);
+void packet_print_io_capability(uint8_t capability);
+void packet_print_io_authentication(uint8_t authentication);
void packet_control(struct timeval *tv, uint16_t index, uint16_t opcode,
const void *data, uint16_t size);