diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-03-09 05:08:30 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-03-09 05:08:30 +0000 |
| commit | d50dcb37e912fbdb111120ce42954a51a4042571 (patch) | |
| tree | d6c63e1b13e4ed6f18c1862d9a3878e8448608dc /epan/dissectors/packet-gsm_a_common.h | |
| parent | 9d03324d91cf7c020687d456abee946f5fb360b0 (diff) | |
| download | wireshark-d50dcb37e912fbdb111120ce42954a51a4042571.tar.gz wireshark-d50dcb37e912fbdb111120ce42954a51a4042571.tar.bz2 wireshark-d50dcb37e912fbdb111120ce42954a51a4042571.zip | |
From Sylvain Munaut: gsm_a_common: ELEM_MAND_VV_SHORT doesn't support IEs of different types. https://bugs.wireshark.org/bugzilla/show_bug.cgi?id=6924
svn path=/trunk/; revision=41445
Diffstat (limited to 'epan/dissectors/packet-gsm_a_common.h')
| -rw-r--r-- | epan/dissectors/packet-gsm_a_common.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/epan/dissectors/packet-gsm_a_common.h b/epan/dissectors/packet-gsm_a_common.h index 01d750a18b..7456d82755 100644 --- a/epan/dissectors/packet-gsm_a_common.h +++ b/epan/dissectors/packet-gsm_a_common.h @@ -586,10 +586,10 @@ extern guint16 elem_v_short(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, if ((signed)curr_len <= 0) return; \ } -#define ELEM_MAND_VV_SHORT(EMV_pdu_type, EMV_elem_idx1, EMV_elem_idx2) \ +#define ELEM_MAND_VV_SHORT(EMV_pdu_type1, EMV_elem_idx1, EMV_pdu_type2, EMV_elem_idx2) \ {\ - elem_v_short(tvb, tree, pinfo, EMV_pdu_type, EMV_elem_idx1, curr_offset, RIGHT_NIBBLE); \ - elem_v_short(tvb, tree, pinfo, EMV_pdu_type, EMV_elem_idx2, curr_offset, LEFT_NIBBLE); \ + elem_v_short(tvb, tree, pinfo, EMV_pdu_type1, EMV_elem_idx1, curr_offset, RIGHT_NIBBLE); \ + elem_v_short(tvb, tree, pinfo, EMV_pdu_type2, EMV_elem_idx2, curr_offset, LEFT_NIBBLE); \ curr_offset ++ ; /* consumed length is 1, regardless of contents */ \ curr_len -- ; \ if ((signed)curr_len <= 0) return; \ |