diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2016-02-09 16:16:15 +0100 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2016-04-18 09:39:42 +0000 |
| commit | fb39f102b9224442e71a7659db406b5648cfc253 (patch) | |
| tree | ab7226c99db78251746b53a6c7105d4a4900141a /wiretap/file_access.c | |
| parent | 54019ca207e337ba03dc01186d469bd60353675b (diff) | |
| download | wireshark-fb39f102b9224442e71a7659db406b5648cfc253.tar.gz | |
wiretap: add support for the mplog capture file format
the mplog format is used by some commercial logging tools that capture
ISO 14443 traffic between a card reader and a contactless smartcard
Change-Id: If359b8f0f671eb2a7c6315e2b8960a5bd581a9e9
Reviewed-on: https://code.wireshark.org/review/14950
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Diffstat (limited to 'wiretap/file_access.c')
| -rw-r--r-- | wiretap/file_access.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/wiretap/file_access.c b/wiretap/file_access.c index 03f2e7ed52..47c678da72 100644 --- a/wiretap/file_access.c +++ b/wiretap/file_access.c @@ -83,6 +83,7 @@ #include "capsa.h" #include "pcap-encap.h" #include "nettrace_3gpp_32_423.h" +#include "mplog.h" /* * Add an extension, and all compressed versions thereof, to a GSList @@ -333,6 +334,7 @@ static struct open_info open_info_base[] = { /* Gammu DCT3 trace must come before MIME files as it's XML based*/ { "Gammu DCT3 trace", OPEN_INFO_MAGIC, dct3trace_open, NULL, NULL, NULL }, { "MIME Files Format", OPEN_INFO_MAGIC, mime_file_open, NULL, NULL, NULL }, + { "Micropross mplog", OPEN_INFO_MAGIC, mplog_open, "mplog", NULL, NULL }, { "Novell LANalyzer", OPEN_INFO_HEURISTIC, lanalyzer_open, "tr1", NULL, NULL }, /* * PacketLogger must come before MPEG, because its files @@ -1583,6 +1585,11 @@ static const struct file_type_subtype_info dump_open_table_base[] = { { "3GPP TS 32.423 Trace", "3gpp32423", NULL, NULL, FALSE, FALSE, 0, NULL, NULL, NULL }, + + /* WTAP_FILE_TYPE_MPLOG */ + { "Micropross mplog file", "mplog", "mplog", NULL, + FALSE, FALSE, 0, + NULL, NULL, NULL } }; /* |