diff --git a/monitor/display.h b/monitor/display.h
index 7e1f391..34199e7 100644
--- a/monitor/display.h
+++ b/monitor/display.h
#define COLOR_WHITE_BG "\x1B[0;47m"
#define COLOR_HIGHLIGHT "\x1B[1;39m"
+#define COLOR_ERROR "\x1B[1;31m"
+
#define print_text(color, fmt, args...) do { \
printf("%-8c%s" fmt "%s\n", ' ', \
use_color() ? color : "", ## args, \
use_color() ? COLOR_OFF : ""); \
} while (0);
-#define print_field(fmt, args...) printf("%-8c" fmt "\n", ' ', ## args)
+#define print_field(fmt, args...) print_text(COLOR_OFF, fmt, ## args)
int num_columns(void);
diff --git a/monitor/l2cap.c b/monitor/l2cap.c
index 2b70b2e..ecdd73c 100644
--- a/monitor/l2cap.c
+++ b/monitor/l2cap.c
int i;
if (size < 4) {
- print_field("malformed signal packet");
+ print_text(COLOR_ERROR, "malformed signal packet");
packet_hexdump(data, size);
return;
}
len = bt_get_le16(data + 2);
if (len != size - 4) {
- print_field("invalid signal packet size");
+ print_text(COLOR_ERROR, "invalid signal packet size");
packet_hexdump(data, size);
return;
}
int i;
if (size < 4) {
- print_field("malformed information frame packet");
+ print_text(COLOR_ERROR, "malformed info frame packet");
packet_hexdump(data, size);
return;
}
return;
if (size < 8) {
- print_field("malformed manager packet");
+ print_text(COLOR_ERROR, "malformed manager packet");
packet_hexdump(data, size);
return;
}
len = bt_get_le16(data + 4);
if (len != size - 8) {
- print_field("invalid manager packet size");
+ print_text(COLOR_ERROR, "invalid manager packet size");
packet_hexdump(data + 2, size - 4);
return;
}
int i;
if (size < 1) {
- print_field("malformed attribute packet");
+ print_text(COLOR_ERROR, "malformed attribute packet");
packet_hexdump(data, size);
return;
}
int i;
if (size < 1) {
- print_field("malformed security packet");
+ print_text(COLOR_ERROR, "malformed security packet");
packet_hexdump(data, size);
return;
}
const struct bt_l2cap_hdr *hdr = data;
if (size < sizeof(*hdr)) {
- print_field("malformed packet");
+ print_text(COLOR_ERROR, "malformed packet");
packet_hexdump(data, size);
return;
}
if (btohs(hdr->len) != size - sizeof(*hdr)) {
- print_field("invalid packet size");
+ print_text(COLOR_ERROR, "invalid packet size");
packet_hexdump(data + sizeof(*hdr), size - sizeof(*hdr));
return;
}
diff --git a/monitor/packet.c b/monitor/packet.c
index 27b73e0..e5c92dc 100644
--- a/monitor/packet.c
+++ b/monitor/packet.c
#include "control.h"
#include "packet.h"
-#define COLOR_ERROR "\x1B[1;31m"
-
#define COLOR_INDEX_LABEL COLOR_WHITE
#define COLOR_TIMESTAMP COLOR_YELLOW
if (opcode_data->rsp_fixed) {
if (size - 3 != opcode_data->rsp_size) {
- print_field("invalid packet size");
+ print_text(COLOR_ERROR, "invalid packet size");
packet_hexdump(data + 3, size - 3);
return;
}
} else {
if (size - 3 < opcode_data->rsp_size) {
- print_field("too short packet");
+ print_text(COLOR_ERROR, "too short packet");
packet_hexdump(data + 3, size - 3);
return;
}
if (subevent_data->fixed) {
if (size - 1 != subevent_data->size) {
- print_field("invalid packet size");
+ print_text(COLOR_ERROR, "invalid packet size");
packet_hexdump(data + 1, size - 1);
return;
}
} else {
if (size - 1 < subevent_data->size) {
- print_field("too short packet");
+ print_text(COLOR_ERROR, "too short packet");
packet_hexdump(data + 1, size - 1);
return;
}
if (opcode_data->cmd_fixed) {
if (hdr->plen != opcode_data->cmd_size) {
- print_field("invalid packet size");
+ print_text(COLOR_ERROR, "invalid packet size");
packet_hexdump(data, size);
return;
}
} else {
if (hdr->plen < opcode_data->cmd_size) {
- print_field("too short packet");
+ print_text(COLOR_ERROR, "too short packet");
packet_hexdump(data, size);
return;
}
if (event_data->fixed) {
if (hdr->plen != event_data->size) {
- print_field("invalid packet size");
+ print_text(COLOR_ERROR, "invalid packet size");
packet_hexdump(data, size);
return;
}
} else {
if (hdr->plen < event_data->size) {
- print_field("too short packet");
+ print_text(COLOR_ERROR, "too short packet");
packet_hexdump(data, size);
return;
}
handle_str, extra_str);
if (size != dlen) {
- print_field("invalid packet size (%d != %d)", size, dlen);
+ print_text(COLOR_ERROR, "invalid packet size (%d != %d)",
+ size, dlen);
packet_hexdump(data, size);
return;
}
handle_str, extra_str);
if (size != hdr->dlen) {
- print_field("invalid packet size (%d != %d)", size, hdr->dlen);
+ print_text(COLOR_ERROR, "invalid packet size (%d != %d)",
+ size, hdr->dlen);
packet_hexdump(data, size);
return;
}