From 784b9f44a4eb6ebbc2ba9db7a9c9400606c43961 Mon Sep 17 00:00:00 2001 From: John Thacker Date: Tue, 22 Jun 2021 21:17:14 -0400 Subject: [PATCH] NAS 5GS: Use 5GSTAI MCC/MNC fields Use 5GS TAI (and not just TAI) where appropriate in the 5GS TAI, 5GS TAI List, and 5GS Service Area List. --- epan/dissectors/packet-nas_5gs.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/epan/dissectors/packet-nas_5gs.c b/epan/dissectors/packet-nas_5gs.c index 76da7a9cb7..b2f664721f 100644 --- a/epan/dissectors/packet-nas_5gs.c +++ b/epan/dissectors/packet-nas_5gs.c @@ -1338,7 +1338,7 @@ de_nas_5gs_mm_5gs_ta_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, curr_offset = offset; - curr_offset = dissect_e212_mcc_mnc(tvb, pinfo, tree, curr_offset, E212_TAI, TRUE); + curr_offset = dissect_e212_mcc_mnc(tvb, pinfo, tree, curr_offset, E212_5GSTAI, TRUE); proto_tree_add_item(tree, hf_nas_5gs_tac, tvb, curr_offset, 3, ENC_BIG_ENDIAN); curr_offset += 3; @@ -1409,7 +1409,7 @@ de_nas_5gs_mm_5gs_ta_id_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo /*octet 2 MCC digit2 MCC digit1*/ /*octet 3 MNC digit3 MCC digit3*/ /*octet 4 MNC digit2 MNC digit1*/ - dissect_e212_mcc_mnc(tvb, pinfo, sub_tree, curr_offset, E212_NONE, TRUE); + dissect_e212_mcc_mnc(tvb, pinfo, sub_tree, curr_offset, E212_5GSTAI, TRUE); curr_offset += 3; while (tal_num_e > 0) { proto_tree_add_item(sub_tree, hf_nas_5gs_tac, tvb, curr_offset, 3, ENC_BIG_ENDIAN); @@ -1421,7 +1421,7 @@ de_nas_5gs_mm_5gs_ta_id_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo /*octet 2 MCC digit2 MCC digit1*/ /*octet 3 MNC digit3 MCC digit3*/ /*octet 4 MNC digit2 MNC digit1*/ - dissect_e212_mcc_mnc(tvb, pinfo, sub_tree, curr_offset, E212_NONE, TRUE); + dissect_e212_mcc_mnc(tvb, pinfo, sub_tree, curr_offset, E212_5GSTAI, TRUE); curr_offset += 3; /*octet 5 TAC 1*/ @@ -1433,7 +1433,7 @@ de_nas_5gs_mm_5gs_ta_id_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo /*octet 2 MCC digit2 MCC digit1*/ /*octet 3 MNC digit3 MCC digit3*/ /*octet 4 MNC digit2 MNC digit1*/ - dissect_e212_mcc_mnc(tvb, pinfo, sub_tree, curr_offset, E212_NONE, TRUE); + dissect_e212_mcc_mnc(tvb, pinfo, sub_tree, curr_offset, E212_5GSTAI, TRUE); curr_offset += 3; /*octet 5 TAC 1*/ @@ -1444,7 +1444,7 @@ de_nas_5gs_mm_5gs_ta_id_list(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo } break; case 3: - dissect_e212_mcc_mnc(tvb, pinfo, sub_tree, curr_offset, E212_NONE, TRUE); + dissect_e212_mcc_mnc(tvb, pinfo, sub_tree, curr_offset, E212_5GSTAI, TRUE); curr_offset += 3; break; default: @@ -3113,7 +3113,7 @@ de_nas_5gs_mm_sal(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, /*octet 2 MCC digit2 MCC digit1*/ /*octet 3 MNC digit3 MCC digit3*/ /*octet 4 MNC digit2 MNC digit1*/ - dissect_e212_mcc_mnc(tvb, pinfo, sub_tree, curr_offset, E212_NONE, TRUE); + dissect_e212_mcc_mnc(tvb, pinfo, sub_tree, curr_offset, E212_5GSTAI, TRUE); curr_offset += 3; while (sal_num_e > 0) { proto_tree_add_item(sub_tree, hf_nas_5gs_tac, tvb, curr_offset, 3, ENC_BIG_ENDIAN); @@ -3125,7 +3125,7 @@ de_nas_5gs_mm_sal(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, /*octet 2 MCC digit2 MCC digit1*/ /*octet 3 MNC digit3 MCC digit3*/ /*octet 4 MNC digit2 MNC digit1*/ - dissect_e212_mcc_mnc(tvb, pinfo, sub_tree, curr_offset, E212_NONE, TRUE); + dissect_e212_mcc_mnc(tvb, pinfo, sub_tree, curr_offset, E212_5GSTAI, TRUE); curr_offset += 3; /*octet 5 TAC 1*/ @@ -3137,7 +3137,7 @@ de_nas_5gs_mm_sal(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, /*octet 2 MCC digit2 MCC digit1*/ /*octet 3 MNC digit3 MCC digit3*/ /*octet 4 MNC digit2 MNC digit1*/ - dissect_e212_mcc_mnc(tvb, pinfo, sub_tree, curr_offset, E212_NONE, TRUE); + dissect_e212_mcc_mnc(tvb, pinfo, sub_tree, curr_offset, E212_5GSTAI, TRUE); curr_offset += 3; /*octet 5 TAC 1*/ @@ -3148,7 +3148,7 @@ de_nas_5gs_mm_sal(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, } break; case 3: - dissect_e212_mcc_mnc(tvb, pinfo, sub_tree, curr_offset, E212_NONE, TRUE); + dissect_e212_mcc_mnc(tvb, pinfo, sub_tree, curr_offset, E212_5GSTAI, TRUE); curr_offset += 3; break; default: