osmocom
/
wireshark
14
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

iso7816: link a transaction to a payload dissector 

When an iso7816 request is forwarded to a payload dissector, store its
handle in the transaction info. Call the new helper function to get the
selected payload dissector's handle.

Use the stored dissector handle to pass the response to the same payload
dissector that handled the request.

Change-Id: Idc6f7fbee978c095719aea937ab3179eac17f2a7
Reviewed-on: https://code.wireshark.org/review/33934
Petri-Dish: Martin Kaiser <wireshark@kaiser.cx>
Tested-by: Petri Dish Buildbot
Reviewed-by: Martin Kaiser <wireshark@kaiser.cx>
This commit is contained in:
Martin Kaiser 2019-07-03 23:30:24 +02:00
parent a96d6c4cea
commit 6fb78f3045
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
epan/dissectors/packet-iso7816.c
View File

@ -101,6 +101,7 @@ typedef struct _iso7816_transaction_t {
the response contains no channel number to compare this to
and the spec explicitly prohibits interleaving of command-response
pairs, regardless of logical channels */
dissector_handle_t handle;
} iso7816_transaction_t;
static const value_string iso7816_atr_init_char[] = {
@ -625,6 +626,7 @@ dissect_iso7816_cmd_apdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
iso7816_trans->cmd_frame = pinfo->num;
iso7816_trans->resp_frame = 0;
iso7816_trans->cmd_ins = INS_INVALID;
iso7816_trans->handle = NULL;
wmem_tree_insert32(transactions,
iso7816_trans->cmd_frame, (void *)iso7816_trans);
@ -636,13 +638,15 @@ dissect_iso7816_cmd_apdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
/* the class byte says that the remaining APDU is not
in ISO7816 format */
ret = dissector_try_payload_new(iso7816_apdu_pld_table,
tvb, pinfo, tree, TRUE, NULL);
if (ret == 0) {
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL,
"Command APDU using proprietary format");
return 1; /* we only dissected the class byte */
iso7816_trans->handle =
dissector_get_payload_handle(iso7816_apdu_pld_table);
if (iso7816_trans->handle != NULL) {
ret = call_dissector(iso7816_trans->handle, tvb, pinfo, tree);
if (ret == 0) {
col_append_sep_str(pinfo->cinfo, COL_INFO, NULL,
"Command APDU using proprietary format");
return 1; /* we only dissected the class byte */
}
}
return ret;
@ -722,6 +726,9 @@ dissect_iso7816_resp_apdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree)
col_append_sep_fstr(pinfo->cinfo, COL_INFO, " ",
"(to %s)", cmd_ins_str);
}
if (iso7816_trans->handle != NULL)
call_dissector(iso7816_trans->handle, tvb, pinfo, tree);
}
}