Diff between f79650789464a565efd3d8e07b14cd4c1d3a6ef9 and 1f50e7b348a6d2bfb536e9d4bc2925be59f9690c

Changed Files

File Additions Deletions Status
monitor/display.h +3 -1 modified
monitor/l2cap.c +9 -9 modified
monitor/packet.c +12 -12 modified

Full Patch

diff --git a/monitor/display.h b/monitor/display.h
index 7e1f391..34199e7 100644
--- a/monitor/display.h
+++ b/monitor/display.h
@@ -38,13 +38,15 @@ bool use_color(void);
 #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
@@ -72,7 +72,7 @@ static void sig_packet(const void *data, uint16_t size)
 	int i;
 
 	if (size < 4) {
-		print_field("malformed signal packet");
+		print_text(COLOR_ERROR, "malformed signal packet");
 		packet_hexdump(data, size);
 		return;
 	}
@@ -82,7 +82,7 @@ static void sig_packet(const void *data, uint16_t size)
 	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;
 	}
@@ -139,7 +139,7 @@ static void amp_packet(const void *data, uint16_t size)
 	int i;
 
 	if (size < 4) {
-		print_field("malformed information frame packet");
+		print_text(COLOR_ERROR, "malformed info frame packet");
 		packet_hexdump(data, size);
 		return;
 	}
@@ -154,7 +154,7 @@ static void amp_packet(const void *data, uint16_t size)
 		return;
 
 	if (size < 8) {
-		print_field("malformed manager packet");
+		print_text(COLOR_ERROR, "malformed manager packet");
 		packet_hexdump(data, size);
 		return;
 	}
@@ -164,7 +164,7 @@ static void amp_packet(const void *data, uint16_t size)
 	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;
 	}
@@ -235,7 +235,7 @@ static void att_packet(const void *data, uint16_t size)
 	int i;
 
 	if (size < 1) {
-		print_field("malformed attribute packet");
+		print_text(COLOR_ERROR, "malformed attribute packet");
 		packet_hexdump(data, size);
 		return;
 	}
@@ -288,7 +288,7 @@ static void smp_packet(const void *data, uint16_t size)
 	int i;
 
 	if (size < 1) {
-		print_field("malformed security packet");
+		print_text(COLOR_ERROR, "malformed security packet");
 		packet_hexdump(data, size);
 		return;
 	}
@@ -315,13 +315,13 @@ void l2cap_packet(uint16_t handle, const void *data, uint16_t size)
 	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
@@ -46,8 +46,6 @@
 #include "control.h"
 #include "packet.h"
 
-#define COLOR_ERROR	"\x1B[1;31m"
-
 #define COLOR_INDEX_LABEL		COLOR_WHITE
 #define COLOR_TIMESTAMP			COLOR_YELLOW
 
@@ -3388,13 +3386,13 @@ static void cmd_complete_evt(const void *data, uint8_t size)
 
 	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;
 		}
@@ -3993,13 +3991,13 @@ static void le_meta_event_evt(const void *data, uint8_t size)
 
 	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;
 		}
@@ -4221,13 +4219,13 @@ void packet_hci_command(struct timeval *tv, uint16_t index,
 
 	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;
 		}
@@ -4286,13 +4284,13 @@ void packet_hci_event(struct timeval *tv, uint16_t index,
 
 	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;
 		}
@@ -4332,7 +4330,8 @@ void packet_hci_acldata(struct timeval *tv, uint16_t index, bool in,
 						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;
 	}
@@ -4388,7 +4387,8 @@ void packet_hci_scodata(struct timeval *tv, uint16_t index, bool in,
 						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;
 	}