diff options
| author | John Thacker <johnthacker@gmail.com> | 2021-05-09 23:07:19 -0400 |
|---|---|---|
| committer | John Thacker <johnthacker@gmail.com> | 2021-05-09 23:07:19 -0400 |
| commit | 1701a2db5d4db57a2590b82cd08bc3ffca29f05c (patch) | |
| tree | 9e0245d43081a07ae3525564fc11f2bd88266e88 /epan/dissectors/packet-e212.c | |
| parent | a106ba9d27e07e23bac14619e4f3fda7bf76a905 (diff) | |
S1AP: Use specific MCC/MNC fields
Use the specific MCC/MNC fields for the LAI, CGI, ECGI, NR-CGI, TAI,
and 5GS-TAI IEs, continuing to use E212_NONE for PLMNidentity in all
other cases. Add fields and an enum value for 5GS-TAI to packet-e212.
(The 5GSTAC has an additional octet compared to the original TAC.)
Diffstat (limited to 'epan/dissectors/packet-e212.c')
| -rw-r--r-- | epan/dissectors/packet-e212.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/epan/dissectors/packet-e212.c b/epan/dissectors/packet-e212.c index b979c6d292..82b758ea09 100644 --- a/epan/dissectors/packet-e212.c +++ b/epan/dissectors/packet-e212.c @@ -3027,6 +3027,7 @@ static int hf_E212_mcc_cgi = -1; static int hf_E212_mcc_ecgi = -1; static int hf_E212_mcc_tai = -1; static int hf_E212_mcc_nrcgi = -1; +static int hf_E212_mcc_5gstai = -1; static int hf_E212_mnc = -1; static int hf_E212_mnc_lai = -1; static int hf_E212_mnc_sai = -1; @@ -3035,6 +3036,7 @@ static int hf_E212_mnc_cgi = -1; static int hf_E212_mnc_ecgi = -1; static int hf_E212_mnc_tai = -1; static int hf_E212_mnc_nrcgi = -1; +static int hf_E212_mnc_5gstai = -1; static int ett_e212_imsi = -1; @@ -3140,6 +3142,10 @@ dissect_e212_mcc_mnc_wmem_packet_str(tvbuff_t *tvb, packet_info *pinfo, proto_tr hf_E212_mcc_id = hf_E212_mcc_nrcgi; hf_E212_mnc_id = hf_E212_mnc_nrcgi; break; + case E212_5GSTAI: + hf_E212_mcc_id = hf_E212_mcc_5gstai; + hf_E212_mnc_id = hf_E212_mnc_5gstai; + break; default: hf_E212_mcc_id = hf_E212_mcc; hf_E212_mnc_id = hf_E212_mnc; @@ -3583,6 +3589,11 @@ proto_register_e212(void) FT_UINT16, BASE_DEC|BASE_EXT_STRING, &E212_codes_ext, 0x0, "Mobile Country Code MCC", HFILL } }, + { &hf_E212_mcc_5gstai, + { "Mobile Country Code (MCC)","e212.5gstai.mcc", + FT_UINT16, BASE_DEC|BASE_EXT_STRING, &E212_codes_ext, 0x0, + "Mobile Country Code MCC", HFILL } + }, { &hf_E212_mnc, { "Mobile Network Code (MNC)","e212.mnc", FT_UINT16, BASE_DEC, NULL, 0x0, @@ -3623,6 +3634,11 @@ proto_register_e212(void) FT_UINT16, BASE_DEC, NULL, 0x0, "Mobile network code", HFILL } }, + { &hf_E212_mnc_5gstai, + { "Mobile Network Code (MNC)","e212.5gstai.mnc", + FT_UINT16, BASE_DEC, NULL, 0x0, + "Mobile network code", HFILL } + }, #if 0 { &hf_E212_msin, { "Mobile Subscriber Identification Number (MSIN)", "e212.msin", |