diff options
| author | Stig Bjørlykke <stig@bjorlykke.org> | 2008-02-03 21:11:53 +0000 |
|---|---|---|
| committer | Stig Bjørlykke <stig@bjorlykke.org> | 2008-02-03 21:11:53 +0000 |
| commit | ef625890aab324946c97dfa26357049e3377c25a (patch) | |
| tree | 3be42b7d6cdeb7cb033fa3ed154293a6d37d6a40 /wiretap/file_access.c | |
| parent | a341198859eaf64345d10d0966f9c4f00604b39d (diff) | |
From Shane Kearns (bug 2237):
Added support for Symbian OS btsnoop.
The bluetooth HCI layer in Symbian OS can be configured to log all packets to a
file. The log format, "btsnoop" is based on the RFC1761 "snoop" format - but
differences in the header make it incompatible.
The btsnoop format supports logging of these formats:
"H1" (raw HCI packets without framing)
"H4" (HCI UART packets including packet type header)
"H5" (HCI 3 wire UART packets including framing)
"BCSP" (HCI bluecore serial protocol including framing)
"H1" and "H4" are section numbers in the original v1 bluetooth specifications,
but still used colloquially - wireshark's existing support for Linux bluez HCI
logs uses the "H4" name.
In practice, the "H1" format is used for H5,BCSP and USB HCI logs, as the HCI
packet logs are mainly useful for debugging higher layers, bluetooth profiles
and bluetooth applications.
From me:
Deleted some unused prototypes.
Mark an unused parameter.
svn path=/trunk/; revision=24263
Diffstat (limited to 'wiretap/file_access.c')
| -rw-r--r-- | wiretap/file_access.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c index 9ba0c7584b..902bba589a 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -76,7 +76,7 @@ #include "netscreen.h" #include "commview.h" #include "pcapng.h" - +#include "btsnoop.h" /* The open_file_* routines should return: @@ -120,6 +120,7 @@ static wtap_open_routine_t open_routines_base[] = { ber_open, mpeg_open, pcapng_open, + btsnoop_open, /* Files that don't have magic bytes at a fixed location, * but that instead require a heuristic of some sort to * identify them. This includes the ASCII trace files that @@ -578,7 +579,10 @@ static const struct file_type_info dump_open_table_base[] = { /* WTAP_FILE_PCAPNG */ { "Wireshark - pcapng (experimental)", "pcapng", "*.pcapng", NULL, FALSE, - pcapng_dump_can_write_encap, pcapng_dump_open } + pcapng_dump_can_write_encap, pcapng_dump_open }, + + /* WTAP_FILE_BTSNOOP */ + { "Symbian OS btsnoop", "btsnoop", "*.log", NULL, FALSE, NULL, NULL } }; gint wtap_num_file_types = sizeof(dump_open_table_base) / sizeof(struct file_type_info); |