diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2009-03-18 19:40:54 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2009-03-18 19:40:54 +0000 |
| commit | 0d2fb53b740b1094d2e98dd2578cbae29d0549a0 (patch) | |
| tree | 4b138a6135da93158996e8ab58ba18ab670edfd5 /epan/dissectors/packet-gsm_a_common.c | |
| parent | 31ea1d7aac709c4bcc8049d29db5aaf0ab492378 (diff) | |
- Fix APDU dissection.
- NAS EPS bugfixes and enhancements.
svn path=/trunk/; revision=27778
Diffstat (limited to 'epan/dissectors/packet-gsm_a_common.c')
| -rw-r--r-- | epan/dissectors/packet-gsm_a_common.c | 16 |
1 files changed, 3 insertions, 13 deletions
diff --git a/epan/dissectors/packet-gsm_a_common.c b/epan/dissectors/packet-gsm_a_common.c index 1098e6738e..f603ab3a57 100644 --- a/epan/dissectors/packet-gsm_a_common.c +++ b/epan/dissectors/packet-gsm_a_common.c @@ -630,10 +630,10 @@ static int get_hf_elem_id(int pdu_type) hf_elem_id = hf_nas_eps_common_elem_id; break; case NAS_PDU_TYPE_EMM: - hf_elem_id = hf_nas_emm_elem_id; + hf_elem_id = hf_nas_eps_emm_elem_id; break; case NAS_PDU_TYPE_ESM: - hf_elem_id = hf_nas_esm_elem_id; + hf_elem_id = hf_nas_eps_esm_elem_id; break; default: DISSECTOR_ASSERT_NOT_REACHED(); @@ -666,17 +666,7 @@ guint16 elem_tlv(tvbuff_t *tvb, proto_tree *tree, guint8 iei, gint pdu_type, int oct = tvb_get_guint8(tvb, curr_offset); if (oct == iei){ - if (oct == GSM_BSSMAP_APDU_IE){ - /* This elements length is in two octets (a bit of a hack here)*/ - lengt_length = 2; - parm_len = tvb_get_ntohs(tvb, curr_offset + 1); - if(parm_len > 255){ - /* The rest of the logic can't handle length > 255 */ - DISSECTOR_ASSERT_NOT_REACHED(); - } - }else{ - parm_len = tvb_get_guint8(tvb, curr_offset + 1); - } + parm_len = tvb_get_guint8(tvb, curr_offset + 1); item = proto_tree_add_text(tree, |