diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-11-13 12:54:58 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-11-13 12:54:58 +0000 |
| commit | 6edabe05d8d878739d66c959b81bbb2e5e3a7d7c (patch) | |
| tree | e38c0ac4ae7b52d6cb1eae6bc757db9ea9892983 /epan/dissectors/packet-nas_eps.c | |
| parent | 8acaffff8245b3ec690f1ebb45c8a5f791ea10b3 (diff) | |
Try to fix dissection with g_nas_eps_dissect_plain == TRUE.
svn path=/trunk/; revision=46018
Diffstat (limited to 'epan/dissectors/packet-nas_eps.c')
| -rw-r--r-- | epan/dissectors/packet-nas_eps.c | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c index 85bf4dcee0..c4bfc33b46 100644 --- a/epan/dissectors/packet-nas_eps.c +++ b/epan/dissectors/packet-nas_eps.c @@ -4812,11 +4812,6 @@ dissect_nas_eps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) return; } - if (g_nas_eps_dissect_plain) { - dissect_nas_eps_plain(tvb, pinfo, tree); - return; - } - /* Save pinfo */ gpinfo = pinfo; @@ -4866,8 +4861,10 @@ dissect_nas_eps(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) /* If pd is in plaintext this message probably isn't ciphered */ if ((pd != 7) && (pd != 15) && (((pd&0x0f) != 2) || (((pd&0x0f) == 2) && ((pd&0xf0) > 0) && ((pd&0xf0) < 0x50)))) { - proto_tree_add_text(nas_eps_tree, tvb, offset, len-6,"Ciphered message"); - return; + if(g_nas_eps_dissect_plain == TRUE) { + proto_tree_add_text(nas_eps_tree, tvb, offset, len-6,"Ciphered message"); + return; + } } } else { /* msg_auth_code == 0, probably not ciphered */ |