diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2018-04-09 11:35:32 +0800 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2018-04-09 09:33:07 +0000 |
| commit | 398c9ddfe1512d7aa65219ab59fb475fd2944a2a (patch) | |
| tree | 06f9271dcfb8652d1ede6235d3baddf4e9f29d3d /epan/dissectors/packet-iso14443.c | |
| parent | fc153057e81381eadede1a0a03d36cc4ecd5293b (diff) | |
iso14443: decode the bitrates in the attrib message
Change-Id: I10bd77d72984fcf045a3c80e900c034393b444ae
Reviewed-on: https://code.wireshark.org/review/26822
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-iso14443.c')
| -rw-r--r-- | epan/dissectors/packet-iso14443.c | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/epan/dissectors/packet-iso14443.c b/epan/dissectors/packet-iso14443.c index 4e2b3e5536..6362449e61 100644 --- a/epan/dissectors/packet-iso14443.c +++ b/epan/dissectors/packet-iso14443.c @@ -98,6 +98,20 @@ static const value_string iso14443_short_frame[] = { { 0, NULL } }; +/* the bit rate definitions in the attrib message */ +#define BITRATE_106 0x00 +#define BITRATE_212 0x01 +#define BITRATE_424 0x02 +#define BITRATE_847 0x03 + +static const value_string iso14443_bitrates[] = { + { BITRATE_106, "106 kbit/s" }, + { BITRATE_212, "212 kbit/s" }, + { BITRATE_424, "424 kbit/s" }, + { BITRATE_847, "827 kbit/s" }, + { 0, NULL } +}; + /* convert a length code into the length it encodes code_to_len[x] is the length encoded by x this conversion is used for type A's FSCI and FSDI and for type B's @@ -254,6 +268,8 @@ static int hf_iso14443_min_tr1 = -1; static int hf_iso14443_eof = -1; static int hf_iso14443_sof = -1; static int hf_iso14443_param2 = -1; +static int hf_iso14443_bitrate_picc_pcd = -1; +static int hf_iso14443_bitrate_pcd_picc = -1; static int hf_iso14443_param3 = -1; static int hf_iso14443_param4 = -1; static int hf_iso14443_mbli = -1; @@ -847,6 +863,10 @@ static int dissect_iso14443_attrib(tvbuff_t *tvb, gint offset, p2_it = proto_tree_add_item(tree, hf_iso14443_param2, tvb, offset, 1, ENC_BIG_ENDIAN); p2_tree = proto_item_add_subtree( p2_it, ett_iso14443_attr_p2); + proto_tree_add_item(p2_tree, hf_iso14443_bitrate_picc_pcd, + tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(p2_tree, hf_iso14443_bitrate_pcd_picc, + tvb, offset, 1, ENC_BIG_ENDIAN); max_frame_size_code = tvb_get_guint8(tvb, offset) & 0x0F; proto_tree_add_uint_bits_format_value(p2_tree, hf_iso14443_max_frame_size_code, @@ -1692,6 +1712,14 @@ proto_register_iso14443(void) { "Param 2", "iso14443.param2", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL } }, + { &hf_iso14443_bitrate_picc_pcd, + { "Bit rate PICC to PCD", "iso14443.bitrate_picc_pcd", FT_UINT8, + BASE_HEX, VALS(iso14443_bitrates), 0xC0, NULL, HFILL } + }, + { &hf_iso14443_bitrate_pcd_picc, + { "Bit rate PCD to PICC", "iso14443.bitrate_pcd_picc", FT_UINT8, + BASE_HEX, VALS(iso14443_bitrates), 0x30, NULL, HFILL } + }, { &hf_iso14443_param3, { "Param 3", "iso14443.param3", FT_UINT8, BASE_HEX, NULL, 0, NULL, HFILL } |