diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2015-11-17 18:48:45 +0100 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2015-11-17 17:50:18 +0000 |
| commit | abfeb2da54b345dc02ac7e0eb205e09e908eb020 (patch) | |
| tree | a9c00248bc5bc566aa583aac566bdda422b0f9e5 /epan/dissectors/packet-iso14443.c | |
| parent | 689334876ec12d5a037e5bb1fad3e0d023890049 (diff) | |
[iso14443] start dissecting the PCB of an S-block
S-blocks have a block number exactly like I-blocks,
give the hf variable a more generic name
Change-Id: I25774496f88bd27b1978662e4a781ddeb5e44b45
Reviewed-on: https://code.wireshark.org/review/11920
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Diffstat (limited to 'epan/dissectors/packet-iso14443.c')
| -rw-r--r-- | epan/dissectors/packet-iso14443.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/epan/dissectors/packet-iso14443.c b/epan/dissectors/packet-iso14443.c index 5a94c4561e..f8d4d9a266 100644 --- a/epan/dissectors/packet-iso14443.c +++ b/epan/dissectors/packet-iso14443.c @@ -171,7 +171,7 @@ static int hf_iso14443_block_type = -1; static int hf_iso14443_i_blk_chaining = -1; static int hf_iso14443_cid_following = -1; static int hf_iso14443_nad_following = -1; -static int hf_iso14443_i_blk_num = -1; +static int hf_iso14443_blk_num = -1; static int hf_iso14443_inf = -1; static int hf_iso14443_crc = -1; @@ -566,7 +566,13 @@ dissect_iso14443_cmd_type_block(tvbuff_t *tvb, packet_info *pinfo, has_nad = ((pcb & 0x40) != 0); proto_tree_add_item(pcb_tree, hf_iso14443_nad_following, tvb, offset, 1, ENC_BIG_ENDIAN); - proto_tree_add_item(pcb_tree, hf_iso14443_i_blk_num, + proto_tree_add_item(pcb_tree, hf_iso14443_blk_num, + tvb, offset, 1, ENC_BIG_ENDIAN); + } + else if (block_type == S_BLOCK_TYPE) { + proto_tree_add_item(pcb_tree, hf_iso14443_cid_following, + tvb, offset, 1, ENC_BIG_ENDIAN); + proto_tree_add_item(pcb_tree, hf_iso14443_blk_num, tvb, offset, 1, ENC_BIG_ENDIAN); } if (bt_str) { @@ -1015,8 +1021,8 @@ proto_register_iso14443(void) { "NAD following", "iso14443.nad_following", FT_BOOLEAN, 8, TFS(&tfs_true_false), 0x04, NULL, HFILL } }, - { &hf_iso14443_i_blk_num, - { "Block number", "iso14443.i_blk_num", + { &hf_iso14443_blk_num, + { "Block number", "iso14443.block_number", FT_UINT8, BASE_DEC, NULL, 0x01, NULL, HFILL } }, { &hf_iso14443_inf, |