From b942ef0615c405c1f441fa98fe5aa46b4dcfdce0 Mon Sep 17 00:00:00 2001 From: Martin Kaiser Date: Sat, 25 May 2019 12:37:35 +0200 Subject: iso14443: we reassemble APDUs, not TPDUs Fix the field names and the filter strings accordingly. Change-Id: I4275abc04962a364dfea2ea76ca9877d82e0ae06 Reviewed-on: https://code.wireshark.org/review/33354 Petri-Dish: Martin Kaiser Tested-by: Petri Dish Buildbot Reviewed-by: Martin Kaiser --- epan/dissectors/packet-iso14443.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/epan/dissectors/packet-iso14443.c b/epan/dissectors/packet-iso14443.c index 609a0fa241..fc0154c210 100644 --- a/epan/dissectors/packet-iso14443.c +++ b/epan/dissectors/packet-iso14443.c @@ -1789,45 +1789,45 @@ proto_register_iso14443(void) FT_BYTES, BASE_NONE, NULL, 0, NULL, HFILL } }, { &hf_iso14443_frags, - { "Tpdu fragments", "iso14443.tpdu_fragments", + { "Apdu fragments", "iso14443.apdu_fragments", FT_NONE, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_iso14443_frag, - { "Tpdu fragment", "iso14443.tpdu_fragment", + { "Apdu fragment", "iso14443.apdu_fragment", FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_iso14443_frag_overlap, - { "Tpdu fragment overlap", "iso14443.tpdu_fragment.overlap", + { "Apdu fragment overlap", "iso14443.apdu_fragment.overlap", FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_iso14443_frag_overlap_conflicts, - { "Tpdu fragment overlapping with conflicting data", - "iso14443.tpdu_fragment.overlap.conflicts", + { "Apdu fragment overlapping with conflicting data", + "iso14443.apdu_fragment.overlap.conflicts", FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_iso14443_frag_multiple_tails, - { "Tpdu has multiple tail fragments", - "iso14443.tpdu_fragment.multiple_tails", + { "Apdu has multiple tail fragments", + "iso14443.apdu_fragment.multiple_tails", FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_iso14443_frag_too_long_frag, - { "Tpdu fragment too long", "iso14443.tpdu_fragment.too_long_fragment", + { "Apdu fragment too long", "iso14443.apdu_fragment.too_long_fragment", FT_BOOLEAN, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_iso14443_frag_err, - { "Tpdu defragmentation error", "iso14443.tpdu_fragment.error", + { "Apdu defragmentation error", "iso14443.apdu_fragment.error", FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_iso14443_frag_cnt, - { "Tpdu fragment count", "iso14443.tpdu_fragment.count", + { "Apdu fragment count", "iso14443.apdu_fragment.count", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } }, { &hf_iso14443_reass_in, - { "Tpdu reassembled in", "iso14443.tpdu_reassembled.in", + { "Apdu reassembled in", "iso14443.apdu_reassembled.in", FT_FRAMENUM, BASE_NONE, NULL, 0x00, NULL, HFILL } }, { &hf_iso14443_reass_len, - { "Reassembled tpdu length", "iso14443.tpdu_reassembled.length", + { "Reassembled apdu length", "iso14443.apdu_reassembled.length", FT_UINT32, BASE_DEC, NULL, 0x00, NULL, HFILL } }, { &hf_iso14443_crc, -- cgit v1.2.3