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

NAS-5GS: add support for n1SmMsg from 3GPP 29.502 

Change-Id: Ie643abf1bc30d2350952cd9afe0af070f4ff980f
Reviewed-on: https://code.wireshark.org/review/35817
Petri-Dish: Pascal Quantin <pascal@wireshark.org>
Tested-by: Petri Dish Buildbot
Reviewed-by: Pascal Quantin <pascal@wireshark.org>
This commit is contained in:
Joakim Karlsson 2020-01-15 09:40:34 +01:00 committed by Pascal Quantin
parent d0c9c33f52
commit 3169344480
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
epan/dissectors/packet-nas_5gs.c
View File

@ -6807,7 +6807,7 @@ de_nas_5gs_s1_mode_to_n1_mode_nas_transparent_cont(tvbuff_t *tvb, proto_tree *tr
}
}
/* 3GPP TS 29.518 chapter 6.1.6.4.2 */
/* 3GPP TS 29.502 chapter 6.1.6.4.2 and 29.518 chapter 6.1.6.4.2 */
static int
dissect_nas_5gs_media_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void* data)
{
@ -6830,15 +6830,23 @@ dissect_nas_5gs_media_type(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree,
if (json_parse(json_data, tokens, ret) < 0)
return 0;
cur_tok = json_get_object(json_data, tokens, "n1MessageContainer");
if (!cur_tok)
return 0;
n1_msg_class = json_get_string(json_data, cur_tok, "n1MessageClass");
if (!n1_msg_class)
return 0;
cur_tok = json_get_object(json_data, cur_tok, "n1MessageContent");
if (!cur_tok)
return 0;
str = json_get_string(json_data, cur_tok, "contentId");
if (cur_tok) {
n1_msg_class = json_get_string(json_data, cur_tok, "n1MessageClass");
if (!n1_msg_class)
return 0;
cur_tok = json_get_object(json_data, cur_tok, "n1MessageContent");
if (!cur_tok)
return 0;
str = json_get_string(json_data, cur_tok, "contentId");
} else {
cur_tok = json_get_object(json_data, tokens, "n1SmMsg");
if (cur_tok) {
n1_msg_class = "SM";
str = json_get_string(json_data, cur_tok, "contentId");
} else {
return 0;
}
}
if (!str || strcmp(str, message_info->content_id))
return 0;
if (!strcmp(n1_msg_class, "5GMM") ||