diff options
| author | Martin Kaiser <wireshark@kaiser.cx> | 2015-06-20 11:21:35 +0200 |
|---|---|---|
| committer | Martin Kaiser <wireshark@kaiser.cx> | 2015-06-20 23:01:41 +0000 |
| commit | 02537f8c86d43bde7a493f591375c832333dd70e (patch) | |
| tree | bda48c32906a7ce854358fb5945781f8272ee6ab /epan/dissectors/packet-rfid-mifare.c | |
| parent | bc9e141f83c7a7d97a3420f3026782e2c65426c3 (diff) | |
[mifare] make the payload of the write command filterable
use an FT_BYTES variable instead of passing it to the data dissector
Change-Id: Ia52cba24dedec13c9842109d45b3a277ee627f42
Reviewed-on: https://code.wireshark.org/review/8994
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
Diffstat (limited to 'epan/dissectors/packet-rfid-mifare.c')
| -rw-r--r-- | epan/dissectors/packet-rfid-mifare.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/epan/dissectors/packet-rfid-mifare.c b/epan/dissectors/packet-rfid-mifare.c index 0c89315dfb..b62a2c1ebd 100644 --- a/epan/dissectors/packet-rfid-mifare.c +++ b/epan/dissectors/packet-rfid-mifare.c @@ -43,6 +43,7 @@ static int hf_mifare_key_a = -1; static int hf_mifare_key_b = -1; static int hf_mifare_uid = -1; static int hf_mifare_operand = -1; +static int hf_mifare_payload = -1; #define AUTH_A 0x60 #define AUTH_B 0x61 @@ -67,8 +68,6 @@ static const value_string hf_mifare_commands[] = { {0x00, NULL} }; -static dissector_handle_t data_handle; - /* Subtree handles: set by register_subtree_array */ static gint ett_mifare = -1; @@ -78,7 +77,6 @@ dissect_mifare(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_item *item; proto_tree *mifare_tree; guint8 cmd; - tvbuff_t *next_tvb; col_set_str(pinfo->cinfo, COL_PROTOCOL, "MiFare"); @@ -124,13 +122,7 @@ dissect_mifare(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) proto_tree_add_item(mifare_tree, hf_mifare_block_address, tvb, 1, 1, ENC_BIG_ENDIAN); - /* Because we don't know what the user will write, just let Data have away - with the rest of the packet's contents for now. */ - - next_tvb = tvb_new_subset_remaining(tvb, 2); - - call_dissector(data_handle, next_tvb, pinfo, tree); - + proto_tree_add_item(mifare_tree, hf_mifare_payload, tvb, 2, -1, ENC_NA); break; case TRANSFER: @@ -184,6 +176,9 @@ proto_register_mifare(void) NULL, 0x0, NULL, HFILL }}, {&hf_mifare_operand, { "Operand", "mifare.operand", FT_INT32, BASE_DEC, + NULL, 0x0, NULL, HFILL }}, + {&hf_mifare_payload, + { "Payload", "mifare.payload", FT_BYTES, BASE_NONE, NULL, 0x0, NULL, HFILL }} }; @@ -198,12 +193,6 @@ proto_register_mifare(void) register_dissector("mifare", dissect_mifare, proto_mifare); } -/* Handler registration */ -void -proto_reg_handoff_mifare(void) -{ - data_handle = find_dissector("data"); -} /* * Editor modelines - http://www.wireshark.org/tools/modelines.html * |