osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

Revert 46018. Needs rethinking. 

svn path=/trunk/; revision=46028
This commit is contained in:
Anders Broman 2012-11-14 10:02:15 +00:00
parent e0da278d5f
commit 810a200141
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
epan/dissectors/packet-nas_eps.c
View File

@ -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 */