monitor: Fix using PACKET_FILTER_SHOW_SCO_DATA for ISO packets

This fixes the uses of PACKET_FILTER_SHOW_SCO_DATA for ISO packets and
introduce a dedicated flag for it in the form of
PACKET_FILTER_SHOW_ISO_DATA which can be enabled with use of -I/--iso.

diff --git a/monitor/main.c b/monitor/main.c
index 4954d1a..9338d74 100755 (executable)
--- a/monitor/main.c
+++ b/monitor/main.c
@@ -61,6 +61,7 @@ static void usage(void)
                "\t-T, --date             Show time and date information\n"
                "\t-S, --sco              Dump SCO traffic\n"
                "\t-A, --a2dp             Dump A2DP stream traffic\n"
+               "\t-I, --iso              Dump ISO traffic\n"
                "\t-E, --ellisys [ip]     Send Ellisys HCI Injection\n"
                "\t-P, --no-pager         Disable pager usage\n"
                "\t-J  --jlink <device>,[<serialno>],[<interface>],[<speed>]\n"
@@ -93,6 +94,7 @@ static const struct option main_options[] = {
        { "date",      no_argument,       NULL, 'T' },
        { "sco",       no_argument,       NULL, 'S' },
        { "a2dp",      no_argument,       NULL, 'A' },
+       { "iso",       no_argument,       NULL, 'I' },
        { "ellisys",   required_argument, NULL, 'E' },
 #ifdef TIZEN_FEATURE_BLUEZ_MODIFY
        { "count",   required_argument, NULL, 'C' },
@@ -144,8 +146,8 @@ int main(int argc, char *argv[])
                                                main_options, NULL);
 #else
                opt = getopt_long(argc, argv,
-                               "r:w:a:s:p:i:d:B:V:MNtTSAE:PJ:R:C:c:vh",
-                               main_options, NULL);
+                               "r:w:a:s:p:i:d:B:V:MNtTSAIE:PJ:R:C:c:vh",
+                                               main_options, NULL);
 #endif
                if (opt < 0)
                        break;
@@ -216,6 +218,9 @@ int main(int argc, char *argv[])
                case 'A':
                        filter_mask |= PACKET_FILTER_SHOW_A2DP_STREAM;
                        break;
+               case 'I':
+                       filter_mask |= PACKET_FILTER_SHOW_ISO_DATA;
+                       break;
                case 'E':
                        ellisys_server = optarg;
                        ellisys_port = 24352;

diff --git a/monitor/packet.c b/monitor/packet.c
index b694fea..83459d1 100755 (executable)
--- a/monitor/packet.c
+++ b/monitor/packet.c
@@ -65,6 +65,7 @@
 #define COLOR_HCI_EVENT_UNKNOWN                COLOR_WHITE_BG
 #define COLOR_HCI_ACLDATA              COLOR_CYAN
 #define COLOR_HCI_SCODATA              COLOR_YELLOW
+#define COLOR_HCI_ISODATA              COLOR_YELLOW
 
 #define COLOR_UNKNOWN_ERROR            COLOR_WHITE_BG
 #define COLOR_UNKNOWN_FEATURE_BIT      COLOR_WHITE_BG
@@ -12358,7 +12359,7 @@ void packet_hci_isodata(struct timeval *tv, struct ucred *cred, uint16_t index,
        sprintf(handle_str, "Handle %d", acl_handle(handle));
        sprintf(extra_str, "flags 0x%2.2x dlen %d", flags, hdr->dlen);
 
-       print_packet(tv, cred, in ? '>' : '<', index, NULL, COLOR_HCI_SCODATA,
+       print_packet(tv, cred, in ? '>' : '<', index, NULL, COLOR_HCI_ISODATA,
                                in ? "ISO Data RX" : "ISO Data TX",
                                                handle_str, extra_str);
 
@@ -12369,7 +12370,7 @@ void packet_hci_isodata(struct timeval *tv, struct ucred *cred, uint16_t index,
                return;
        }
 
-       if (filter_mask & PACKET_FILTER_SHOW_SCO_DATA)
+       if (filter_mask & PACKET_FILTER_SHOW_ISO_DATA)
                packet_hexdump(data, size);
 }
 

diff --git a/monitor/packet.h b/monitor/packet.h
index 7557e47..191fb86 100755 (executable)
--- a/monitor/packet.h
+++ b/monitor/packet.h
@@ -22,6 +22,7 @@
 #define PACKET_FILTER_SHOW_SCO_DATA    (1 << 5)
 #define PACKET_FILTER_SHOW_A2DP_STREAM (1 << 6)
 #define PACKET_FILTER_SHOW_MGMT_SOCKET (1 << 7)
+#define PACKET_FILTER_SHOW_ISO_DATA    (1 << 8)
 
 struct packet_conn_data {
        uint16_t index;