osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

use the official DLT for ISO14443 

add DLT_ISO14443 to pcap_to_wtap_map[]
define WTAP_ENCAP_ISO14443, link it to the iso14443 dissector

Change-Id: Id837197c4d66071094f9336d60db36a371424807
Reviewed-on: https://code.wireshark.org/review/11959
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
This commit is contained in:
Martin Kaiser 2015-11-19 11:53:54 +01:00 committed by Anders Broman
parent 9b2c889abe
commit 4fd711f338
4 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
epan/dissectors/packet-iso14443.c
View File

@ -41,6 +41,7 @@
#include <epan/expert.h>
#include <epan/packet.h>
#include <epan/tfs.h>
#include <wiretap/wtap.h>
/* Proximity Integrated Circuit Card, i.e. the smartcard */
#define ADDR_PICC "PICC"
@ -122,6 +123,8 @@ void proto_reg_handoff_iso14443(void);
static int proto_iso14443 = -1;
static dissector_handle_t iso14443_handle;
static dissector_table_t iso14443_cmd_type_table;
static int ett_iso14443 = -1;
@ -1066,7 +1069,8 @@ proto_register_iso14443(void)
"iso14443.cmd_type", "ISO14443 Command Type",
FT_UINT8, BASE_DEC, DISSECTOR_TABLE_ALLOW_DUPLICATE);
new_register_dissector("iso14443", dissect_iso14443, proto_iso14443);
iso14443_handle =
new_register_dissector("iso14443", dissect_iso14443, proto_iso14443);
transactions = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
}
@ -1077,6 +1081,8 @@ proto_reg_handoff_iso14443(void)
{
dissector_handle_t cmd_type_handle;
dissector_add_uint("wtap_encap", WTAP_ENCAP_ISO14443, iso14443_handle);
cmd_type_handle = new_create_dissector_handle(
dissect_iso14443_cmd_type_wupa, proto_iso14443);
dissector_add_uint("iso14443.cmd_type", CMD_TYPE_WUPA, cmd_type_handle);

3
wiretap/pcap-common.c
View File

@ -433,6 +433,9 @@ static const struct {
/* IPMI Trace Data Collection */
{ 260, WTAP_ENCAP_IPMI_TRACE },
/* ISO14443 contactless smartcard standards */
{ 264, WTAP_ENCAP_ISO14443 },
/*
* To repeat:
*

3
wiretap/wtap.c
View File

@ -959,6 +959,9 @@ static struct encap_type_info encap_table_base[] = {
/* WTAP_ENCAP_NSTRACE_3_5 */
{ "NetScaler Encapsulation 3.5 of Ethernet", "nstrace35" },
/* WTAP_ENCAP_ISO14443 */
{ "ISO 14443 contactless smartcard standards", "iso14443" },
};
WS_DLL_LOCAL

1
wiretap/wtap.h
View File

@ -264,6 +264,7 @@ extern "C" {
#define WTAP_ENCAP_LOOP 175
#define WTAP_ENCAP_JSON 176
#define WTAP_ENCAP_NSTRACE_3_5 177
#define WTAP_ENCAP_ISO14443 178
/* After adding new item here, please also add new item to encap_table_base array */
#define WTAP_NUM_ENCAP_TYPES wtap_get_num_encap_types()