diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2012-11-14 10:02:15 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2012-11-14 10:02:15 +0000 |
| commit | 810a2001413601a0b8ad8488ea24622ac92500ae (patch) | |
| tree | 2249b4a5a5f7b248342a917e06ef0bea10e1c017 /epan/dissectors/packet-nas_eps.c | |
| parent | e0da278d5f8192babe9ec0435d4415e3efb90b4f (diff) | |
Revert 46018. Needs rethinking.
svn path=/trunk/; revision=46028
Diffstat (limited to 'epan/dissectors/packet-nas_eps.c')
| -rw-r--r-- | epan/dissectors/packet-nas_eps.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c index 68e44855b9..f2c6e33112 100644 --- a/epan/dissectors/packet-nas_eps.c +++ b/epan/dissectors/packet-nas_eps.c @@ -4812,6 +4812,11 @@ 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; @@ -4861,10 +4866,8 @@ 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)))) { - if(g_nas_eps_dissect_plain == TRUE) { - proto_tree_add_text(nas_eps_tree, tvb, offset, len-6,"Ciphered message"); - return; - } + proto_tree_add_text(nas_eps_tree, tvb, offset, len-6,"Ciphered message"); + return; } } else { /* msg_auth_code == 0, probably not ciphered */ |