summaryrefslogtreecommitdiff
path: root/epan
diff options
context:
space:
mode:
Diffstat (limited to 'epan')
-rw-r--r--epan/dissectors/packet-acr122.c4
-rw-r--r--epan/dissectors/packet-gsm_sim.c6
-rw-r--r--epan/dissectors/packet-iso7816.c10
-rw-r--r--epan/dissectors/packet-rfid-pn532.c6
-rw-r--r--epan/dissectors/packet-usb-ccid.c75
5 files changed, 44 insertions, 57 deletions
diff --git a/epan/dissectors/packet-acr122.c b/epan/dissectors/packet-acr122.c
index 5fe0476c76..86031b7e03 100644
--- a/epan/dissectors/packet-acr122.c
+++ b/epan/dissectors/packet-acr122.c
@@ -91,6 +91,7 @@ static gint ett_status_word_sw2 = -1;
static expert_field ei_unknown_command_or_invalid_parameters = EI_INIT;
+static dissector_handle_t acr122_handle;
static dissector_handle_t pn532_handle;
static wmem_tree_t *command_info = NULL;
@@ -885,7 +886,7 @@ proto_register_acr122(void)
command_info = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
proto_acr122 = proto_register_protocol("Advanced Card Systems ACR122", "ACR 122", "acr122");
- register_dissector("acr122", dissect_acr122, proto_acr122);
+ acr122_handle = register_dissector("acr122", dissect_acr122, proto_acr122);
proto_register_field_array(proto_acr122, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
@@ -902,6 +903,7 @@ void
proto_reg_handoff_acr122(void)
{
pn532_handle = find_dissector_add_dependency("pn532", proto_acr122);
+ dissector_add_for_decode_as("usbccid.subdissector", acr122_handle);
}
/*
diff --git a/epan/dissectors/packet-gsm_sim.c b/epan/dissectors/packet-gsm_sim.c
index 73145678a4..c2873f69cf 100644
--- a/epan/dissectors/packet-gsm_sim.c
+++ b/epan/dissectors/packet-gsm_sim.c
@@ -368,7 +368,7 @@ static int ett_tprof_b32 = -1;
static int ett_tprof_b33 = -1;
static dissector_handle_t sub_handle_cap;
-static dissector_handle_t sim_handle;
+static dissector_handle_t sim_handle, sim_part_handle;
static const int *tprof_b1_fields[] = {
@@ -2942,7 +2942,7 @@ proto_register_gsm_sim(void)
register_dissector("gsm_sim.command", dissect_gsm_sim_command, proto_gsm_sim);
register_dissector("gsm_sim.response", dissect_gsm_sim_response, proto_gsm_sim);
register_dissector("gsm_sim.bertlv", dissect_bertlv, proto_gsm_sim);
- register_dissector("gsm_sim.part", dissect_gsm_sim_part, proto_gsm_sim);
+ sim_part_handle = register_dissector("gsm_sim.part", dissect_gsm_sim_part, proto_gsm_sim);
}
void
@@ -2950,6 +2950,8 @@ proto_reg_handoff_gsm_sim(void)
{
dissector_add_uint("gsmtap.type", GSMTAP_TYPE_SIM, sim_handle);
+ dissector_add_for_decode_as("usbccid.subdissector", sim_part_handle);
+
sub_handle_cap = find_dissector_add_dependency("etsi_cat", proto_gsm_sim);
}
diff --git a/epan/dissectors/packet-iso7816.c b/epan/dissectors/packet-iso7816.c
index 59b7964eab..47c1dce589 100644
--- a/epan/dissectors/packet-iso7816.c
+++ b/epan/dissectors/packet-iso7816.c
@@ -40,6 +40,7 @@ void proto_reg_handoff_iso7816(void);
static int proto_iso7816 = -1;
static int proto_iso7816_atr = -1;
+static dissector_handle_t iso7816_handle;
static dissector_handle_t iso7816_atr_handle;
static wmem_tree_t *transactions = NULL;
@@ -927,7 +928,7 @@ proto_register_iso7816(void)
expert_iso7816 = expert_register_protocol(proto_iso7816);
expert_register_field_array(expert_iso7816, ei, array_length(ei));
- register_dissector("iso7816", dissect_iso7816, proto_iso7816);
+ iso7816_handle = register_dissector("iso7816", dissect_iso7816, proto_iso7816);
transactions = wmem_tree_new_autoreset(wmem_epan_scope(), wmem_file_scope());
@@ -935,6 +936,13 @@ proto_register_iso7816(void)
iso7816_atr_handle = register_dissector("iso7816.atr", dissect_iso7816_atr, proto_iso7816_atr);
}
+
+void proto_reg_handoff_iso7816(void)
+{
+ dissector_add_for_decode_as("usbccid.subdissector", iso7816_handle);
+}
+
+
/*
* Editor modelines - http://www.wireshark.org/tools/modelines.html
*
diff --git a/epan/dissectors/packet-rfid-pn532.c b/epan/dissectors/packet-rfid-pn532.c
index 0b306b8187..b15efcaceb 100644
--- a/epan/dissectors/packet-rfid-pn532.c
+++ b/epan/dissectors/packet-rfid-pn532.c
@@ -219,6 +219,8 @@ static expert_field ei_unexpected_data = EI_INIT;
static wmem_tree_t *command_info = NULL;
+static dissector_handle_t pn532_handle;
+
void proto_register_pn532(void);
void proto_reg_handoff_pn532(void);
@@ -2327,12 +2329,14 @@ void proto_register_pn532(void)
prefs_register_enum_preference(pref_mod, "prtype532", "Payload Type", "Protocol payload type",
&sub_selected, sub_enum_vals, FALSE);
- register_dissector("pn532", dissect_pn532, proto_pn532);
+ pn532_handle = register_dissector("pn532", dissect_pn532, proto_pn532);
}
/* Handler registration */
void proto_reg_handoff_pn532(void)
{
+ dissector_add_for_decode_as("usbccid.subdissector", pn532_handle);
+
sub_handles[SUB_DATA] = find_dissector("data");
sub_handles[SUB_FELICA] = find_dissector_add_dependency("felica", proto_pn532);
sub_handles[SUB_MIFARE] = find_dissector_add_dependency("mifare", proto_pn532);
diff --git a/epan/dissectors/packet-usb-ccid.c b/epan/dissectors/packet-usb-ccid.c
index 7709c7560f..91ed844705 100644
--- a/epan/dissectors/packet-usb-ccid.c
+++ b/epan/dissectors/packet-usb-ccid.c
@@ -27,12 +27,15 @@
*/
#include "config.h"
+#include <epan/decode_as.h>
#include <epan/packet.h>
#include <epan/prefs.h>
#include "packet-usb.h"
static int proto_ccid = -1;
+static dissector_table_t subdissector_table;
+
static int hf_ccid_bMessageType = -1;
static int hf_ccid_dwLength = -1;
static int hf_ccid_bSlot = -1;
@@ -336,22 +339,16 @@ static gint ett_ccid_pin_support = -1;
static gint ett_ccid_slot_change = -1;
static gint ett_ccid_status = -1;
-/* Table of payload types - adapted from the I2C dissector */
-enum {
- SUB_DATA = 0,
- SUB_ISO7816,
- SUB_GSM_SIM,
- SUB_PN532,
- SUB_ACR122_PN532,
-
- SUB_MAX
-};
-
-typedef gboolean (*sub_checkfunc_t)(packet_info *);
+static void usb_ccid_prompt(packet_info *pinfo _U_, gchar* result)
+{
+ g_snprintf(result, MAX_DECODE_AS_PROMPT_LEN, "Next level protocol as");
+}
-static dissector_handle_t sub_handles[SUB_MAX];
-static gint sub_selected = SUB_DATA;
+static gpointer usb_ccid_value(packet_info *pinfo _U_)
+{
+ return 0;
+}
static gint
dissect_usb_ccid_descriptor(tvbuff_t *tvb, packet_info *pinfo _U_,
@@ -571,12 +568,7 @@ dissect_ccid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
/* sent/received is from the perspective of the card reader */
pinfo->p2p_dir = P2P_DIR_SENT;
- /* See if the dissector isn't Data */
- if (sub_selected != SUB_DATA) {
- call_dissector_with_data(sub_handles[sub_selected], next_tvb, pinfo, tree, usb_conv_info);
- } else if (usb_conv_info->deviceVendor == 0x072F && usb_conv_info->deviceProduct == 0x2200) {
- call_dissector_with_data(sub_handles[SUB_ACR122_PN532], next_tvb, pinfo, tree, usb_conv_info);
- } else { /* The user only wants plain data */
+ if (!dissector_try_uint_new(subdissector_table, 0, next_tvb, pinfo, tree, TRUE, usb_conv_info)) {
call_data_dissector(next_tvb, pinfo, tree);
}
break;
@@ -600,17 +592,7 @@ dissect_ccid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
next_tvb = tvb_new_subset_length(tvb, 10, payload_len);
pinfo->p2p_dir = P2P_DIR_RECV;
- if (sub_selected == SUB_PN532) {
- call_dissector_with_data(sub_handles[SUB_PN532], next_tvb, pinfo, tree, usb_conv_info);
- } else if (sub_selected == SUB_GSM_SIM) { /* Try to dissect responses to GSM SIM packets */
- call_dissector(sub_handles[SUB_GSM_SIM], next_tvb, pinfo, tree);
- } else if (sub_selected == SUB_ACR122_PN532) {
- call_dissector_with_data(sub_handles[SUB_ACR122_PN532], next_tvb, pinfo, tree, usb_conv_info);
- } else if (sub_selected == SUB_ISO7816) {
- call_dissector(sub_handles[SUB_ISO7816], next_tvb, pinfo, tree);
- } else if (usb_conv_info->deviceVendor == 0x072F && usb_conv_info->deviceProduct == 0x2200) {
- call_dissector_with_data(sub_handles[SUB_ACR122_PN532], next_tvb, pinfo, tree, usb_conv_info);
- } else {
+ if (!dissector_try_uint_new(subdissector_table, 0, next_tvb, pinfo, tree, TRUE, usb_conv_info)) {
call_data_dissector(next_tvb, pinfo, tree);
}
break;
@@ -657,6 +639,12 @@ dissect_ccid(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
void
proto_register_ccid(void)
{
+ static build_valid_func usb_ccid_build_value[1] = { usb_ccid_value };
+ static decode_as_value_t usb_ccid_da_values = { usb_ccid_prompt, 1, usb_ccid_build_value };
+ static decode_as_t usb_ccid_da = {"USB CCID", "Transport",
+ "usbccid.subdissector", 1, 0, &usb_ccid_da_values, NULL, NULL,
+ decode_as_default_populate_list, decode_as_default_reset, decode_as_default_change, NULL};
+
static hf_register_info hf[] = {
{&hf_ccid_bMessageType,
@@ -897,26 +885,15 @@ proto_register_ccid(void)
&ett_ccid_status
};
- static const enum_val_t sub_enum_vals[] = {
- { "data", "Data", SUB_DATA },
- { "iso7816", "Generic ISO 7816", SUB_ISO7816 },
- { "gsm_sim", "GSM SIM", SUB_GSM_SIM },
- { "pn532", "NXP PN532", SUB_PN532},
- { "acr122", "ACR122 PN532", SUB_ACR122_PN532},
- { NULL, NULL, 0 }
- };
-
- module_t *pref_mod;
-
proto_ccid = proto_register_protocol("USB CCID", "USBCCID", "usbccid");
proto_register_field_array(proto_ccid, hf, array_length(hf));
proto_register_subtree_array(ett, array_length(ett));
- pref_mod = prefs_register_protocol(proto_ccid, NULL);
- prefs_register_enum_preference(pref_mod, "prtype", "PC -> Reader Payload Type", "How commands from the PC to the reader are interpreted",
- &sub_selected, sub_enum_vals, FALSE);
-
usb_ccid_handle = register_dissector("usbccid", dissect_ccid, proto_ccid);
+
+ subdissector_table = register_dissector_table(
+ "usbccid.subdissector", "USB CCID payload", proto_ccid, FT_UINT32, BASE_HEX);
+ register_decode_as(&usb_ccid_da);
}
/* Handler registration */
@@ -934,12 +911,6 @@ proto_reg_handoff_ccid(void)
dissector_add_for_decode_as("usb.device", usb_ccid_handle);
dissector_add_for_decode_as("usb.product", usb_ccid_handle);
dissector_add_for_decode_as("usb.protocol", usb_ccid_handle);
-
- sub_handles[SUB_DATA] = find_dissector("data");
- sub_handles[SUB_ISO7816] = find_dissector_add_dependency("iso7816", proto_ccid);
- sub_handles[SUB_GSM_SIM] = find_dissector_add_dependency("gsm_sim.part", proto_ccid);
- sub_handles[SUB_PN532] = find_dissector_add_dependency("pn532", proto_ccid);
- sub_handles[SUB_ACR122_PN532] = find_dissector_add_dependency("acr122", proto_ccid);
}
/*
generated by cgit v1.2.1 (git 2.18.0) at 2024-05-17 07:45:46 +0000