Hi Szymon,
>> Current btmon's btsnoop data link type is BTSNOOP_TYPE_MONITOR(2001)
>> statically. but some of btsnoop viewer just support BTSNOOP_TYPE_HCI(1001,
>> so they could not use btmon's btsnoop. If this option is set, they could
>> parse btsnoop. ---
>> monitor/control.c | 4 ++--
>> monitor/control.h | 2 +-
>> monitor/main.c | 9 ++++++++-
>> 3 files changed, 11 insertions(+), 4 deletions(-)
>>
>> diff --git a/monitor/control.c b/monitor/control.c
>> index 00e4bc0..72204bf 100644
>> --- a/monitor/control.c
>> +++ b/monitor/control.c
>> @@ -1124,9 +1124,9 @@ void control_server(const char *path)
>> server_fd = fd;
>> }
>>
>> -bool control_writer(const char *path)
>> +bool control_writer(const char *path, uint32_t type)
>> {
>> - btsnoop_file = btsnoop_create(path, BTSNOOP_TYPE_MONITOR);
>> + btsnoop_file = btsnoop_create(path, type);
>>
>> return !!btsnoop_file;
>> }
>> diff --git a/monitor/control.h b/monitor/control.h
>> index 267d71b..680e6b6 100644
>> --- a/monitor/control.h
>> +++ b/monitor/control.h
>> @@ -24,7 +24,7 @@
>>
>> #include <stdint.h>
>>
>> -bool control_writer(const char *path);
>> +bool control_writer(const char *path, uint32_t type);
>> void control_reader(const char *path);
>> void control_server(const char *path);
>> int control_tracing(void);
>> diff --git a/monitor/main.c b/monitor/main.c
>> index 6e7d4b3..66d7ad1 100644
>> --- a/monitor/main.c
>> +++ b/monitor/main.c
>> @@ -33,6 +33,7 @@
>> #include <getopt.h>
>>
>> #include "src/shared/mainloop.h"
>> +#include "src/shared/btsnoop.h"
>>
>> #include "packet.h"
>> #include "lmp.h"
>> @@ -66,6 +67,7 @@ static void usage(void)
>> "\t-t, --time Show time instead of time offset\n"
>> "\t-T, --date Show time and date information\n"
>> "\t-S, --sco Dump SCO traffic\n"
>> + "\t-H, --hci Use BTSNOOP_TYPE_HCI\n"
>> "\t-E, --ellisys [ip] Send Ellisys HCI Injection\n"
>> "\t-h, --help Show help options\n");
>> }
>> @@ -80,6 +82,7 @@ static const struct option main_options[] = {
>> { "time", no_argument, NULL, 't' },
>> { "date", no_argument, NULL, 'T' },
>> { "sco", no_argument, NULL, 'S' },
>> + { "hci", no_argument, NULL, 'H' },
>> { "ellisys", required_argument, NULL, 'E' },
>> { "todo", no_argument, NULL, '#' },
>> { "version", no_argument, NULL, 'v' },
>> @@ -98,6 +101,7 @@ int main(int argc, char *argv[])
>> const char *str;
>> int exit_status;
>> sigset_t mask;
>> + uint32_t type = BTSNOOP_TYPE_MONITOR;
>>
>> mainloop_init();
>>
>> @@ -151,6 +155,9 @@ int main(int argc, char *argv[])
>> case 'S':
>> filter_mask |= PACKET_FILTER_SHOW_SCO_DATA;
>> break;
>> + case 'H':
>> + type = BTSNOOP_TYPE_HCI;
>> + break;
>> case 'E':
>> ellisys_server = optarg;
>> ellisys_port = 24352;
>> @@ -210,7 +217,7 @@ int main(int argc, char *argv[])
>> return EXIT_SUCCESS;
>> }
>>
>> - if (writer_path && !control_writer(writer_path)) {
>> + if (writer_path && !control_writer(writer_path, type)) {
>> printf("Failed to open '%s'\n", writer_path);
>> return EXIT_FAILURE;
>> }
>
> This option should be tightly coupled with --index option since legacy format
> cannot store index id.
I do not like this. btmon should always write the new format. Otherwise you are missing the index added and removed extra meta data.
Regards
Marcel
--
To unsubscribe from this list: send the line "unsubscribe linux-bluetooth" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
